update to 4.1.0.

get rid of version number from comments in Makefile, pkg-comment and pkg-descr. Reviewed by: maintainer
author: sf <sf@FreeBSD.org> 2001-06-12 22:59:53 +0800
committer: sf <sf@FreeBSD.org> 2001-06-12 22:59:53 +0800
commit: 002e8c437914812250e828194bf0f3f6a306fc95 (patch)
tree: e1d6b7316d63bb8606ab006b5a06429a82800f4e
parent: 617503965416481744abca022ec5b7fcbb41dd0b (diff)
download: freebsd-ports-gnome-002e8c437914812250e828194bf0f3f6a306fc95.tar.gz
freebsd-ports-gnome-002e8c437914812250e828194bf0f3f6a306fc95.tar.zst
freebsd-ports-gnome-002e8c437914812250e828194bf0f3f6a306fc95.zip
39 files changed, 427 insertions, 488 deletions
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 2dd1840828fc..1d639e89f53c 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86-4-clients
+# New ports collection makefile for:	XFree86-clients
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@@ -6,17 +6,13 @@
 #
 
 PORTNAME=	clients
-PORTVERSION=	4.0.3
+PORTVERSION=	4.1.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	4.0.2
+MASTER_SITE_SUBDIR=	4.1.0
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X402src-1.tgz X402src-2.tgz
-EXTRACT_ONLY=	X402src-1.tgz
-
-PATCH_SITES=	${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g}
-PATCHFILES=	4.0.2-4.0.3.diff.gz
-PATCH_DIST_STRIP=	-p1
+DISTFILES=	X410src-1.tgz X410src-2.tgz
+EXTRACT_ONLY=	X410src-1.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -66,7 +62,7 @@ pre-fetch:
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
 		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY=	X402src-1.tgz
+EXTRACT_ONLY=	X410src-1.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
@@ -78,7 +74,7 @@ IGNOREFILES=	Wraphelp.c
 post-extract:
 	( cd ${WRKDIR} && \
 	 ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-	   ${DISTDIR}/${DIST_SUBDIR}/X402src-2.tgz \
+	   ${DISTDIR}/${DIST_SUBDIR}/X410src-2.tgz \
 	    | ${TAR} -xf - xc/fonts/util )
 
 do-configure:
diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo
index f8914f6e46bf..7207b321c4db 100644
--- a/x11/XFree86-4-clients/distinfo
+++ b/x11/XFree86-4-clients/distinfo
@@ -1,4 +1,3 @@
-MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4
-MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae
-MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4
+MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/X410src-2.tgz) = beaffed1cbdb700e5fed6a5490a7f222
 MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11/XFree86-4-clients/files/manpages b/x11/XFree86-4-clients/files/manpages
index 14c113d49973..9074e770806c 100644
--- a/x11/XFree86-4-clients/files/manpages
+++ b/x11/XFree86-4-clients/files/manpages
@@ -7,10 +7,12 @@ MAN1=	Xmark.1 \
 	bmtoa.1 \
 	cxpm.1 \
 	dga.1 \
+	dpsexec.1 \
+	dpsinfo.1 \
 	editres.1 \
-	fsinfo.1 \
 	fslsfonts.1 \
 	fstobdf.1 \
+	glxgears.1 \
 	glxinfo.1 \
 	iceauth.1 \
 	ico.1 \
@@ -31,6 +33,7 @@ MAN1=	Xmark.1 \
 	smproxy.1 \
 	startx.1 \
 	sxpm.1 \
+	texteroids.1 \
 	twm.1 \
 	viewres.1 \
 	x11perf.1 \
@@ -53,6 +56,8 @@ MAN1=	Xmark.1 \
 	xfd.1 \
 	xfindproxy.1 \
 	xfontsel.1 \
+	xfsinfo.1 \
+	xftcache.1 \
 	xfwp.1 \
 	xgamma.1 \
 	xgc.1 \
@@ -71,6 +76,7 @@ MAN1=	Xmark.1 \
 	xmag.1 \
 	xman.1 \
 	xmessage.1 \
+	xmh.1 \
 	xmodmap.1 \
 	xon.1 \
 	xprop.1 \
diff --git a/x11/XFree86-4-clients/pkg-comment b/x11/XFree86-4-clients/pkg-comment
index 98276b17a4c4..7f9288c4e2cf 100644
--- a/x11/XFree86-4-clients/pkg-comment
+++ b/x11/XFree86-4-clients/pkg-comment
@@ -1 +1 @@
-X11R6.4/XFree86-4.0 Client environments
+X11R6.4/XFree86-4 Client environments
diff --git a/x11/XFree86-4-clients/pkg-descr b/x11/XFree86-4-clients/pkg-descr
index 8dbac99e617f..c66c30be1cb5 100644
--- a/x11/XFree86-4-clients/pkg-descr
+++ b/x11/XFree86-4-clients/pkg-descr
@@ -1,4 +1,4 @@
-This package contains XFree86-4.0 Client Environments.
+This package contains XFree86-4 Client Environments.
 xterm, ico, twm, oclock and other client programs are
 included this package. Also library files and resource
 files are included.
diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist
index bacda37e4438..949019aaa5c9 100644
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@@ -8,10 +8,12 @@ bin/bitmap
 bin/bmtoa
 bin/cxpm
 bin/dga
+bin/dpsexec
+bin/dpsinfo
 bin/editres
-bin/fsinfo
 bin/fslsfonts
 bin/fstobdf
+bin/glxgears
 bin/glxinfo
 bin/iceauth
 bin/ico
@@ -32,6 +34,7 @@ bin/showrgb
 bin/smproxy
 bin/startx
 bin/sxpm
+bin/texteroids
 bin/twm
 bin/ucs2any.pl
 bin/viewres
@@ -55,6 +58,8 @@ bin/xf86cfg
 bin/xfd
 bin/xfindproxy
 bin/xfontsel
+bin/xfsinfo
+bin/xftcache
 bin/xfwp
 bin/xgamma
 bin/xgc
@@ -76,6 +81,7 @@ bin/xlsfonts
 bin/xmag
 bin/xman
 bin/xmessage
+bin/xmh
 bin/xmodmap
 bin/xon
 bin/xprop
@@ -106,6 +112,8 @@ include/X11/bitmaps/RotateRight
 include/X11/bitmaps/Stipple
 include/X11/bitmaps/Term
 include/X11/bitmaps/Up
+include/X11/bitmaps/black6
+include/X11/bitmaps/box6
 include/X11/bitmaps/ldblarrow
 include/X11/bitmaps/rdblarrow
 lib/X11/XErrorDB
@@ -140,9 +148,12 @@ lib/X11/app-defaults/Xgc
 lib/X11/app-defaults/Xmag
 lib/X11/app-defaults/Xman
 lib/X11/app-defaults/Xmessage
+lib/X11/app-defaults/Xmh
 lib/X11/app-defaults/Xvidtune
 lib/X11/doc/html/manindex1.html
 lib/X11/doc/html/manindex3.html
+lib/X11/etc/xterm.termcap
+lib/X11/etc/xterm.terminfo
 lib/X11/fonts/util/map-ISO8859-1
 lib/X11/fonts/util/map-ISO8859-2
 lib/X11/fonts/util/map-ISO8859-3
@@ -255,7 +266,8 @@ lib/X11/xkb/keymap/macintosh
 lib/X11/xkb/keymap/sgi/be
 lib/X11/xkb/keymap/sgi/bg
 lib/X11/xkb/keymap/sgi/ca
-lib/X11/xkb/keymap/sgi/cs
+lib/X11/xkb/keymap/sgi/cz
+lib/X11/xkb/keymap/sgi/cz_qwerty
 lib/X11/xkb/keymap/sgi/de
 lib/X11/xkb/keymap/sgi/de_CH
 lib/X11/xkb/keymap/sgi/dk
@@ -274,6 +286,8 @@ lib/X11/xkb/keymap/sgi/pl
 lib/X11/xkb/keymap/sgi/pt
 lib/X11/xkb/keymap/sgi/ru
 lib/X11/xkb/keymap/sgi/se
+lib/X11/xkb/keymap/sgi/sk
+lib/X11/xkb/keymap/sgi/sk_qwerty
 lib/X11/xkb/keymap/sgi/th
 lib/X11/xkb/keymap/sgi/us
 lib/X11/xkb/keymap/sony
@@ -306,12 +320,12 @@ lib/X11/xkb/symbols/az
 lib/X11/xkb/symbols/be
 lib/X11/xkb/symbols/bg
 lib/X11/xkb/symbols/br
+lib/X11/xkb/symbols/by
 lib/X11/xkb/symbols/ca
 lib/X11/xkb/symbols/ca_enhanced
-lib/X11/xkb/symbols/cs
-lib/X11/xkb/symbols/cs_qwerty
 lib/X11/xkb/symbols/ctrl
