Index: XFree86-4-libraries/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/XFree86-4-libraries/Makefile,v
retrieving revision 1.110
diff -u -r1.110 Makefile
--- XFree86-4-libraries/Makefile	15 Aug 2002 20:44:22 -0000	1.110
+++ XFree86-4-libraries/Makefile	5 Sep 2002 02:14:09 -0000
@@ -6,23 +6,20 @@
 #
 
 PORTNAME=	libraries
-PORTVERSION=	4.2.0
-PORTREVISION=	3
+PORTVERSION=	4.2.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
+		${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
+MASTER_SITE_SUBDIR=	4.2.0/:x \
+			${PORTVERSION}/patches/:x421patch \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz:x Wraphelp.gz:local
-EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
+DISTFILES=	X420src-1.tgz:x \
+		4.2.0-4.2.1.diff.gz:x421patch \
+		Wraphelp.gz:local
+EXTRACT_ONLY=	X420src-1.tgz
 
-PATCH_SITES=		${MASTER_SITE_XFREE:S/source//g:S/$/:x/} \
-			${MASTER_SITE_LOCAL:S/$/:patch420/}
-PATCH_SITE_SUBDIR=	${PORTVERSION}/fixes/:x \
-			anholt/patches-4.2.0/:patch420
-PATCHFILES=		patch-XlcDL.c.gz:patch420 \
-			4.2.0-libGLU-bad-extern.patch:x
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	anholt@freebsd.org
@@ -89,6 +86,10 @@
 post-extract:
 	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
+
+pre-patch:
+	-@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \
+		| ${PATCH} ${PATCH_DIST_ARGS} --batch
 
 post-patch:
 	cd ${WRKSRC}/nls; \
Index: XFree86-4-libraries/distinfo
===================================================================
RCS file: /home/ncvs/ports/x11/XFree86-4-libraries/distinfo,v
retrieving revision 1.34
diff -u -r1.34 distinfo
--- XFree86-4-libraries/distinfo	15 Aug 2002 20:44:22 -0000	1.34
+++ XFree86-4-libraries/distinfo	4 Sep 2002 23:50:58 -0000
@@ -1,4 +1,3 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
 MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
-MD5 (xc/patch-XlcDL.c.gz) = 35449682c3807ab0dfcb12dc987d09cd
-MD5 (xc/4.2.0-libGLU-bad-extern.patch) = 2d5c738854c7cc0378ae457b09a029f4
+MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
Index: XFree86-4-libraries/files/patch-us_intl
===================================================================
RCS file: XFree86-4-libraries/files/patch-us_intl
diff -N XFree86-4-libraries/files/patch-us_intl
--- XFree86-4-libraries/files/patch-us_intl	21 Aug 2002 21:58:42 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
---- programs/xkbcomp/symbols/us_intl	Fri Aug 16 08:49:48 2002
-+++ programs/xkbcomp/symbols/us_intl	Fri Aug 16 08:50:58 2002
-@@ -41,21 +41,21 @@
-     key <AC11> {	[ dead_acute,	dead_diaeresis	],
- 			[ apostrophe,	quotedbl	]	};
- 			
--    key <AE09> {	[	  9,	parenleft	]
-+    key <AE09> {	[	  9,	parenleft	],
- 			[      dead_breve,	dead_breve	]	};
--    key <AE10> {	[	  0,	parenright	]
-+    key <AE10> {	[	  0,	parenright	],
- 			[      dead_abovering, dead_abovering	]	};
-     key <AE11> {	[     minus,	underscore	],
- 			[      dead_macron,	dead_belowdot	]	};
-     key <AE12> {	[     equal,	plus		],
- 			[      dead_doubleacute,	dead_horn	]	};
--    key <AC10> {	[ semicolon,	colon		]
-+    key <AC10> {	[ semicolon,	colon		],
- 			[      dead_ogonek,	dead_diaeresis	]	};
--    key <AB08> {	[     comma,	less		]
-+    key <AB08> {	[     comma,	less		],
- 			[      dead_cedilla,	dead_caron	]	};
--    key <AB09> {	[    period,	greater		]
-+    key <AB09> {	[    period,	greater		],
- 			[      dead_abovedot,	dead_circumflex	]	};
--    key <AB10> {	[     slash,	question	]
-+    key <AB10> {	[     slash,	question	],
- 			[      dead_hook,	dead_hook	]	};
- 
- 
Index: XFree86-4-clients/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/XFree86-4-clients/Makefile,v
retrieving revision 1.103
diff -u -r1.103 Makefile
--- XFree86-4-clients/Makefile	21 Aug 2002 21:58:44 -0000	1.103
+++ XFree86-4-clients/Makefile	5 Sep 2002 02:15:39 -0000
@@ -6,18 +6,22 @@
 #
 
 PORTNAME=	clients
-PORTVERSION=	4.2.0
-PORTREVISION=	5
+PORTVERSION=	4.2.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
+		${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
+MASTER_SITE_SUBDIR=	4.2.0/:x \
+			${PORTVERSION}/patches/:x421patch \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz:x \
-		X${PORTVERSION:S/.//g}src-2.tgz:x \
+DISTFILES=	X420src-1.tgz:x \
+		X420src-2.tgz:x \
+		4.2.0-4.2.1.diff.gz:x421patch \
 		Wraphelp.gz:local
-EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
+EXTRACT_ONLY=	X420src-1.tgz
+
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	anholt@freebsd.org
 
@@ -61,10 +65,13 @@
 post-extract:
 	( cd ${WRKDIR} && \
 	 ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-	   ${DISTDIR}/${DIST_SUBDIR}/X${PORTVERSION:S/.//g}src-2.tgz \
+	   ${DISTDIR}/${DIST_SUBDIR}/X420src-2.tgz \
 	    | ${TAR} -xf - xc/fonts/util )
 	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
+pre-patch:
+	-@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \
+		| ${PATCH} ${PATCH_DIST_ARGS} --batch
 
 post-patch:
 	cd ${WRKSRC}/nls; \
Index: XFree86-4-clients/distinfo
===================================================================
RCS file: /home/ncvs/ports/x11/XFree86-4-clients/distinfo,v
retrieving revision 1.30
diff -u -r1.30 distinfo
--- XFree86-4-clients/distinfo	2 Aug 2002 02:57:04 -0000	1.30
+++ XFree86-4-clients/distinfo	5 Sep 2002 02:14:15 -0000
@@ -1,3 +1,4 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
 MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
+MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
 MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659