summaryrefslogtreecommitdiff
path: root/x11-servers/XFree86-4-Server-snap/Makefile
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2002-09-19 06:37:28 +0000
committerEric Anholt <anholt@FreeBSD.org>2002-09-19 06:37:28 +0000
commit6d000f4c6f59ed1ad700bd2ab248bbf38a07d766 (patch)
tree4751f0c9f1f8168661991cb83792c98b5207dbd9 /x11-servers/XFree86-4-Server-snap/Makefile
parentUpgrade to 5.9.6. (diff)
Update XFree86 Servers ports to 4.2.1 + the second SHM security fix (for
XFree86-4-Servers, this fixes the case where the X Server is started by xdm).
Notes
Notes: svn path=/head/; revision=66685
Diffstat (limited to 'x11-servers/XFree86-4-Server-snap/Makefile')
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 10eb5a67b5e2..7a81fe31d4f1 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -7,17 +7,20 @@
PORTNAME= Server
PORTVERSION= 4.2.1
-PORTREVISION= 1
+PORTREVISION= 2
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
@@ -206,6 +209,8 @@ post-extract::
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}