-lib/X11/xkb/symbols/czsk
+lib/X11/xkb/symbols/cz
+lib/X11/xkb/symbols/cz_qwerty
 lib/X11/xkb/symbols/de
 lib/X11/xkb/symbols/de_CH
 lib/X11/xkb/symbols/digital/lk
@@ -321,6 +335,7 @@ lib/X11/xkb/symbols/digital/vt
 lib/X11/xkb/symbols/dk
 lib/X11/xkb/symbols/dvorak
 lib/X11/xkb/symbols/ee
+lib/X11/xkb/symbols/el
 lib/X11/xkb/symbols/en_US
 lib/X11/xkb/symbols/es
 lib/X11/xkb/symbols/fi
@@ -329,9 +344,9 @@ lib/X11/xkb/symbols/fr_CH
 lib/X11/xkb/symbols/fujitsu/jp
 lib/X11/xkb/symbols/fujitsu/us
 lib/X11/xkb/symbols/gb
-lib/X11/xkb/symbols/gr
 lib/X11/xkb/symbols/group
 lib/X11/xkb/symbols/hp/us
+lib/X11/xkb/symbols/hr
 lib/X11/xkb/symbols/hu
 lib/X11/xkb/symbols/hu_US
 lib/X11/xkb/symbols/il
@@ -346,6 +361,7 @@ lib/X11/xkb/symbols/lock
 lib/X11/xkb/symbols/lt
 lib/X11/xkb/symbols/lt_p
 lib/X11/xkb/symbols/lt_std
+lib/X11/xkb/symbols/lv
 lib/X11/xkb/symbols/macintosh/de
 lib/X11/xkb/symbols/macintosh/de_CH
 lib/X11/xkb/symbols/macintosh/dk
@@ -372,6 +388,8 @@ lib/X11/xkb/symbols/ru
 lib/X11/xkb/symbols/se
 lib/X11/xkb/symbols/sgi/jp
 lib/X11/xkb/symbols/si
+lib/X11/xkb/symbols/sk
+lib/X11/xkb/symbols/sk_qwerty
 lib/X11/xkb/symbols/sony/us
 lib/X11/xkb/symbols/sr
 lib/X11/xkb/symbols/sun/se
@@ -390,6 +408,7 @@ lib/X11/xkb/types/basic
 lib/X11/xkb/types/cancel
 lib/X11/xkb/types/complete
 lib/X11/xkb/types/default
+lib/X11/xkb/types/extra
 lib/X11/xkb/types/iso9995
 lib/X11/xkb/types/mousekeys
 lib/X11/xkb/types/nocancel
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 082d6ae1f6cf..3e9586fbad85 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -101,5 +101,6 @@ configure () {
     cp -f $LOCALDEF $HOSTDEF
 }
 
+cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
 configure
 exit 0
diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile
index e3aed18d494a..6149e7d8fab4 100644
--- a/x11/XFree86-4-documents/Makefile
+++ b/x11/XFree86-4-documents/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86-4-documents-4.0.1
+# New ports collection makefile for:	XFree86-documents
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	documents
-PORTVERSION=	4.0.3
+PORTVERSION=	4.1.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	4.0.2
+MASTER_SITE_SUBDIR=	4.1.0
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X402src-1.tgz X402src-2.tgz X402src-3.tgz
-EXTRACT_ONLY=	X402src-2.tgz X402src-3.tgz
+DISTFILES=	X410src-1.tgz X410src-2.tgz X410src-3.tgz
+EXTRACT_ONLY=	X410src-2.tgz X410src-3.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -27,7 +27,7 @@ INSTALL_TARGET=		install install.man
 post-extract:
 	(cd ${WRKDIR} && \
 	 ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${DISTDIR}/${DIST_SUBDIR}/X402src-1.tgz \
+		${DISTDIR}/${DIST_SUBDIR}/X410src-1.tgz \
 		${EXTRACT_AFTER_ARGS} xc/doc)
 
 do-configure:
diff --git a/x11/XFree86-4-documents/distinfo b/x11/XFree86-4-documents/distinfo
index 9920e6bd5446..5baf520e703d 100644
--- a/x11/XFree86-4-documents/distinfo
+++ b/x11/XFree86-4-documents/distinfo
@@ -1,3 +1,3 @@
-MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4
-MD5 (xc/X402src-2.tgz) = 7dc2f848c7466f6704c8dfc3492628ae
-MD5 (xc/X402src-3.tgz) = 3126d1ef38e3ece0260804ed3c691144
+MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/X410src-2.tgz) = beaffed1cbdb700e5fed6a5490a7f222
+MD5 (xc/X410src-3.tgz) = f94e42cd5c5e31a702ec64bfdc017a7d
diff --git a/x11/XFree86-4-documents/pkg-comment b/x11/XFree86-4-documents/pkg-comment
index f7d7444e86af..e995ef5f226e 100644
--- a/x11/XFree86-4-documents/pkg-comment
+++ b/x11/XFree86-4-documents/pkg-comment
@@ -1 +1 @@
-X11R6.4/XFree86-4.0 Document Files
+X11R6.4/XFree86-4 Document Files
diff --git a/x11/XFree86-4-documents/pkg-descr b/x11/XFree86-4-documents/pkg-descr
index c4473976a7a0..b564d08a4786 100644
--- a/x11/XFree86-4-documents/pkg-descr
+++ b/x11/XFree86-4-documents/pkg-descr
@@ -1,3 +1,3 @@
-This package contains XFree86-4.0 documentations.
+This package contains XFree86-4 documentations.
 
 WWW: http://www.xfree86.org/
diff --git a/x11/XFree86-4-documents/pkg-plist b/x11/XFree86-4-documents/pkg-plist
index 19ef485beeb3..d301717da810 100644
--- a/x11/XFree86-4-documents/pkg-plist
+++ b/x11/XFree86-4-documents/pkg-plist
@@ -1,38 +1,95 @@
 lib/X11/doc/DPMS.TXT
 lib/X11/doc/DPMSLib.TXT
+lib/X11/doc/ICElib.TXT
 lib/X11/doc/INSTALL.TXT
+lib/X11/doc/LocaleDB.TXT
 lib/X11/doc/PM_spec.TXT
 lib/X11/doc/PostScript/DPMS.PS
 lib/X11/doc/PostScript/DPMSLib.PS
+lib/X11/doc/PostScript/ICElib.PS
 lib/X11/doc/PostScript/INSTALL.PS
+lib/X11/doc/PostScript/LocaleDB.PS
 lib/X11/doc/PostScript/RELNOTES.PS
+lib/X11/doc/PostScript/SMlib.PS
+lib/X11/doc/PostScript/XIMTransport.PS
+lib/X11/doc/PostScript/XiLib.PS
+lib/X11/doc/PostScript/XiPorting.PS
+lib/X11/doc/PostScript/XiProtocol.PS
+lib/X11/doc/PostScript/Xtrans.PS
+lib/X11/doc/PostScript/appgroup.PS
+lib/X11/doc/PostScript/bdf.PS
 lib/X11/doc/PostScript/bigreq.PS
 lib/X11/doc/PostScript/buffer.PS
+lib/X11/doc/PostScript/ctext.PS
 lib/X11/doc/PostScript/ctlseqs.PS
+lib/X11/doc/PostScript/ddx.PS
 lib/X11/doc/PostScript/evi.PS
+lib/X11/doc/PostScript/fontlib.PS
+lib/X11/doc/PostScript/fsproto.PS
+lib/X11/doc/PostScript/i18nFramework.PS
+lib/X11/doc/PostScript/icccm.PS
+lib/X11/doc/PostScript/ice.PS
+lib/X11/doc/PostScript/intrinsics.PS
 lib/X11/doc/PostScript/mit-shm.PS
+lib/X11/doc/PostScript/proto.PS
 lib/X11/doc/PostScript/record.PS
 lib/X11/doc/PostScript/recordlib.PS
+lib/X11/doc/PostScript/rstart.PS
 lib/X11/doc/PostScript/shape.PS
 lib/X11/doc/PostScript/shapelib.PS
 lib/X11/doc/PostScript/tog-cup.PS
+lib/X11/doc/PostScript/widgets.PS
 lib/X11/doc/PostScript/xc-misc.PS
+lib/X11/doc/PostScript/xdmcp.PS
+lib/X11/doc/PostScript/xfs-design.PS
+lib/X11/doc/PostScript/xim.PS
+lib/X11/doc/PostScript/xlfd.PS
+lib/X11/doc/PostScript/xlib.PS
+lib/X11/doc/PostScript/xmu.PS
+lib/X11/doc/PostScript/xsmp.PS
 lib/X11/doc/PostScript/xtest.PS
 lib/X11/doc/PostScript/xtestlib.PS
 lib/X11/doc/RELNOTES.TXT
