--- Makefile.orig	2009-12-20 09:19:09.894100078 -0800
+++ Makefile	2009-12-20 09:14:28.223471988 -0800
@@ -195,6 +195,9 @@
 PLIST_SUB+=	FAPI=""
 .else
 PLIST_SUB+=	FAPI="@comment "
+CONFIGURE_ENV=	${MAKE_ENV} \
+		CPPFLAGS="-DUPD_SIGNAL=0 -I. -I${WRKSRC}/jasper/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${LOCALBASE}/freetype/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
 ALL_TARGET=	so
@@ -245,10 +248,6 @@
 	${MKDIR} ${WRKSRC}/freetype/objs
 	${LN} -s -f ${LOCALBASE}/lib/libfreetype.so \
 		${WRKSRC}/freetype/objs/freetype214MT_D.so
-# bug in 8.64.  Fixed in r9467.
-	${MV} ${WRKSRC}/base/write_t[12].[ch] \
-		${WRKSRC}/base/wrfont.[ch] \
-		${WRKSRC}/psi
 .endif
 
 pre-su-install: