Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/Makefile,v
retrieving revision 1.118
diff -u -r1.118 Makefile
--- Makefile	26 Aug 2002 17:41:46 -0000	1.118
+++ Makefile	5 Sep 2002 03:01:22 -0000
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	Server
-PORTVERSION=	4.2.0
-PORTREVISION=	6
+PORTVERSION=	4.2.1
 CATEGORIES=	x11-servers
 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_LOCAL}
 PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
@@ -196,6 +199,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} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/distinfo,v
retrieving revision 1.39
diff -u -r1.39 distinfo
--- distinfo	15 Aug 2002 20:44:27 -0000	1.39
+++ distinfo	5 Sep 2002 03:23:00 -0000
@@ -1,4 +1,5 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
 MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
 MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b
 MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d