+lib/X11/doc/SMlib.TXT
+lib/X11/doc/XIMTransport.TXT
+lib/X11/doc/XiLib.TXT
+lib/X11/doc/XiPorting.TXT
+lib/X11/doc/XiProtocol.TXT
+lib/X11/doc/Xtrans.TXT
+lib/X11/doc/appgroup.TXT
+lib/X11/doc/bdf.TXT
 lib/X11/doc/bigreq.TXT
 lib/X11/doc/buffer.TXT
+lib/X11/doc/ctext.TXT
 lib/X11/doc/ctlseqs.TXT
+lib/X11/doc/ddx.TXT
 lib/X11/doc/evi.TXT
+lib/X11/doc/fontlib.TXT
+lib/X11/doc/fsproto.TXT
+lib/X11/doc/i18nFramework.TXT
+lib/X11/doc/icccm.TXT
+lib/X11/doc/ice.TXT
+lib/X11/doc/intrinsics.TXT
 lib/X11/doc/libGL.TXT
 lib/X11/doc/mit-shm.TXT
+lib/X11/doc/proto.TXT
 lib/X11/doc/record.TXT
 lib/X11/doc/recordlib.TXT
 lib/X11/doc/render-protocol.TXT
+lib/X11/doc/rstart.TXT
+lib/X11/doc/rstartd.TXT
 lib/X11/doc/shape.TXT
 lib/X11/doc/shapelib.TXT
 lib/X11/doc/tog-cup.TXT
+lib/X11/doc/widgets.TXT
 lib/X11/doc/xc-misc.TXT
+lib/X11/doc/xdmcp.TXT
+lib/X11/doc/xfs-design.TXT
+lib/X11/doc/xim.TXT
+lib/X11/doc/xlfd.TXT
+lib/X11/doc/xlib.TXT
+lib/X11/doc/xmu.TXT
+lib/X11/doc/xsmp.TXT
 lib/X11/doc/xtest.TXT
 lib/X11/doc/xtestlib.TXT
 lib/X11/doc/xv-protocol-v2.TXT
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index b046ec1580e0..137712b25def 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86Xlibraries-4.0
+# New ports collection makefile for:	XFree86-libraries
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@@ -6,21 +6,17 @@
 #
 
 PORTNAME=	libraries
-PORTVERSION=	4.0.3
-PORTREVISION=	1
+PORTVERSION=	4.1.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	4.0.2
+MASTER_SITE_SUBDIR=	4.1.0
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X402src-1.tgz
-
-PATCH_SITES=	${MASTER_SITE_XFREE:S,%SUBDIR%/source,4.0.3/patches,g}
-PATCHFILES=	4.0.2-4.0.3.diff.gz
-PATCH_DIST_STRIP=	-p1
+DISTFILES=	X410src-1.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
 BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
+LIB_DEPENDS=	freetype.6:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	mkhtmlindex:${PORTSDIR}/devel/imake-4
 
 XFREE86_VERSION=	4
@@ -90,7 +86,7 @@ pre-fetch:
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
 		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY=	X402src-1.tgz
+EXTRACT_ONLY=	X410src-1.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
@@ -99,12 +95,4 @@ IGNOREFILES=	Wraphelp.c
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
-post-build:
-	cd ${WRKSRC}/extras/freetype2/builds/unix; \
-	./configure --prefix=${PREFIX}
-
-post-install:
-	cd ${WRKSRC}/extras/freetype2/builds/unix; \
-	${INSTALL_SCRIPT} freetype-config ${PREFIX}/bin
-
 .include <bsd.port.post.mk>
diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo
index d680d0749a4e..942f997451ad 100644
--- a/x11/XFree86-4-libraries/distinfo
+++ b/x11/XFree86-4-libraries/distinfo
@@ -1,3 +1,2 @@
-MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4
-MD5 (xc/4.0.2-4.0.3.diff.gz) = c8bb56df966dd0a51d2291bca36e0ea4
+MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
 MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11/XFree86-4-libraries/files/patch-DRI b/x11/XFree86-4-libraries/files/patch-DRI
index 2796fce64e50..6b51e4dd1f2d 100644
--- a/x11/XFree86-4-libraries/files/patch-DRI
+++ b/x11/XFree86-4-libraries/files/patch-DRI
@@ -1,64 +1,3 @@
---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_drv.c~	Sat Jun 17 02:03:32 2000
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/mga/mga_drv.c	Fri Mar 30 02:50:04 2001
-@@ -41,7 +41,7 @@
- #define MGA_NAME	 "mga"
- #define MGA_DESC	 "Matrox g200/g400"
- #define MGA_DATE	 "19991213"
--#define MGA_MAJOR	 1
-+#define MGA_MAJOR	 2
- #define MGA_MINOR	 0
- #define MGA_PATCHLEVEL	 0
- 
---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h.orig	Sat Jun 17 02:03:28 2000
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drmP.h	Tue Apr 10 02:56:17 2001
-@@ -49,11 +49,11 @@
- #include <sys/sysctl.h>
- #include <sys/select.h>
- #include <sys/bus.h>
--#if __FreeBSD_version >= 500005
-+#if __FreeBSD_version > 410000
- #include <sys/taskqueue.h>
- #endif
- 
--#if __FreeBSD_version >= 500006
-+#if __FreeBSD_version > 410000
- #define DRM_AGP
- #endif
- 
-@@ -128,7 +128,7 @@
-  * Fake out the module macros for versions of FreeBSD where they don't
-  * exist.
-  */
--#if __FreeBSD_version < 500002
-+#if __FreeBSD_version < 420000
- 
- #define MODULE_VERSION(a,b)		struct __hack
- #define MODULE_DEPEND(a,b,c,d,e)	struct __hack
-@@ -517,7 +517,7 @@
- 	int		  last_checked;	/* Last context checked for DMA	   */
- 	int		  last_context;	/* Last current context		   */
- 	int		  last_switch;	/* Time at last context switch  */
--#if __FreeBSD_version >= 500005
-+#if __FreeBSD_version >= 420000
- 	struct task	  task;
- #endif
- 	struct timespec	  ctx_start;
-@@ -548,6 +548,8 @@
- 	void		  *dev_private;
- } drm_device_t;
- 
-+#undef SYSCTL_HANDLER_ARGS
-+#define SYSCTL_HANDLER_ARGS (struct sysctl_oid *oidp, void *arg1, int arg2, struct sysctl_req *req)
- 
- 				/* Internal function definitions */
- 
---- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd~	Sat Jun 17 02:03:28 2000
-+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Makefile.bsd	Fri Mar 30 15:02:30 2001
-@@ -2,3 +2,3 @@
- 
--SUBDIR = drm tdfx gamma
-+SUBDIR = drm tdfx gamma mga
- 
 --- programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/Makefile.orig	Wed Apr 11 11:15:17 2001
 +++ programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/drm/Makefile	Wed Apr 11 11:18:01 2001
 @@ -6,6 +6,7 @@
diff --git a/x11/XFree86-4-libraries/files/patch-XTT b/x11/XFree86-4-libraries/files/patch-XTT
new file mode 100644
index 000000000000..bea103fd3abc
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-XTT
@@ -0,0 +1,48 @@
+--- extras/X-TrueType/xttfuncs.c.old	2000/09/26 15:56:41	1.8
++++ extras/X-TrueType/xttfuncs.c	2001/02/18 04:08:33
+@@ -565,8 +565,9 @@
+ 
+     /*
+      * Check invalid char index.
++     * c = 0 is the default glyph for undefined glyphs in TTF.
+      */
+-    if ( c <= 0 ) {
++    if ( c < 0 ) {
+         charInfo = &nocharinfo;
+         goto next;
+     }
+@@ -769,8 +770,9 @@
+ 
+     /*
+      * Check invalid char index.
++     * c = 0 is the default glyph for undefined glyphs in TTF.
+      */
+-    if ( c <= 0 ) {
++    if ( c < 0 ) {
+         charInfo = &nocharinfo;
+         goto next;
+     }
+@@ -934,14 +936,19 @@
+                   c1 <= pFont->info.lastRow  &&
+                   c2 >= pFont->info.firstCol &&
+                   c2 <= pFont->info.lastCol)) {
+-                *glyphs++ = &nocharinfo;
++		/* 
++		 * &nocharinfo will show garbage, just set c1 to 0. 
++		 * The default glyph for undefined glphy will be used.
++		 */
++                /* *glyphs++ = &nocharinfo; */
+                 dprintf((stderr, "invalid code\n"));
++		c1 = 0;
+             } else {
+                 c1 = ft->codeConverterInfo.ptrCodeConverter(c1<<8|c2);
++	    }
+                 dprintf((stderr, "%04x\n", c1));
+                 *glyphs++ = get_glyph(ft, TT_Char_Index(ft->charmap, c1),
+                                       spacing);
+-            }
+         }
+         break;
+     }
+
+
diff --git a/x11/XFree86-4-libraries/files/patch-a1 b/x11/XFree86-4-libraries/files/patch-a1
deleted file mode 100644
index 4b8c723564f1..000000000000
--- a/x11/XFree86-4-libraries/files/patch-a1
+++ /dev/null
@@ -1,16 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support//shared/xf86Axp.h~	Mon Nov  6 22:57:11 2000
-+++ programs/Xserver/hw/xfree86/os-support//shared/xf86Axp.h	Fri Apr  6 00:21:23 2001
-@@ -19,13 +19,6 @@
-   IRONGATE
- } axpDevice;
-   
--typedef struct 
-- { char* sysName; 
--   char* sysVari; 
--   char* cpu; 
--   axpDevice sys; }
--AXP;
--
- typedef struct {
-   axpDevice id;
-   unsigned long hae_thresh;
diff --git a/x11/XFree86-4-libraries/files/patch-c b/x11/XFree86-4-libraries/files/patch-c
index ea9412dd52f7..62ce9190aabd 100644
--- a/x11/XFree86-4-libraries/files/patch-c
+++ b/x11/XFree86-4-libraries/files/patch-c
@@ -1,18 +1,18 @@
---- config/cf/Imake.tmpl.orig	Tue Dec  5 10:16:28 2000
-+++ config/cf/Imake.tmpl	Tue Dec  5 10:39:48 2000
-@@ -1425,7 +1425,7 @@
+--- config/cf/Imake.tmpl.orig	Fri Apr 27 06:09:38 2001
++++ config/cf/Imake.tmpl	Mon Jun  4 19:29:44 2001
+@@ -1487,7 +1487,7 @@
         CXXOPTIONS = CplusplusOptions
        CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) 
