Update to 4.0.1. Remove libraries from -clients. Try to extract

only what each port needs.  Other miscellaneous bug fixes.

Submitted by:	maintainer

4 files changed, 32 insertions, 31 deletions

diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index 43c49176e0d5..e124aae7c362 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86XFontServer-4.0
+# New ports collection makefile for:	XFree86XFontServer-4.0.1
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@@ -6,37 +6,33 @@
 #
 
 PORTNAME=	FontServer
-PORTVERSION=	4.0
+PORTVERSION=	4.0.1
 CATEGORIES=	x11-servers x11-fonts
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0.1/source/ \
+		ftp://ftp.freesoftware.com/pub/XFree86/4.0.1/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0.1/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0.1/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0.1/source/
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X400src-1.tgz
+DISTFILES=	X401src-1.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
-LIB_DEPENDS=	X11.6:${PORTSDIR}/x11/XFree86-4-libraries
+XFREE86_VERSION=	4
+USE_IMAKE=		YES
+DIST_SUBDIR=		xc
+WRKSRC=			${WRKDIR}/xc
+PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/patches
+SCRIPTS_ENV+=		PREFIX=${PREFIX} \
+			X11BASE=${X11BASE} \
+			WRKDIR=${WRKDIR} \
+			DISTDIR=${DISTDIR}
+ALL_TARGET=		FreeBSDPortsBuild
+INSTALL_TARGET= 	FreeBSDPortsInstall FreeBSDPortsInstall.man
+MANCOMPRESSED=		yes
+MAN1=			xfs.1
 
-PREFIX?=	${X11BASE}
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
-DIST_SUBDIR=	xc
-WRKSRC=		${WRKDIR}/xc
-PATCHDIR=	${PORTSDIR}/x11/XFree86-4-libraries/patches
-SCRIPTS_ENV+=	PREFIX=${PREFIX} \
-		X11BASE=${X11BASE} \
-		WRKDIR=${WRKDIR} \
-		DISTDIR=${DISTDIR}
-ALL_TARGET=	FreeBSDPortsBuild
-.if defined(NO_INSTALL_MANPAGES)
-INSTALL_TARGET= FreeBSDPortsInstall
-.else
-INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man
-MANCOMPRESSED=	yes
-MAN1=		xfs.1
-.endif
+do-configure:
+	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-FontServer/distinfo b/x11-servers/XFree86-4-FontServer/distinfo
index 32a647072af5..e9125a5f32c4 100644
--- a/x11-servers/XFree86-4-FontServer/distinfo
+++ b/x11-servers/XFree86-4-FontServer/distinfo
@@ -1 +1 @@
-MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
+MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
diff --git a/x11-servers/XFree86-4-FontServer/pkg-plist b/x11-servers/XFree86-4-FontServer/pkg-plist
index c5fd7a27ba89..ced5ee87b536 100644
--- a/x11-servers/XFree86-4-FontServer/pkg-plist
+++ b/x11-servers/XFree86-4-FontServer/pkg-plist
@@ -1,4 +1,2 @@
 bin/xfs
-@cwd /etc
-X11/fs/config
-@unexec rmdir /etc/X11/fs
+lib/X11/fs/config
diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure
index f5c33725d1c0..48541ec6dbb0 100644
--- a/x11-servers/XFree86-4-FontServer/scripts/configure
+++ b/x11-servers/XFree86-4-FontServer/scripts/configure
@@ -26,6 +26,13 @@ configure () {
 	InstallFSConfig=YES
     fi
 
+    # It's good for FreeBSD ports/packages system.
+    echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
+
+    # I want to set this line.
+    # but the probrem is too deep. not yet done.
+    # echo "#define InstallXserverSetUID NO" >> $LOCALDEF
+
     # disable some configs: there are not used this ports
     for i in BuildFonts \
 	Build75DpiFonts \