aboutsummaryrefslogtreecommitdiff
path: root/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2002-10-17 07:20:03 +0000
committerEric Anholt <anholt@FreeBSD.org>2002-10-17 07:20:03 +0000
commitd0cc39f7c80fc40eff1ee1ce995f125df0596d37 (patch)
tree7d8b02db4dea279831887c81f11867296a843496 /x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
parentbd9d86d0326eb67c154bfd38fa98d9db58cda13a (diff)
downloadports-d0cc39f7c80fc40eff1ee1ce995f125df0596d37.tar.gz
ports-d0cc39f7c80fc40eff1ee1ce995f125df0596d37.zip
Notes
Diffstat (limited to 'x11-servers/XFree86-4-VirtualFramebufferServer/Makefile')
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/Makefile20
1 files changed, 8 insertions, 12 deletions
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>