-        CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES)
+        CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
 -         CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
 +         CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
  #endif
           COMPRESS = CompressCmd
            GZIPCMD = GzipCmd
-@@ -1616,7 +1616,7 @@
+@@ -1682,7 +1682,7 @@
   */
        ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
-        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES)
+        ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
 -           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
 +           CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
          LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
diff --git a/x11/XFree86-4-libraries/files/patch-f b/x11/XFree86-4-libraries/files/patch-f
index 33642a0326d4..93e7d910dadf 100644
--- a/x11/XFree86-4-libraries/files/patch-f
+++ b/x11/XFree86-4-libraries/files/patch-f
@@ -16,9 +16,9 @@
 -zh_TW.big5/Compose:	zh_TW.Big5
 +zh_TW.Big5/Compose:	zh_TW.Big5
  zh_TW/Compose:		zh_TW.eucTW
---- nls/locale.alias~	Tue Dec 12 03:18:29 2000
-+++ nls/locale.alias	Tue Dec 12 03:58:51 2000
-@@ -444,11 +444,11 @@
+--- nls/locale.alias~	Wed May 23 20:32:14 2001
++++ nls/locale.alias	Sat May 26 02:37:21 2001
+@@ -493,12 +493,12 @@
  zh						zh_CN.eucCN
  zh_CN						zh_CN.eucCN
  zh_CN.big5					zh_TW.big5
@@ -27,30 +27,29 @@
  zh_CN.EUC					zh_CN.eucCN
  zh_CN.euc					zh_CN.eucCN
  zh_CN.gb2312					zh_CN.eucCN
+ zh_CN.gbk					zh_CN.GBK
 -zh_TW						zh_TW.big5
 +zh_TW						zh_TW.Big5
  zh_TW.EUC					zh_TW.eucTW
  zh_TW.euc					zh_TW.eucTW
  
-@@ -1034,15 +1034,15 @@
+@@ -1182,13 +1182,13 @@
  yi_US.MICROSOFT-CP1255:				yi_US.CP1255
  zh:						zh_CN.eucCN
  zh_CN:						zh_CN.eucCN
 -zh_CN.big5:					zh_TW.big5
 -zh_CN.Big5:					zh_TW.big5
-+zh_CN.Big5:					zh_TW.Big5
++zh_CN.big5:					zh_TW.Big5
 +zh_CN.Big5:					zh_TW.Big5
  zh_CN.EUC:					zh_CN.eucCN
  zh_CN.euc:					zh_CN.eucCN
  zh_CN.gb2312:					zh_CN.eucCN
- zh_TW:						zh_TW.big5
+ zh_CN.gbk:					zh_CN.GBK
+-zh_TW:						zh_TW.big5
++zh_TW:						zh_TW.Big5
  zh_TW.EUC:					zh_TW.eucTW
  zh_TW.euc:					zh_TW.eucTW
--zh_TW.big5:					zh_TW.big5
-+zh_TW.Big5:					zh_TW.Big5
- 
- XCOMM The following locale names are used in SCO 3.0
- english_uk.8859:				en_GB.ISO8859-1
+ zh_TW.big5:					zh_TW.big5
 --- nls/locale.dir~	Tue Dec 12 03:18:29 2000
 +++ nls/locale.dir	Tue Dec 12 04:01:54 2000
 @@ -199,7 +199,7 @@
@@ -98,15 +97,15 @@
 +# Special Character
 +
 +# End of Sequence Definition
---- nls/XLC_LOCALE/Imakefile~	Tue Dec 12 03:18:29 2000
-+++ nls/XLC_LOCALE/Imakefile	Tue Dec 12 04:07:10 2000
-@@ -86,7 +86,7 @@
- LTarget(vi_VN.viscii)
- LTarget(zh)
+--- nls/XLC_LOCALE/Imakefile~	Tue Mar  6 19:54:45 2001
++++ nls/XLC_LOCALE/Imakefile	Sat May 26 02:38:44 2001
+@@ -88,7 +88,7 @@
+ LTarget(zh_CN.gbk)
+ LTarget(zh_HK.big5hkscs)
  LTarget(zh_TW)
 -LTarget(zh_TW.big5)
 +LTarget(zh_TW.Big5)
- LTarget(th_TH.TACTIS)
+ LTarget(th_TH)
  LTarget(en_US.UTF-8)
  #ifdef UXPArchitecture
 --- nls/XLC_LOCALE/zh_TW.Big5.orig	Sun Jul 16 04:33:35 2000
diff --git a/x11/XFree86-4-libraries/files/patch-freetype b/x11/XFree86-4-libraries/files/patch-freetype
new file mode 100644
index 000000000000..9aad792741d5
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-freetype
@@ -0,0 +1,11 @@
+--- config/cf/X11.tmpl.orig	Sat Jun  2 07:21:30 2001
++++ config/cf/X11.tmpl	Fri Jun  8 00:44:19 2001
+@@ -2453,7 +2453,7 @@
+ FREETYPE2DIR = Freetype2Dir
+ FREETYPE2LIBDIR = Freetype2LibDir
+ FREETYPE2INCDIR = Freetype2IncDir
+-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
++FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2DIR)/include
+ FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype
+ FREETYPE2DEFINES = -DFREETYPE2
+ #endif
diff --git a/x11/XFree86-4-libraries/files/patch-h b/x11/XFree86-4-libraries/files/patch-h
index 966a74a47bf7..a9649b315c06 100644
--- a/x11/XFree86-4-libraries/files/patch-h
+++ b/x11/XFree86-4-libraries/files/patch-h
@@ -1,15 +1,15 @@
---- config/cf/Imake.rules~	Tue Dec  5 10:16:28 2000
-+++ config/cf/Imake.rules	Tue Dec  5 11:01:00 2000
-@@ -1303,7 +1303,7 @@
- dest.suffix.html: file.man RmanCmdDependency				@@\
+--- config/cf/Imake.rules.orig	Fri Apr 27 06:27:48 2001
++++ config/cf/Imake.rules	Mon Jun  4 19:56:42 2001
+@@ -1388,7 +1388,7 @@
+ dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency		@@\
  	RemoveFiles(dest.suffix.html dest.suffix-html)			@@\
- 	RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) && \ @@\
--	  $(MV) dest.suffix-html $@					@@\
-+	  $(MV) dest.suffix-html dest.suffix.html			@@\
+ 	RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \		@@\
+-	  > dest.suffix-html) && $(MV) dest.suffix-html $@		@@\
++	  > dest.suffix-html) && $(MV) dest.suffix-html dest.suffix.html	@@\
  									@@\
  install.man:: dest.suffix.html						@@\
  	MakeDir($(DESTDIR)$(DOCHTMLDIR))				@@\
-@@ -1539,7 +1539,7 @@
+@@ -1624,7 +1624,7 @@
  	MakeDir(Concat($(DESTDIR),npath/mdir))				@@\
  	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	if [ -d Concat($(DESTDIR),opath/cdir) ]; then \			@@\
@@ -18,7 +18,7 @@
  		sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \		@@\
  	  cd Concat($(DESTDIR),opath/cdir); \				@@\
  	  if [ -d rdir -a ! -h rdir ]; then \ 				@@\
