[1] Make the 4.2.1 ports all use the merged 4.2.1+mitshm patch.

[2] Make the ports respect CFLAGS better.  Now CFLAGS (and CC/CXX) are set for
the build during the configure stage.

PR:		[2] 40271, 43369

15 files changed, 61 insertions, 48 deletions

diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index 48ac7d6f356f..73d0b8862e7f 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	FontServer
 PORTVERSION=	4.2.0
+PORTREVISION=	1
 CATEGORIES=	x11-servers x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
@@ -20,6 +21,9 @@ XFREE86_VERSION=	4
 USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
+SCRIPTS_ENV=		CC="${CC}" \
+			CXX="${CXX}" \
+			CFLAGS="${CFLAGS}"
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 MAN1=			Xserver.1 xfs.1
 XBUILD_DIRS=		programs/xfs
diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure
index 38581aaadf57..70303f06cf69 100644
--- a/x11-servers/XFree86-4-FontServer/scripts/configure
+++ b/x11-servers/XFree86-4-FontServer/scripts/configure
@@ -58,6 +58,9 @@ configure () {
     echo "#define InstallFSConfig $InstallFSConfig" >> $LOCALDEF
     echo "#define FreeBSDBuildXfs YES" >> $LOCALDEF
     echo "#define UseInstalledPrograms YES" >> $LOCALDEF
+    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
+    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
+    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
 
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 8689bfa925c2..26de8cae585a 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -7,28 +7,30 @@
 
 PORTNAME=	NestServer
 PORTVERSION=	4.2.1
+PORTREVISION=	1
 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=		4.2.0-4.2.1-1-freebsd.patch.gz
+
 MAINTAINER=	anholt@freebsd.org
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
+SCRIPTS_ENV=		CC="${CC}" \
+			CXX="${CXX}" \
+			CFLAGS="${CFLAGS}"
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 MANCOMPRESSED=		yes
 MAN1=			Xnest.1 Xserver.1
@@ -41,11 +43,5 @@ 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
-
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo
index 95b76fbc1ab0..e4832d764bce 100644
--- a/x11-servers/XFree86-4-NestServer/distinfo
+++ b/x11-servers/XFree86-4-NestServer/distinfo
@@ -1,4 +1,3 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
-MD5 (xc/4.2.1-mit-shm-security.patch) = 18eb56110c7f66895111bd9f3513b54e
 MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
+MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
diff --git a/x11-servers/XFree86-4-NestServer/scripts/configure b/x11-servers/XFree86-4-NestServer/scripts/configure
index a05984bb5a3a..c81f36f4df1b 100644
--- a/x11-servers/XFree86-4-NestServer/scripts/configure
+++ b/x11-servers/XFree86-4-NestServer/scripts/configure
@@ -49,6 +49,9 @@ configure () {
     echo "#define XnestServer YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
     echo "#define UseInstalledPrograms YES" >> $LOCALDEF
+    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
+    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
+    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
 
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index 0e1ee41698c1..22196c817c28 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -7,28 +7,30 @@
 
 PORTNAME=	PrintServer
 PORTVERSION=	4.2.1
+PORTREVISION=	1
 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=		4.2.0-4.2.1-1-freebsd.patch.gz
+
 MAINTAINER=	anholt@freebsd.org
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
+SCRIPTS_ENV=		CC="${CC}" \
+			CXX="${CXX}" \
+			CFLAGS="${CFLAGS}"
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 XBUILD_DIRS=		lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver
 XINCLUDE_DIRS=		lib/xkbfile lib/xtrans
@@ -38,12 +40,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
-
 do-install:
 	$(INSTALL_PROGRAM) ${WRKSRC}/programs/Xserver/Xprt ${PREFIX}/bin/Xprt
 
diff --git a/x11-servers/XFree86-4-PrintServer/distinfo b/x11-servers/XFree86-4-PrintServer/distinfo
index 95b76fbc1ab0..e4832d764bce 100644
--- a/x11-servers/XFree86-4-PrintServer/distinfo
+++ b/x11-servers/XFree86-4-PrintServer/distinfo
@@ -1,4 +1,3 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
-MD5 (xc/4.2.1-mit-shm-security.patch) = 18eb56110c7f66895111bd9f3513b54e
 MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
+MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
diff --git a/x11-servers/XFree86-4-PrintServer/scripts/configure b/x11-servers/XFree86-4-PrintServer/scripts/configure
index 3855d175046b..07a72d4d47ca 100644
--- a/x11-servers/XFree86-4-PrintServer/scripts/configure
+++ b/x11-servers/XFree86-4-PrintServer/scripts/configure
@@ -49,6 +49,9 @@ configure () {
     echo "#define XprtServer YES" >> $LOCALDEF
     echo "#define BuildServersOnly YES" >> $LOCALDEF
     echo "#define UseInstalledPrograms YES" >> $LOCALDEF
+    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
+    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
+    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
 
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 2b6ea4554a28..f1a26e3fe5f7 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -39,7 +39,10 @@ SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			ExtendedInputDevices=${ExtendedInputDevices} \
 			BuildXF86DRI=${BuildXF86DRI} \
 			HasGlide3=${HasGlide3} \
-			HaveMatroxHal=${HaveMatroxHal}
+			HaveMatroxHal=${HaveMatroxHal} \
+			CC="${CC}" \
+			CXX="${CXX}" \
+			CFLAGS="${CFLAGS}"
 MAN1=			XFree86.1 \
 			Xserver.1 \
 			kbd_mode.1 \
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 19fdf2092e4d..7cd0e774b0d5 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -81,7 +81,10 @@ configure () {
     echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF
     echo "#define UseInstalledPrograms YES" >> $LOCALDEF
     echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-    
+    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
+    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
+    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
+
     # More of the i386 drivers could probably move to XF86CardDrivers.
     # Is fbdev driver useful to us?
     # GlideDriver was left out because we have no Glide2 package.
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 2b6ea4554a28..f1a26e3fe5f7 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Server
 PORTVERSION=	4.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
@@ -39,7 +39,10 @@ SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			ExtendedInputDevices=${ExtendedInputDevices} \
 			BuildXF86DRI=${BuildXF86DRI} \
 			HasGlide3=${HasGlide3} \
-			HaveMatroxHal=${HaveMatroxHal}
+			HaveMatroxHal=${HaveMatroxHal} \
+			CC="${CC}" \
+			CXX="${CXX}" \
+			CFLAGS="${CFLAGS}"
 MAN1=			XFree86.1 \
 			Xserver.1 \
 			kbd_mode.1 \
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 19fdf2092e4d..7cd0e774b0d5 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -81,7 +81,10 @@ configure () {
     echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF
     echo "#define UseInstalledPrograms YES" >> $LOCALDEF
     echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
-    
+    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
+    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
+    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
+
     # More of the i386 drivers could probably move to XF86CardDrivers.
     # Is fbdev driver useful to us?
     # GlideDriver was left out because we have no Glide2 package.
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index 19ef8ba27a77..8005edc950c9 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -7,22 +7,21 @@
 
 PORTNAME=	VirtualFramebufferServer
 PORTVERSION=	4.2.1
+PORTREVISION=	1
 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=		4.2.0-4.2.1-1-freebsd.patch.gz
+
 MAINTAINER=	anholt@freebsd.org
 
 RUN_DEPENDS=	${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps
@@ -33,6 +32,9 @@ XFREE86_VERSION=	4
 USE_IMAKE=		YES
 DIST_SUBDIR=		xc
 WRKSRC=			${WRKDIR}/xc
+SCRIPTS_ENV=		CC="${CC}" \
+			CXX="${CXX}" \
+			CFLAGS="${CFLAGS}"
 PATCHDIR=		${.CURDIR}/../../x11/XFree86-4-libraries/files
 MAN1=			Xserver.1 Xvfb.1
 XBUILD_DIRS=		lib/font lib/lbxutil/ lib/Xdmcp lib/Xau programs/Xserver
@@ -44,11 +46,5 @@ 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
-
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
index 95b76fbc1ab0..e4832d764bce 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
@@ -1,4 +1,3 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
-MD5 (xc/4.2.1-mit-shm-security.patch) = 18eb56110c7f66895111bd9f3513b54e
 MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
+MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure
index efba0bbf0d11..7065ae6b3640 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure
@@ -50,6 +50,9 @@ configure () {
     echo "#define BuildServersOnly YES" >> $LOCALDEF
     echo "#define UseInstalledPrograms YES" >> $LOCALDEF
     echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
+    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
+    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
+    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
 
     # Copy ORIGDEF to DESTDEF
     rm -f $DESTDEF