From 9d0f3f17f627b25731e256374386772ccb872686 Mon Sep 17 00:00:00 2001
From: Jean-Marc Zucconi <jmz@FreeBSD.org>
Date: Fri, 29 Dec 2000 18:48:31 +0000
Subject: [PATCH] Compile and install the freetype extension.

---
 x11/XFree86-4/Makefile          | 8 +++++++-
 x11/XFree86-4/pkg-plist         | 4 ++++
 x11/XFree86-4/pkg-plist.alpha   | 4 ++++
 x11/XFree86-4/pkg-plist.pc98    | 4 ++++
 x11/XFree86-4/scripts/configure | 7 +++----
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index bf17ffe50db8..36f5b9f2e436 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XFree86
 PORTVERSION= 	4.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
@@ -85,10 +85,16 @@ 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 88b77ef12771..96cc4a697e82 100644
--- a/x11/XFree86-4/pkg-plist
+++ b/x11/XFree86-4/pkg-plist
@@ -273,6 +273,7 @@ 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
@@ -3252,6 +3253,9 @@ 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 dfedad867467..03418e50d0ff 100644
--- a/x11/XFree86-4/pkg-plist.alpha
+++ b/x11/XFree86-4/pkg-plist.alpha
@@ -272,6 +272,7 @@ 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
@@ -3249,6 +3250,9 @@ 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 88b77ef12771..96cc4a697e82 100644
--- a/x11/XFree86-4/pkg-plist.pc98
+++ b/x11/XFree86-4/pkg-plist.pc98
@@ -273,6 +273,7 @@ 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
@@ -3252,6 +3253,9 @@ 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 579651173892..0507e32da825 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -294,10 +294,9 @@ echo
 yesno YES "Do you want to compile with PAM support?"
 echo "#define	HasPam			$answ"	>> $F
 
-echo
-echo
-echo "End of configuration questions. No more user input required"
-echo
+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
 }
 
 configure