-@@ -1586,7 +1586,7 @@
+@@ -1671,7 +1671,7 @@
  	MakeDir(Concat($(DESTDIR),npath))				@@\
  	@MakeFlagsToShellFlags(i,set +e); \				@@\
  	if [ -d Concat($(DESTDIR),opath) ]; then \			@@\
diff --git a/x11/XFree86-4-libraries/files/patch-i810 b/x11/XFree86-4-libraries/files/patch-i810
new file mode 100644
index 000000000000..f9c346b29394
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-i810
@@ -0,0 +1,26 @@
+--- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.orig	Tue May 29 17:51:29 2001
++++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c	Thu Jun  7 00:12:25 2001
+@@ -2006,9 +2006,10 @@
+    if (I810_DEBUG & DEBUG_VERBOSE_DRI)
+       ErrorF("\n\nENTER VT\n");
+ 
++/*********BUGGY*********************
+    if (! I810BindGARTMemory(pScrn))
+        return FALSE;
+-
++***********************************/
+ #ifdef XF86DRI
+    if (pI810->directRenderingEnabled) {
+       if (I810_DEBUG & DEBUG_VERBOSE_DRI)
+@@ -2047,9 +2048,10 @@
+    }
+    I810Restore(pScrn);
+ 
++/*********BUGGY***********************
+    if (! I810UnbindGARTMemory(pScrn))
+        return;
+-
++*************************************/
+    vgaHWLock(hwp);
+ }
+ 
diff --git a/x11/XFree86-4-libraries/files/patch-xthreads b/x11/XFree86-4-libraries/files/patch-xthreads
index 5fb6641c724c..ea2e2e15f62b 100644
--- a/x11/XFree86-4-libraries/files/patch-xthreads
+++ b/x11/XFree86-4-libraries/files/patch-xthreads
@@ -1,110 +1,25 @@
---- include/Xos_r.h.orig	Sat Mar 24 17:03:44 2001
-+++ include/Xos_r.h	Sat Mar 24 17:03:56 2001
-@@ -245,7 +245,7 @@
- 
- /* NetBSD, at least, is missing several of the unixware passwd fields. */
-    
--#if defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
- __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
- {
-    memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
-@@ -412,7 +412,7 @@
- /* UnixWare 2.0, or other systems with thread support but no _r API. */
- /* WARNING:  The h_addr_list and s_aliases values are *not* copied! */
- 
--#if defined(__NetBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__)
- #include <sys/param.h>
- #endif
- 
---- config/cf/FreeBSD.cf.orig	Sat Mar 24 17:03:55 2001
-+++ config/cf/FreeBSD.cf	Sat Mar 24 17:04:13 2001
-@@ -66,6 +66,41 @@
- #define InstallXloadSetGID	YES
- #endif
- 
-+/*
-+ * Multi-thread safe libs 
-+ */	
-+/* 2.2.7 and later has libc_r (POSIX threads) */
-+#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \
-+    OSMajorVersion >= 3
-+# ifndef HasLibPthread
-+#  define HasLibPthread		NO
-+# endif
-+# define HasPosixThreads	YES
-+# define ThreadedX		YES
-+/*
-+ * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-+ */
-+# define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
-+/*
-+ * FreeBSD has tread-safe api but no getpwnam_r yet.
-+ */
-+# define HasThreadSafeAPI	YES
-+# define MTSafeAPIDefines	-DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
-+# if HasLibPthread
-+#  define ThreadsLibraries	-lpthread
-+# else
-+#  define BuildThreadStubLibrary  YES 
-+#  define NeedUIThrStubs          YES 
+--- config/cf/FreeBSD.cf.orig	Thu Jun  7 16:33:37 2001
++++ config/cf/FreeBSD.cf	Thu Jun  7 16:34:43 2001
+@@ -80,7 +80,6 @@
+ /*
+  * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
+  */
+-# define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
+ /*
+  * FreeBSD has tread-safe api but no getpwnam_r yet.
+  */
+@@ -91,8 +90,12 @@
+ # else
+ #  define BuildThreadStubLibrary  YES 
+ #  define NeedUIThrStubs          YES 
+-#  define ThreadsCompileFlags	-pthread
+-#  define ThreadsLibraries 	-pthread
 +#  if (OSRelVersion >= 500016)
 +#   define ThreadsLibraries 	-lc_r
 +#  else
++#   define SystemMTDefines	-D_REENTRANT -D_THREAD_SAFE
 +#   define ThreadsLibraries 	-pthread
 +#  endif
-+#  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
-+#  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
-+# endif
-+#endif
-+
- #define AvoidNullMakeCommand	YES
- #define StripInstalledPrograms	YES
- #define CompressAllFonts	YES
-@@ -97,7 +132,23 @@
- #endif
- #endif
- 
--#define CcCmd			cc
-+/*
-+ * Add an LD_LIBRARY_PATH environment variable, defined by $(CLIENTENVSETUP),
-+ * when building X to avoid that for each client ld give the message
-+ *
-+ *    ld: warning: libXThrStub.so.6, needed by libX11.so, not found
-+ */
-+#if BuildThreadStubLibrary && !UseInstalled
-+# define CcCmd			$(CLIENTENVSETUP) cc
-+# define CplusplusCmd		$(CLIENTENVSETUP) c++
-+#else
-+# define CcCmd			cc
-+# define CplusplusCmd		c++
-+#endif
-+
-+#define CppCmd			/usr/bin/cpp
-+#define PreProcessCmd		CppCmd
-+#define StandardCppOptions	-traditional
- #define CppCmd			/usr/bin/cpp
- #define PreProcessCmd		CppCmd
- #define StandardCppOptions	-traditional
---- config/cf/bsdLib.tmpl.orig	Tue Aug 29 03:43:49 2000
-+++ config/cf/bsdLib.tmpl	Sat Mar 24 17:03:56 2001
-@@ -47,7 +47,9 @@
- #define SharedX11Reqs
- #endif
- #define SharedOldXReqs	$(LDPRELIB) $(XLIBONLY)
-+#ifndef SharedXtReqs
- #define SharedXtReqs	$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB)
-+#endif
- #define SharedXawReqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
- #define SharedXaw6Reqs	$(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
- #define SharedXmuReqs	$(LDPRELIB) $(XTOOLLIB) $(XLIB)
---- programs/glxinfo/Imakefile.orig	Fri Sep 22 20:35:46 2000
-+++ programs/glxinfo/Imakefile	Sat Mar 24 17:03:56 2001
-@@ -1,5 +1,6 @@
- XCOMM $XConsortium: Imakefile /main/7 1995/12/04 15:10:00 dpw $
- XCOMM $XFree86: xc/programs/glxinfo/Imakefile,v 1.1 2000/09/22 11:35:46 alanh Exp $
-+#include <Threads.tmpl>
-         DEPLIBS = $(DEPXTESTLIB) $(DEPXIELIB) $(DEPXLIB) $(DEPXKBFILELIB) $(DEPXF86LIBS) $(DEPXILIB)
- #ifndef OS2Architecture
- LOCAL_LIBRARIES = $(GLXLIB) $(XLIB) 
+ #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
+ #  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
+ # endif
diff --git a/x11/XFree86-4-libraries/files/patch-z04 b/x11/XFree86-4-libraries/files/patch-z04
index 5874d642de28..1189c82d52a0 100644
--- a/x11/XFree86-4-libraries/files/patch-z04
+++ b/x11/XFree86-4-libraries/files/patch-z04
@@ -1,6 +1,15 @@
---- lib/X11/Imakefile.orig	Fri Dec 15 15:10:40 2000
-+++ lib/X11/Imakefile	Fri Dec 15 15:12:30 2000
-@@ -939,8 +939,10 @@
+--- lib/X11/Imakefile.orig	Tue May  1 19:35:05 2001
++++ lib/X11/Imakefile	Wed Jun  6 23:35:50 2001
+@@ -905,7 +905,7 @@
+ REQUIREDLIBS = -lcygipc
+ #endif
+ 
+-#if !BuildServersOnly || XnestServer || BuildGLXLibrary || BuildClients
++#if !BuildServersOnly || XnestServer || BuildGLXLibrary || BuildClients || FreeBSDBuildXxserv
+ #include <Library.tmpl>
+ 
+ SpecialCLibObjectRule(ErrDes,$(ICONFIGFILES),$(EDB_DEFINES))
+@@ -944,8 +944,10 @@
  #if InstallXcmsTxt
  InstallNonExecFile(Xcms.txt,$(LIBDIR))
  #endif
diff --git a/x11/XFree86-4-libraries/files/patch-z14 b/x11/XFree86-4-libraries/files/patch-z14
index 3e5b66a4664b..abd685278cbb 100644
--- a/x11/XFree86-4-libraries/files/patch-z14
+++ b/x11/XFree86-4-libraries/files/patch-z14
@@ -1,22 +1,11 @@
---- programs/Xserver/hw/xfree86/etc/Imakefile.orig	Sat Feb 26 14:38:50 2000
-+++ programs/Xserver/hw/xfree86/etc/Imakefile	Thu Jun  1 15:21:43 2000
-@@ -49,6 +49,10 @@
- #else
-    TERMFILES = sun.termcap sun.terminfo xterm.termcap xterm.terminfo
- #endif
-+#else
-+#if defined(FreeBSDBuildXxserv) && FreeBSDBuildXxserv
-+   TERMFILES = sun.termcap sun.terminfo xterm.termcap xterm.terminfo
-+#endif
- #endif
- 
- XINST = Xinstall.sh
-@@ -126,7 +130,7 @@
- InstallNamedProg(svr4_rem_pch,svr4_patch_rem,$(LIBDIR)/etc)
+--- programs/Xserver/hw/xfree86/etc/Imakefile.orig	Wed May 30 07:52:23 2001
++++ programs/Xserver/hw/xfree86/etc/Imakefile	Thu Jun  7 06:55:20 2001
+@@ -43,7 +43,7 @@
+ # endif
  #endif
  
--#if !BuildServersOnly
-+#if !BuildServersOnly || (defined(FreeBSDBuildXxserv) && FreeBSDBuildXxserv)
- LinkFile(xterm.termcap,$(PROGRAMSRC)/xterm/termcap)
- LinkFile(xterm.terminfo,$(PROGRAMSRC)/xterm/terminfo)
+-#if !BuildServersOnly && BuildClients
++#if (!BuildServersOnly && BuildClients) || FreeBSDBuildXxserv
+ #ifndef SunArchitecture
+    TERMFILES = sun.termcap sun.terminfo
  #endif
diff --git a/x11/XFree86-4-libraries/files/patch-z31 b/x11/XFree86-4-libraries/files/patch-z31
deleted file mode 100644
index 71fc457bd19e..000000000000
--- a/x11/XFree86-4-libraries/files/patch-z31
+++ /dev/null
@@ -1,37 +0,0 @@
---- lib/GL/Imakefile.orig	Wed Dec 20 13:20:28 2000
-+++ lib/GL/Imakefile	Wed Dec 20 13:24:16 2000
-@@ -303,10 +303,13 @@
- 
- #if NormalLibGlx
- NormalDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(UOBJS))
-+# if !defined(LibInstall) || LibInstall 
- InstallLibrary($(LIBNAME),$(USRLIBDIR))
-+# endif /* LibInstall */
- #endif
- #if SharedLibGlx
- SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(GLXSUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.)
-+# if !defined(LibInstall) || LibInstall 
- InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
- #if LinkGLToUsrLib && AlternateUsrLibDir
- install::
-@@ -315,15 +318,20 @@
- 	$(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so || true
- 	$(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1
- 	$(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 || true
-+# endif /* LibInstall */
- #endif
- #endif
- #if DebugLibGlx
- DebuggedDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(DOBJS))
-+# if !defined(LibInstall) || LibInstall 
- InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
-+# endif /* LibInstall */
- #endif
- #if ProfileLibGlx
- ProfiledDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(POBJS))
-+# if !defined(LibInstall) || LibInstall 
- InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
-+# endif /* LibInstall */
- #endif
- 
- XCOMM libOSmesa needs libGL, so build it now
diff --git a/x11/XFree86-4-libraries/files/patch-z32 b/x11/XFree86-4-libraries/files/patch-z32
index 0255cb1e6356..7ac43bf1cd09 100644
--- a/x11/XFree86-4-libraries/files/patch-z32
+++ b/x11/XFree86-4-libraries/files/patch-z32
@@ -1,12 +1,19 @@
---- lib/GL/mesa/src/OSmesa/Imakefile.orig	Thu Dec 14 17:30:09 2000
-+++ lib/GL/mesa/src/OSmesa/Imakefile	Tue Dec 19 14:26:58 2000
-@@ -281,7 +281,8 @@
- /*InstallLibrary($(LIBNAME),$(USRLIBDIR))*/
+--- lib/GL/mesa/src/OSmesa/Imakefile.orig	Tue Apr  3 11:29:33 2001
++++ lib/GL/mesa/src/OSmesa/Imakefile	Thu Jun  7 02:58:09 2001
+@@ -58,7 +58,7 @@
+ LIBNAME = OSMesa
+ SOREV = 3.3
  
- SharedDepLibraryTarget($(LIBNAME),$(SOREV), $(DONES), $(OBJS), ., .)
-+#if (!defined(LibInstall) || LibInstall) || (!defined(ModInstall) || ModInstall)
- InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
 -
++#if !defined(LibInstall) || LibInstall || (!defined(ModInstall) || ModInstall)
+ #if DoNormalLib
+ NormalLibraryTarget($(LIBNAME), $(UOBJS))
+ InstallLibrary($(LIBNAME),$(USRLIBDIR))
+@@ -77,6 +77,7 @@
+ #if DoProfileLib
+ ProfiledLibraryTarget($(LIBNAME), $(POBJS))
+ InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
 +#endif
+ #endif
  
  DependTarget()
diff --git a/x11/XFree86-4-libraries/files/patch-z33 b/x11/XFree86-4-libraries/files/patch-z33
deleted file mode 100644
index 05a649c7b839..000000000000
--- a/x11/XFree86-4-libraries/files/patch-z33
+++ /dev/null
@@ -1,70 +0,0 @@
---- config/cf/Imake.rules~	Fri Dec 15 14:26:40 2000
-+++ config/cf/Imake.rules	Fri Dec 15 14:32:56 2000
-@@ -1193,10 +1193,14 @@
-  * short file names).
-  */
- #ifndef InstallManPageLong
-+#if !defined(ManInstall) || ManInstall
- #define	InstallManPageLong(file,destdir,dest)				@@\
- BuildInstallHtmlManPage(file,dest,$(MANSUFFIX))				@@\
- 									@@\
- InstallNamedTarget(install.man,file.man,$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX))
-+#else
-+#define	InstallManPageLong(file,destdir,dest)
-+#endif /* ManInstall */
- #endif /* InstallManPageLong */
- 
- 
-@@ -1213,6 +1217,7 @@
-  * InstallManPageAliases - generate rules to install manual page aliases.
-  */
- #ifndef InstallManPageAliases
-+#if !defined(ManInstall) || ManInstall
- #define	InstallManPageAliases(file,destdir,aliases)			@@\
- InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX))			@@\
- 									@@\
-@@ -1224,6 +1229,9 @@
- 	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.$(MANSUFFIX)); \ @@\
- 	done; \								@@\
- 	RemoveFile($${TMP}))
-+#else
-+#define	InstallManPageAliases(file,destdir,aliases)
-+#endif /* ManInstall */
- #endif /* InstallManPageAliases */
- 
- 
-@@ -1232,12 +1240,16 @@
-  * doesn't assume MANSUFFIX.
-  */
- #ifndef InstallGenManPageLong
-+#if !define(ManInstall) || ManInstall
- #define	InstallGenManPageLong(file,destdir,dest,suffix)			@@\
- BuildInstallHtmlManPage(file,dest,suffix)				@@\
- 									@@\
- install.man:: file.man							@@\
- 	MakeDir($(DESTDIR)destdir)					@@\
- 	$(INSTALL) -c $(INSTMANFLAGS) file.man $(DESTDIR)destdir/dest.suffix
-+#else
-+#define	InstallGenManPageLong(file,destdir,dest,suffix)	
-+#endif /* ManInstall */
- #endif /* InstallGenManPageLong */
- 
- 
-@@ -1254,6 +1266,7 @@
-  * InstallGenManPageAliases - general equivalent of InstallManPageAliases
-  */
- #ifndef InstallGenManPageAliases
-+#if !defined(ManInstall) || ManInstall
- #define	InstallGenManPageAliases(file,destdir,suffix,aliases)		@@\
- InstallHtmlManPageAliases(file,aliases,suffix)				@@\
- 									@@\
-@@ -1265,6 +1278,9 @@
- 	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.suffix); \ @@\
- 	done; \								@@\
- 	RemoveFile($${TMP}))
-+#else
-+#define	InstallGenManPageAliases(file,destdir,suffix,aliases)
-+#endif /* ManInstall */
- #endif /* InstallGenManPageAliases */
- 
- 
diff --git a/x11/XFree86-4-libraries/files/patch-z34 b/x11/XFree86-4-libraries/files/patch-z34
index c6ee029a49ca..7a79e764d544 100644
--- a/x11/XFree86-4-libraries/files/patch-z34
+++ b/x11/XFree86-4-libraries/files/patch-z34
@@ -1,31 +1,31 @@
---- lib/font/Imakefile.orig	Wed Dec 20 13:26:25 2000
-+++ lib/font/Imakefile	Wed Dec 20 13:29:32 2000
-@@ -120,22 +120,30 @@
+--- lib/font/Imakefile.orig	Thu Jan 18 04:43:16 2001
++++ lib/font/Imakefile	Thu Jun  7 04:03:36 2001
+@@ -125,22 +125,30 @@
  
  #if NormalLibFont
  NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(STATIC_OBJS))
