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

only what each port needs.  Other miscellaneous bug fixes.

Submitted by:	maintainer

3 files changed, 82 insertions, 20 deletions

diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
index d2e531b..ed52733 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86XfontDefaultBitmap-4.0
+# New ports collection makefile for:	XFree86-4-fontDefaultBitmap
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@@ -6,34 +6,34 @@
 #
 
 PORTNAME=	fontDefaultBitmap
-PORTVERSION=	4.0
+PORTVERSION=	4.0.1
 CATEGORIES=	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/${PORTVERSION}/source/ \
+		ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X400src-1.tgz X400src-2.tgz
-EXTRACT_ONLY=	X400src-2.tgz
+DISTFILES=	X401src-1.tgz X401src-2.tgz
+EXTRACT_ONLY=	X401src-2.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4 \
-		mkfontdir:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
 
-PREFIX?=	${X11BASE}
-PROJECTROOT=	-DProjectRoot=${PREFIX}
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
-DIST_SUBDIR=	xc
-WRKSRC=		${WRKDIR}/xc/fonts/bdf/misc
+XFREE86_VERSION=	4
+USE_IMAKE=		YES
+PROJECTROOT=		-DProjectRoot=${PREFIX}
+DIST_SUBDIR=		xc
+EXTRACT_AFTER_ARGS=	| ${TAR} -xf - xc/fonts
+WRKSRC=			${WRKDIR}/xc/fonts/bdf/misc
 
 post-extract:
 	(cd ${WRKDIR} && \
 	 ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${DISTDIR}/${DIST_SUBDIR}/X400src-1.tgz \
-		${EXTRACT_AFTER_ARGS} xc/extras/fonts)
+		${DISTDIR}/${DIST_SUBDIR}/X401src-1.tgz \
+		| ${TAR} -xf - xc/extras/fonts)
 
 do-configure:
 	(cd ${WRKDIR}/xc/fonts/encodings && \
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo
index 9892020..d88dbd7 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
-MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
+MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
+MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
index 24e5b68..3d6ba78 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
@@ -1,3 +1,65 @@
+lib/X11/fonts/misc/6x13-ISO8859-3.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-4.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/6x13-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x13B-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/6x13B-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/6x13B-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/6x13B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/6x13O.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-1.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/6x13O-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-3.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-4.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-8.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/7x13-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/7x13-KOI8-R.pcf.gz
+lib/X11/fonts/misc/7x13B-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/7x13B-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/7x13B-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/7x13B-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/7x13B-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/7x13O.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-1.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/7x13O-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-3.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-4.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-10.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/8x13-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/8x13B-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/8x13B-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/8x13B-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/8x13B-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/8x13O.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-1.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-2.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-5.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-7.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-9.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-13.pcf.gz
+lib/X11/fonts/misc/8x13O-ISO8859-15.pcf.gz
+lib/X11/fonts/misc/18x18ko.pcf.gz
 lib/X11/fonts/misc/10x20-ISO8859-1.pcf.gz
 lib/X11/fonts/misc/10x20.pcf.gz
 lib/X11/fonts/misc/12x13ja.pcf.gz