aboutsummaryrefslogtreecommitdiff
path: root/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'x11-servers/XFree86-4-VirtualFramebufferServer/Makefile')
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/Makefile22
1 files changed, 17 insertions, 5 deletions
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index ec41d619b12f..19ef8ba27a77 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -6,16 +6,22 @@
#
PORTNAME= VirtualFramebufferServer
-PORTVERSION= 4.2.0
-PORTREVISION= 1
+PORTVERSION= 4.2.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= ${PORTVERSION}/:x \
+MASTER_SITE_SUBDIR= 4.2.0/:x \
+ ${PORTVERSION}/patches/:x421patch \
+ ${PORTVERSION}/fixes/:x421fixes \
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 \
+ 4.2.1-mit-shm-security.patch:x421fixes \
+ Wraphelp.gz:local
+EXTRACT_ONLY= X420src-1.tgz
MAINTAINER= anholt@freebsd.org
@@ -38,5 +44,11 @@ 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>