-+# if !defined(LibInstall) || LibInstall 
++# if !defined(LibInstall) || LibInstall
  InstallLibrary($(LIBNAME),$(USRLIBDIR))
 +# endif /* LibInstall */
  #endif /* NormalLibFont */
  
  #if SharedLibFont
  SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(SUBDIRS) $(DONES),$(SHARED_OBJS),.,.)
-+# if !defined(LibInstall) || LibInstall 
++# if !defined(LibInstall) || LibInstall
  InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
 +# endif /* LibInstall */
  #endif /* SharedLibFont */
  
  #if DebugLibFont
- DebuggedDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(DEBUG_OBJS))
-+# if !defined(LibInstall) || LibInstall 
+ DebuggedDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(DEBUG_OBJS))
++# if !defined(LibInstall) || LibInstall
  InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
 +# endif /* LibInstall */
  #endif /* DebugLibFont */
  
  #if ProfileLibFont
- ProfiledDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(PROFILE_OBJS))
-+# if !defined(LibInstall) || LibInstall 
+ ProfiledDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(PROFILE_OBJS))
++# if !defined(LibInstall) || LibInstall
  InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
 +# endif /* LibInstall */
  #endif /* ProfileLibFont */
diff --git a/x11/XFree86-4-libraries/files/patch-z42 b/x11/XFree86-4-libraries/files/patch-z42
index b4754338ffe6..8c5d7dba5488 100644
--- a/x11/XFree86-4-libraries/files/patch-z42
+++ b/x11/XFree86-4-libraries/files/patch-z42
@@ -1,11 +1,11 @@
---- lib/Imakefile.orig	Fri Mar 23 17:33:43 2001
-+++ lib/Imakefile	Fri Mar 23 17:34:49 2001
-@@ -123,7 +123,7 @@
- XEXTDIR = Xext
+--- lib/Imakefile.orig	Wed Apr  4 02:36:28 2001
++++ lib/Imakefile	Tue Jun  5 20:58:27 2001
+@@ -28,7 +28,7 @@
+ XKBUILIBDIR = xkbui
+ #endif
+ 
+-#if BuildThreadStubLibrary && BuildLibraries
++#if BuildThreadStubLibrary
+ THRSTUBLIBDIR = XThrStub
  #endif
  
