gzip Wraphelp.c and put it in local_distfiles, to help users having troubles

downloading it.  Move freebsd-glide3headers there too.  Update BUILD_DEPENDS
for font ports to catch new requirements as of 4.2.0.

PR:		40362, 40759
Approved by:	des (mentor)

12 files changed, 50 insertions, 60 deletions

diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index 3c2b77d3f155..b718cf624a1b 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -8,15 +8,13 @@
 PORTNAME=	FontServer
 PORTVERSION=	4.2.0
 CATEGORIES=	x11-servers x11-fonts
-MASTER_SITES=	${MASTER_SITE_XFREE} \
-		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
-		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap \
-		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
-MASTER_SITE_SUBDIR=	${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
+			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz:x Wraphelp.gz:local
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
-IGNOREFILES=	Wraphelp.c
 
 MAINTAINER=	anholt@freebsd.org
 
@@ -31,7 +29,8 @@ INSTALL_TARGET=		FreeBSDPortsInstall installXserver.man
 MAN1=			Xserver.1 xfs.1
 
 post-extract:
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
+	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
+		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-FontServer/distinfo b/x11-servers/XFree86-4-FontServer/distinfo
index 4766fc3aff79..62b0b3a56cf9 100644
--- a/x11-servers/XFree86-4-FontServer/distinfo
+++ b/x11-servers/XFree86-4-FontServer/distinfo
@@ -1,2 +1,2 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/Wraphelp.c) = IGNORE
+MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 44961e635d8d..d158fba086b6 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -8,15 +8,13 @@
 PORTNAME=	NestServer
 PORTVERSION=	4.2.0
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XFREE} \
-		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
-		ftp://ftp.internat.FreeBSD.org/pub/FreeBSD/X11-Crypto/:wrap \
-		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
-MASTER_SITE_SUBDIR=	${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
+			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz:x Wraphelp.gz:local
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
-IGNOREFILES=	Wraphelp.c
 
 MAINTAINER=	anholt@freebsd.org
 
@@ -32,7 +30,8 @@ MANCOMPRESSED=		yes
 MAN1=			Xnest.1 Xserver.1
 
 post-extract:
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
+	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
+		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo
index 4766fc3aff79..62b0b3a56cf9 100644
--- a/x11-servers/XFree86-4-NestServer/distinfo
+++ b/x11-servers/XFree86-4-NestServer/distinfo
@@ -1,2 +1,2 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/Wraphelp.c) = IGNORE
+MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index d1ea78b0885f..445b8d052554 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -8,15 +8,13 @@
 PORTNAME=	PrintServer
 PORTVERSION=	4.2.0
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XFREE} \
-		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
-		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap \
-		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
-MASTER_SITE_SUBDIR=	${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
+			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz:x Wraphelp.gz:local
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
-IGNOREFILES=	Wraphelp.c
 
 MAINTAINER=	anholt@freebsd.org
 
@@ -30,7 +28,8 @@ ALL_TARGET=		FreeBSDPortsBuild
 INSTALL_TARGET=		installXprt
 
 post-extract:
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
+	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
+		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-PrintServer/distinfo b/x11-servers/XFree86-4-PrintServer/distinfo
index 4766fc3aff79..62b0b3a56cf9 100644
--- a/x11-servers/XFree86-4-PrintServer/distinfo
+++ b/x11-servers/XFree86-4-PrintServer/distinfo
@@ -1,2 +1,2 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/Wraphelp.c) = IGNORE
+MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index b05e4cd47132..39873a1fb51c 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -9,15 +9,13 @@ PORTNAME=	Server
 PORTVERSION=	4.2.0
 PORTREVISION=	4
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XFREE} \
-		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
-		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap \
-		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
-MASTER_SITE_SUBDIR=	${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
+			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz:x Wraphelp.gz:local
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
-IGNOREFILES=	Wraphelp.c
 
 MAINTAINER=	anholt@freebsd.org
 
@@ -90,8 +88,7 @@ ExtendedInputDevices?=	DEFAULT
 .if ${ARCH} == i386
 BuildXF86DRI=		YES
 PLIST_SUB+=		DRI=""
-MASTER_SITES+=		http://gladstone.uoregon.edu/~eanholt/dri/:glide
-DISTFILES+=		freebsd-glide3headers.tar.gz:glide
+DISTFILES+=		freebsd-glide3headers.tar.gz:local
 HasGlide3=		YES
 
 post-extract::
@@ -193,7 +190,8 @@ PLIST_SUB+=		MATROX="@comment "
 .endif
 
 post-extract::
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
+	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
+		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo
index 35c16b7c8e40..517a5f166743 100644
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@@ -1,4 +1,3 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
-MD5 (xc/Wraphelp.c) = IGNORE
+MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
 MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index b05e4cd47132..39873a1fb51c 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -9,15 +9,13 @@ PORTNAME=	Server
 PORTVERSION=	4.2.0
 PORTREVISION=	4
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XFREE} \
-		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
-		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap \
-		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
-MASTER_SITE_SUBDIR=	${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
+			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz:x Wraphelp.gz:local
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
-IGNOREFILES=	Wraphelp.c
 
 MAINTAINER=	anholt@freebsd.org
 
@@ -90,8 +88,7 @@ ExtendedInputDevices?=	DEFAULT
 .if ${ARCH} == i386
 BuildXF86DRI=		YES
 PLIST_SUB+=		DRI=""
-MASTER_SITES+=		http://gladstone.uoregon.edu/~eanholt/dri/:glide
-DISTFILES+=		freebsd-glide3headers.tar.gz:glide
+DISTFILES+=		freebsd-glide3headers.tar.gz:local
 HasGlide3=		YES
 
 post-extract::
@@ -193,7 +190,8 @@ PLIST_SUB+=		MATROX="@comment "
 .endif
 
 post-extract::
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
+	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
+		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo
index 35c16b7c8e40..517a5f166743 100644
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@@ -1,4 +1,3 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
-MD5 (xc/Wraphelp.c) = IGNORE
+MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
 MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index d15f70c87e5c..4f3a5c314ab8 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -9,15 +9,13 @@ PORTNAME=	VirtualFramebufferServer
 PORTVERSION=	4.2.0
 PORTREVISION=	1
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XFREE} \
-		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
-		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap \
-		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
-MASTER_SITE_SUBDIR=	${PORTVERSION}
+MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
+			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz:x Wraphelp.gz:local
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
-IGNOREFILES=	Wraphelp.c
 
 MAINTAINER=	anholt@freebsd.org
 
@@ -36,7 +34,8 @@ MAKE_ENV=		MAN_INSTALL_TARGET=installXvfb.man
 MAN1=			Xserver.1 Xvfb.1
 
 post-extract:
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
+	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
+		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
index 4766fc3aff79..62b0b3a56cf9 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
@@ -1,2 +1,2 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/Wraphelp.c) = IGNORE
+MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659