Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/Makefile,v
retrieving revision 1.124
diff -u -r1.124 Makefile
--- Makefile	19 Sep 2002 07:58:02 -0000	1.124
+++ Makefile	2 Oct 2002 03:52:10 -0000
@@ -7,26 +7,21 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
-		${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \
-		${MASTER_SITE_XFREE:S/source//g:S/$/:x421fixes/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
 MASTER_SITE_SUBDIR=	4.2.0/:x \
-			${PORTVERSION}/patches/:x421patch \
-			${PORTVERSION}/fixes/:x421fixes \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
 DISTFILES=	X420src-1.tgz:x \
-		4.2.0-4.2.1.diff.gz:x421patch \
-		4.2.1-mit-shm-security.patch:x421fixes \
 		Wraphelp.gz:local
 EXTRACT_ONLY=	X420src-1.tgz
 
 PATCH_SITES=		${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
-PATCHFILES=		patch-nvchips.gz
+PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz \
+			patch-nvchips.gz
 
 MAINTAINER=	anholt@freebsd.org
 
@@ -209,12 +204,6 @@
 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
-	-@${CAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.1-mit-shm-security.patch \
-		| ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch
 
 post-build:
 	@${RM} -f ${PKGMESSAGE}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/distinfo,v
retrieving revision 1.41
diff -u -r1.41 distinfo
--- distinfo	19 Sep 2002 06:37:27 -0000	1.41
+++ distinfo	2 Oct 2002 03:58:11 -0000
@@ -1,7 +1,6 @@
 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
-MD5 (xc/4.2.1-mit-shm-security.patch) = 18eb56110c7f66895111bd9f3513b54e
+MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
 MD5 (xc/patch-nvchips.gz) = bcb190d3f2c26d993a3a3c1512cf9bc9