--LINTSUBDIRS = Xau Xdmcp X11 $(XINERAMADIR) $(XEXTDIR) $(XKBLIBDIR) \
-+LINTSUBDIRS = Xau Xdmcp $(THRSTUBLIBDIR) X11 ICE SM Xt $(XINERAMADIR) $(XEXTDIR) $(XKBLIBDIR) \
- 	      $(XKBUILIBDIR) $(LBXUTILDIR) $(XF86EXTLIBS) $(XVLIBDIR) \
- 	      $(GLXLIBDIR) $(GLWLIBDIR) $(ZLIBDIR) $(REGEXDIR) $(RENDERLIBDIR) \
- 	      $(FREETYPE2BUILDDIR) $(XFTLIBDIR)
diff --git a/x11/XFree86-4-libraries/files/patch-z44 b/x11/XFree86-4-libraries/files/patch-z44
new file mode 100644
index 000000000000..72f7badb2a5f
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-z44
@@ -0,0 +1,18 @@
+--- lib/GL/GL/Imakefile.orig	Tue Apr  3 11:29:31 2001
++++ lib/GL/GL/Imakefile	Thu Jun  7 03:19:35 2001
+@@ -214,7 +214,7 @@
+ #undef _LinkBuildLibrary
+ #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
+ 
+-
++#if !defined(LibInstall) || LibInstall
+ #if NormalLibGlx
+ NormalLibraryTarget($(LIBNAME),$(UOBJS))
+ InstallLibrary($(LIBNAME),$(USRLIBDIR))
+@@ -239,5 +239,5 @@
+ ProfiledLibraryTarget($(LIBNAME),$(POBJS))
+ InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
+ #endif
+-
++#endif
+ 
diff --git a/x11/XFree86-4-libraries/files/patch-z45 b/x11/XFree86-4-libraries/files/patch-z45
new file mode 100644
index 000000000000..9fc8266e0478
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-z45
@@ -0,0 +1,18 @@
+--- lib/GLU/Imakefile.orig	Wed Feb 14 04:19:11 2001
++++ lib/GLU/Imakefile	Thu Jun  7 03:00:26 2001
+@@ -103,6 +103,7 @@
+ #undef _LinkBuildLibrary
+ #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
+ 
++#if !defined(LibInstall) || LibInstall
+ #if NormalLibGlu
+ NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(STATIC_OBJS))
+ InstallLibrary($(LIBNAME),$(USRLIBDIR))
+@@ -122,6 +123,7 @@
+ ProfiledDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(PROFILE_OBJS))
+ InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
+ #endif /* ProfileLibFont */
++#endif
+ 
+ 
+ ForceSubdirs($(SUBDIRS))
diff --git a/x11/XFree86-4-libraries/pkg-comment b/x11/XFree86-4-libraries/pkg-comment
index 26672ea1d3fb..9f0d2c40a7cf 100644
--- a/x11/XFree86-4-libraries/pkg-comment
+++ b/x11/XFree86-4-libraries/pkg-comment
@@ -1 +1 @@
-X11R6.4/XFree86-4.0 include/(shared) library kit
+X11R6.4/XFree86-4 include/(shared) library kit
diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist
index 893f0c488566..2d48aa56276d 100644
--- a/x11/XFree86-4-libraries/pkg-plist
+++ b/x11/XFree86-4-libraries/pkg-plist
@@ -1,4 +1,3 @@
-bin/freetype-config
 include/DPS/ColorSB.h
 include/DPS/ColorSBP.h
 include/DPS/DPSScrollW.h
@@ -31,8 +30,11 @@ include/GL/GLwMDrawA.h
 include/GL/GLwMDrawAP.h
 include/GL/gl.h
 include/GL/glext.h
+include/GL/glu.h
 include/GL/glx.h
 include/GL/glxint.h
+include/GL/glxmd.h
+include/GL/glxproto.h
 include/GL/glxtokens.h
 include/GL/osmesa.h
 include/X11/Composite.h
@@ -313,6 +315,9 @@ include/X11/extensions/Xext.h
 include/X11/extensions/Xinerama.h
 include/X11/extensions/Xrender.h
 include/X11/extensions/Xv.h
+include/X11/extensions/XvMC.h
+include/X11/extensions/XvMClib.h
+include/X11/extensions/XvMCproto.h
 include/X11/extensions/Xvlib.h
 include/X11/extensions/Xvproto.h
 include/X11/extensions/dpms.h
@@ -370,55 +375,6 @@ include/X11/pixmaps/keyboard.xpm
 include/X11/pixmaps/monitor.xpm
 include/X11/pixmaps/mouse.xpm
 include/X11/xpm.h
-include/freetype2/freetype/cache/ftcchunk.h
-include/freetype2/freetype/cache/ftcglyph.h
-include/freetype2/freetype/cache/ftcimage.h
-include/freetype2/freetype/cache/ftcmanag.h
-include/freetype2/freetype/cache/ftcsbits.h
-include/freetype2/freetype/cache/ftlru.h
-include/freetype2/freetype/config/ftbuild.h
-include/freetype2/freetype/config/ftconfig.h
-include/freetype2/freetype/config/ftmodule.h
-include/freetype2/freetype/config/ftoption.h
-include/freetype2/freetype/freetype.h
-include/freetype2/freetype/ftbbox.h
-include/freetype2/freetype/ftcache.h
-include/freetype2/freetype/fterrors.h
-include/freetype2/freetype/ftglyph.h
-include/freetype2/freetype/ftimage.h
-include/freetype2/freetype/ftlist.h
-include/freetype2/freetype/ftmac.h
-include/freetype2/freetype/ftmm.h
-include/freetype2/freetype/ftmodule.h
-include/freetype2/freetype/ftnames.h
-include/freetype2/freetype/ftoutln.h
-include/freetype2/freetype/ftrender.h
-include/freetype2/freetype/ftsynth.h
-include/freetype2/freetype/ftsystem.h
-include/freetype2/freetype/fttypes.h
-include/freetype2/freetype/internal/autohint.h
-include/freetype2/freetype/internal/fnttypes.h
-include/freetype2/freetype/internal/ftcalc.h
-include/freetype2/freetype/internal/ftdebug.h
-include/freetype2/freetype/internal/ftdriver.h
-include/freetype2/freetype/internal/ftextend.h
-include/freetype2/freetype/internal/ftmemory.h
-include/freetype2/freetype/internal/ftobjs.h
-include/freetype2/freetype/internal/ftstream.h
-include/freetype2/freetype/internal/internal.h
-include/freetype2/freetype/internal/psaux.h
-include/freetype2/freetype/internal/psnames.h
-include/freetype2/freetype/internal/sfnt.h
-include/freetype2/freetype/internal/t1errors.h
-include/freetype2/freetype/internal/t1types.h
-include/freetype2/freetype/internal/t2errors.h
-include/freetype2/freetype/internal/t2types.h
-include/freetype2/freetype/internal/tterrors.h
-include/freetype2/freetype/internal/tttypes.h
-include/freetype2/freetype/t1tables.h
-include/freetype2/freetype/ttnameid.h
-include/freetype2/freetype/tttables.h
-include/freetype2/freetype/tttags.h
 include/rgb.h
 include/site.h
 include/xf86Optrec.h
