5 files changed, 4 insertions, 22 deletions

diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 36f5b9f2e436..4a328e58a2d3 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XFree86
 PORTVERSION= 	4.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
@@ -15,6 +15,8 @@ DISTFILES=	X402src-1.tgz X402src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.org
 
+LIB_DEPENDS=	freetype.6:${PORTSDIR}/print/freetype2
+
 WRKSRC=		${WRKDIR}/${DIST_SUBDIR}
 .if (${MACHINE} != "alpha")
 #NO_PACKAGE=	package available from XFree86
@@ -85,16 +87,10 @@ post-patch:
 	  ${WRKSRC}/include/Xarch.h; fi
 .endif
 
-pre-build:
-	@cd  ${WRKSRC}/extras/freetype2 && make -f Makefile.freetype
 pre-install:
 	${MKDIR} ${PREFIX}
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/extras/freetype2/lib/libfreetype.a ${PREFIX}/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/extras/freetype2/lib/libfreetype.so.6 ${PREFIX}/lib
-	ln -sf ${PREFIX}/lib/libfreetype.so.6 ${PREFIX}/lib/libfreetype.so
-
 .ifndef DISTRIB
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .endif
diff --git a/x11/XFree86-4/pkg-plist b/x11/XFree86-4/pkg-plist
index 96cc4a697e82..88b77ef12771 100644
--- a/x11/XFree86-4/pkg-plist
+++ b/x11/XFree86-4/pkg-plist
@@ -273,7 +273,6 @@ include/X11/Xcms.h
 include/X11/Xdefs.h
 include/X11/Xdmcp.h
 include/X11/Xft/Xft.h
-include/X11/Xft/XftFreetype.h
 include/X11/Xfuncproto.h
 include/X11/Xfuncs.h
 include/X11/Xlib.h
@@ -3253,9 +3252,6 @@ lib/libdpstk.a
 lib/libdpstk.so
 lib/libdpstk.so.1
 lib/libfntstubs.a
-lib/libfreetype.a
-lib/libfreetype.so
-lib/libfreetype.so.6
 lib/liboldX.a
 lib/liboldX.so
 lib/liboldX.so.6
diff --git a/x11/XFree86-4/pkg-plist.alpha b/x11/XFree86-4/pkg-plist.alpha
index 03418e50d0ff..dfedad867467 100644
--- a/x11/XFree86-4/pkg-plist.alpha
+++ b/x11/XFree86-4/pkg-plist.alpha
@@ -272,7 +272,6 @@ include/X11/Xcms.h
 include/X11/Xdefs.h
 include/X11/Xdmcp.h
 include/X11/Xft/Xft.h
-include/X11/Xft/XftFreetype.h
 include/X11/Xfuncproto.h
 include/X11/Xfuncs.h
 include/X11/Xlib.h
@@ -3250,9 +3249,6 @@ lib/libdpstk.a
 lib/libdpstk.so
 lib/libdpstk.so.1
 lib/libfntstubs.a
-lib/libfreetype.a
-lib/libfreetype.so
-lib/libfreetype.so.6
 lib/liboldX.a
 lib/liboldX.so
 lib/liboldX.so.6
diff --git a/x11/XFree86-4/pkg-plist.pc98 b/x11/XFree86-4/pkg-plist.pc98
index 96cc4a697e82..88b77ef12771 100644
--- a/x11/XFree86-4/pkg-plist.pc98
+++ b/x11/XFree86-4/pkg-plist.pc98
@@ -273,7 +273,6 @@ include/X11/Xcms.h
 include/X11/Xdefs.h
 include/X11/Xdmcp.h
 include/X11/Xft/Xft.h
-include/X11/Xft/XftFreetype.h
 include/X11/Xfuncproto.h
 include/X11/Xfuncs.h
 include/X11/Xlib.h
@@ -3253,9 +3252,6 @@ lib/libdpstk.a
 lib/libdpstk.so
 lib/libdpstk.so.1
 lib/libfntstubs.a
-lib/libfreetype.a
-lib/libfreetype.so
-lib/libfreetype.so.6
 lib/liboldX.a
 lib/liboldX.so
 lib/liboldX.so.6
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 0507e32da825..126d6deae9e4 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -294,9 +294,7 @@ echo
 yesno YES "Do you want to compile with PAM support?"
 echo "#define	HasPam			$answ"	>> $F
 
-cp $FILESDIR/Makefile.freetype $WRKDIR/xc/extras/freetype2
-(cd  $WRKDIR/xc/extras/freetype2; ln -s obj lib; cd include; ln -s ../include freetype2 )
-echo "#define Freetype2Dir $WRKDIR/xc/extras/freetype2" >> $F
+echo "#define Freetype2Dir $LOCALBASE" >> $F
 }
 
 configure