--- texlive-2007/texk/ttf2pk/Makefile.in.orig	2007-06-19 22:30:56.186538350 -0400
+++ texlive-2007/texk/ttf2pk/Makefile.in	2007-06-19 22:32:59.347131158 -0400
@@ -4,11 +4,11 @@
 kpse_include ../make/common.mk
 kpse_include ../make/programs.mk
 
-LDFREETYPE=@LDFREETYPE@
-FREETYPECPPFLAGS=@FREETYPECPPFLAGS@
-FREETYPEDEP=@FREETYPEDEP@
-FREETYPEDIR = ../../libs/freetype
-FREETYPESRCDIR = $(srcdir)/$(FREETYPEDIR)
+LDFREETYPE= -lttf -lfreetype
+FREETYPECPPFLAGS = -I/usr/include/freetype
+FREETYPEDEP = 
+FREETYPEDIR = 
+FREETYPESRCDIR = 
 
 prog_cflags = -DHAVE_LIBKPATHSEA $(FREETYPECPPFLAGS) 
 prog_ldflags = $(LDFREETYPE)
@@ -29,9 +29,6 @@
 ttf2tfm: $(kpathsea) $(ttf2tfmobjs) $(FREETYPEDEP)
 	$(kpathsea_link) $(ttf2tfmobjs) $(prog_ldflags) $(LOADLIBES)
 
-$(FREETYPEDIR)/lib/.libs/libttf.a:
-	cd $(FREETYPEDIR); $(MAKE) $(makeargs)
-
 kpse_include ../make/tkpathsea.mk
 
 install: install-exec install-data
--- texlive-2007/texk/ttf2pk/ttfaux.c.orig	2007-06-19 22:33:34.005857213 -0400
+++ texlive-2007/texk/ttf2pk/ttfaux.c	2007-06-19 22:33:51.464689654 -0400
@@ -13,9 +13,9 @@
 #include <stdlib.h>
 
 #include "freetype.h"
-#include "extend/ftxkern.h"     /* we are in the FreeType package tree */
-#include "extend/ftxpost.h"
-#include "extend/ftxopen.h"
+#include "ftxkern.h"
+#include "ftxpost.h"
+#include "ftxopen.h"
 
 #include "ttf2tfm.h"
 #include "newobj.h"
--- texlive-2007/texk/ttf2pk/ttflib.c.orig	2007-06-19 22:50:28.274809897 -0400
+++ texlive-2007/texk/ttf2pk/ttflib.c	2007-06-19 22:50:39.323172833 -0400
@@ -22,8 +22,8 @@
 #include "newobj.h"
 #include "ttf2tfm.h"
 
-#include "extend/ftxpost.h"
-#include "extend/ftxopen.h"
+#include "ftxpost.h"
+#include "ftxopen.h"
 
 
 #define Macintosh_platform 1