@@ -489,8 +445,7 @@ lib/X11/locale/mulelao-1/Compose
 lib/X11/locale/mulelao-1/XLC_LOCALE
 lib/X11/locale/nokhchi-1/XLC_LOCALE
 lib/X11/locale/tatar-cyr/XLC_LOCALE
-lib/X11/locale/th_TH.TACTIS/Compose
-lib/X11/locale/th_TH.TACTIS/XLC_LOCALE
+lib/X11/locale/th_TH/XLC_LOCALE
 lib/X11/locale/tscii-0/XLC_LOCALE
 lib/X11/locale/vi_VN.tcvn/Compose
 lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
@@ -498,6 +453,9 @@ lib/X11/locale/vi_VN.viscii/Compose
 lib/X11/locale/vi_VN.viscii/XLC_LOCALE
 lib/X11/locale/zh/Compose
 lib/X11/locale/zh/XLC_LOCALE
+lib/X11/locale/zh_CN.gbk/Compose
+lib/X11/locale/zh_CN.gbk/XLC_LOCALE
+lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE
 lib/X11/locale/zh_TW.Big5/Compose
 lib/X11/locale/zh_TW.Big5/XLC_LOCALE
 lib/X11/locale/zh_TW/Compose
@@ -506,10 +464,14 @@ lib/libFS.a
 lib/libGL.a
 lib/libGL.so
 lib/libGL.so.1
+lib/libGLU.a
+lib/libGLU.so
+lib/libGLU.so.1
 lib/libGLw.a
 lib/libICE.a
 lib/libICE.so
 lib/libICE.so.6
+%%OSMESA:%%lib/libOSMesa.a
 %%OSMESA:%%lib/libOSMesa.so
 %%OSMESA:%%lib/libOSMesa.so.3
 lib/libPEX5.a
@@ -518,14 +480,14 @@ lib/libPEX5.so.6
 lib/libSM.a
 lib/libSM.so
 lib/libSM.so.6
-lib/libXThrStub.so
-lib/libXThrStub.so.6
 lib/libX11.a
 lib/libX11.so
 lib/libX11.so.6
 lib/libXIE.a
 lib/libXIE.so
 lib/libXIE.so.6
+lib/libXThrStub.so
+lib/libXThrStub.so.6
 lib/libXau.a
 lib/libXaw.a
 lib/libXaw.so
@@ -549,6 +511,9 @@ lib/libXinerama.a
 lib/libXmu.a
 lib/libXmu.so
 lib/libXmu.so.6
+lib/libXmuu.a
+lib/libXmuu.so
+lib/libXmuu.so.1
 lib/libXp.a
 lib/libXp.so
 lib/libXp.so.6
@@ -576,9 +541,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-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index c537c86c9898..432fdb8665c9 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -68,6 +68,8 @@ configure () {
     do \
 	echo "#define $i NO" >> $LOCALDEF
     done
+    echo "#define HasFreetype2 YES" >> $LOCALDEF
+    echo "#define Freetype2Dir ${LOCALBASE}" >> $LOCALDEF
     echo "#define FreeBSDBuildXlib  YES" >> $LOCALDEF
     echo "#define FreeBSDBuildXbin   NO" >> $LOCALDEF
 
@@ -102,4 +104,5 @@ configure () {
 }
 
 configure
+cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
 exit 0
diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile
index 4f35b3f3c569..0678cc0ecdc5 100644
--- a/x11/XFree86-4-manuals/Makefile
+++ b/x11/XFree86-4-manuals/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86-4-manuals-4.0.1
+# New ports collection makefile for:	XFree86-manuals
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	manuals
-PORTVERSION=	4.0.3
+PORTVERSION=	4.1.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	4.0.2
+MASTER_SITE_SUBDIR=	4.1.0
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X402src-1.tgz
+DISTFILES=	X410src-1.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11/XFree86-4-manuals/distinfo b/x11/XFree86-4-manuals/distinfo
index b2929fe5f39e..e4b5e84b9421 100644
--- a/x11/XFree86-4-manuals/distinfo
+++ b/x11/XFree86-4-manuals/distinfo
@@ -1 +1 @@
-MD5 (xc/X402src-1.tgz) = d314c311aa4a29d74695b0e39b6d80c4
+MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
diff --git a/x11/XFree86-4-manuals/files/manpages b/x11/XFree86-4-manuals/files/manpages
index df748387767f..58d9ad8ff3aa 100644
--- a/x11/XFree86-4-manuals/files/manpages
+++ b/x11/XFree86-4-manuals/files/manpages
@@ -1001,9 +1001,62 @@ MAN3=	AllPlanes.3 \
 	glXSwapBuffers.3 \
 	glXUseXFont.3 \
 	glXWaitGL.3 \
-	glXWaitX.3
+	glXWaitX.3 \
+	gluBeginCurve.3 \
+	gluBeginPolygon.3 \
+	gluBeginSurface.3 \
+	gluBeginTrim.3 \
+	gluBuild1DMipmaps.3 \
+	gluBuild2DMipmaps.3 \
+	gluCylinder.3 \
+	gluDeleteNurbsRenderer.3 \
+	gluDeleteQuadric.3 \
+	gluDeleteTess.3 \
+	gluDisk.3 \
+	gluEndCurve.3 \
+	gluEndPolygon.3 \
+	gluEndSurface.3 \
+	gluEndTrim.3 \
+	gluErrorString.3 \
+	gluGetNurbsProperty.3 \
+	gluGetString.3 \
+	gluGetTessProperty.3 \
+	gluLoadSamplingMatrices.3 \
+	gluLookAt.3 \
+	gluNewNurbsRenderer.3 \
+	gluNewQuadric.3 \
+	gluNewTess.3 \
+	gluNextContour.3 \
+	gluNurbsCallback.3 \
+	gluNurbsCallbackDataEXT.3 \
+	gluNurbsCurve.3 \
+	gluNurbsProperty.3 \
+	gluNurbsSurface.3 \
+	gluOrtho2D.3 \
+	gluPartialDisk.3 \
+	gluPerspective.3 \
+	gluPickMatrix.3 \
+	gluProject.3 \
+	gluPwlCurve.3 \
+	gluQuadricCallback.3 \
+	gluQuadricDrawStyle.3 \
+	gluQuadricNormals.3 \
+	gluQuadricOrientation.3 \
+	gluQuadricTexture.3 \
+	gluScaleImage.3 \
+	gluSphere.3 \
+	gluTessBeginContour.3 \
+	gluTessBeginPolygon.3 \
+	gluTessCallback.3 \
+	gluTessEndContour.3 \
+	gluTessEndPolygon.3 \
+	gluTessNormal.3 \
+	gluTessProperty.3 \
+	gluTessVertex.3 \
+	gluUnProject.3
 MAN7=	X.7 \
 	XConsortium.7 \
 	XProjectTeam.7 \
 	XStandards.7 \
-	Xsecurity.7
+	Xsecurity.7 \
+	X.Org.7
diff --git a/x11/XFree86-4-manuals/pkg-comment b/x11/XFree86-4-manuals/pkg-comment
index 4cf85a3245c2..a08a91b7fa48 100644
--- a/x11/XFree86-4-manuals/pkg-comment
+++ b/x11/XFree86-4-manuals/pkg-comment
@@ -1 +1 @@
-X11R6.4/XFree86-4.0 man pages
+X11R6.4/XFree86-4 man pages
author	sf <sf@FreeBSD.org>	2001-06-12 22:59:53 +0800
committer	sf <sf@FreeBSD.org>	2001-06-12 22:59:53 +0800
commit	002e8c437914812250e828194bf0f3f6a306fc95 (patch)
tree	e1d6b7316d63bb8606ab006b5a06429a82800f4e
parent	617503965416481744abca022ec5b7fcbb41dd0b (diff)
download	freebsd-ports-gnome-002e8c437914812250e828194bf0f3f6a306fc95.tar.gz freebsd-ports-gnome-002e8c437914812250e828194bf0f3f6a306fc95.tar.zst freebsd-ports-gnome-002e8c437914812250e828194bf0f3f6a306fc95.zip