diff options
-rw-r--r-- | x11-fonts/XFree86-4-font100dpi/Makefile | 2 | ||||
-rw-r--r-- | x11-fonts/XFree86-4-font75dpi/Makefile | 2 | ||||
-rw-r--r-- | x11-fonts/XFree86-4-fontScalable/Makefile | 2 | ||||
-rw-r--r-- | x11-servers/XFree86-4-FontServer/Makefile | 15 | ||||
-rw-r--r-- | x11-servers/XFree86-4-FontServer/distinfo | 2 | ||||
-rw-r--r-- | x11-servers/XFree86-4-NestServer/Makefile | 15 | ||||
-rw-r--r-- | x11-servers/XFree86-4-NestServer/distinfo | 2 | ||||
-rw-r--r-- | x11-servers/XFree86-4-PrintServer/Makefile | 15 | ||||
-rw-r--r-- | x11-servers/XFree86-4-PrintServer/distinfo | 2 | ||||
-rw-r--r-- | x11-servers/XFree86-4-Server-snap/Makefile | 18 | ||||
-rw-r--r-- | x11-servers/XFree86-4-Server-snap/distinfo | 3 | ||||
-rw-r--r-- | x11-servers/XFree86-4-Server/Makefile | 18 | ||||
-rw-r--r-- | x11-servers/XFree86-4-Server/distinfo | 3 | ||||
-rw-r--r-- | x11-servers/XFree86-4-VirtualFramebufferServer/Makefile | 15 | ||||
-rw-r--r-- | x11-servers/XFree86-4-VirtualFramebufferServer/distinfo | 2 | ||||
-rw-r--r-- | x11/XFree86-4-clients/Makefile | 18 | ||||
-rw-r--r-- | x11/XFree86-4-clients/distinfo | 2 | ||||
-rw-r--r-- | x11/XFree86-4-libraries/Makefile | 15 | ||||
-rw-r--r-- | x11/XFree86-4-libraries/distinfo | 2 |
19 files changed, 71 insertions, 82 deletions
diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile index 3a57b6a95e55..e994da3180ee 100644 --- a/x11-fonts/XFree86-4-font100dpi/Makefile +++ b/x11-fonts/XFree86-4-font100dpi/Makefile @@ -15,7 +15,7 @@ DISTFILES= X${PORTVERSION:S/.//g}src-2.tgz MAINTAINER= anholt@freebsd.org -BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= ucs2any.pl:${PORTSDIR}/x11/XFree86-4-clients RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings XFREE86_VERSION= 4 diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile index 28f73667c7b5..935b3124846b 100644 --- a/x11-fonts/XFree86-4-font75dpi/Makefile +++ b/x11-fonts/XFree86-4-font75dpi/Makefile @@ -15,7 +15,7 @@ DISTFILES= X${PORTVERSION:S/.//g}src-2.tgz MAINTAINER= anholt@freebsd.org -BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= ucs2any.pl:${PORTSDIR}/x11/XFree86-4-clients RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings XFREE86_VERSION= 4 diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile index c0efb5b5dd05..1daedb587c8e 100644 --- a/x11-fonts/XFree86-4-fontScalable/Makefile +++ b/x11-fonts/XFree86-4-fontScalable/Makefile @@ -15,7 +15,7 @@ DISTFILES= X${PORTVERSION:S/.//g}src-2.tgz MAINTAINER= anholt@freebsd.org -BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients +BUILD_DEPENDS= ucs2any.pl:${PORTSDIR}/x11/XFree86-4-clients RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings XFREE86_VERSION= 4 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 diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile index 4329a85616ac..fb788f2d52cb 100644 --- a/x11/XFree86-4-clients/Makefile +++ b/x11/XFree86-4-clients/Makefile @@ -9,16 +9,15 @@ PORTNAME= clients PORTVERSION= 4.2.0 PORTREVISION= 2 CATEGORIES= x11 -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 \ - X${PORTVERSION:S/.//g}src-2.tgz Wraphelp.c:wrap +DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz:x \ + X${PORTVERSION:S/.//g}src-2.tgz:x \ + Wraphelp.gz:local EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz -IGNOREFILES= Wraphelp.c MAINTAINER= anholt@freebsd.org @@ -61,7 +60,8 @@ post-extract: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ ${DISTDIR}/${DIST_SUBDIR}/X${PORTVERSION:S/.//g}src-2.tgz \ | ${TAR} -xf - xc/fonts/util ) - ${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/ + ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \ + ${WRKSRC}/lib/Xdmcp/Wraphelp.c post-patch: cd ${WRKSRC}/nls; \ diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo index dadf02f3653f..4bad434cd929 100644 --- a/x11/XFree86-4-clients/distinfo +++ b/x11/XFree86-4-clients/distinfo @@ -1,3 +1,3 @@ MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e -MD5 (xc/Wraphelp.c) = IGNORE +MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659 diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index 838d911e67f6..ff379a4ab7bd 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -9,15 +9,13 @@ PORTNAME= libraries PORTVERSION= 4.2.0 PORTREVISION= 2 CATEGORIES= x11 -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:x Wraphelp.gz:local EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz -DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap -IGNOREFILES= Wraphelp.c PATCH_SITES= ${MASTER_SITE_XFREE:S/source//g} PATCH_SITE_SUBDIR= ${PORTVERSION}/fixes @@ -87,7 +85,8 @@ PLIST_SUB+= OSMESA:="" .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 post-patch: cd ${WRKSRC}/nls; \ diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo index 08db7c35a84e..6876f69689f1 100644 --- a/x11/XFree86-4-libraries/distinfo +++ b/x11/XFree86-4-libraries/distinfo @@ -1,4 +1,4 @@ MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f +MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659 MD5 (xc/4.2.0-xlib-i18n-module.patch) = 19a91692fdb4fa3d2797f57beebee34a MD5 (xc/4.2.0-libGLU-bad-extern.patch) = 2d5c738854c7cc0378ae457b09a029f4 -MD5 (xc/Wraphelp.c) = IGNORE |