diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2002-10-17 07:20:03 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2002-10-17 07:20:03 +0000 |
| commit | d0cc39f7c80fc40eff1ee1ce995f125df0596d37 (patch) | |
| tree | 7d8b02db4dea279831887c81f11867296a843496 /x11-servers/XFree86-4-VirtualFramebufferServer | |
| parent | bd9d86d0326eb67c154bfd38fa98d9db58cda13a (diff) | |
| download | ports-d0cc39f7c80fc40eff1ee1ce995f125df0596d37.tar.gz ports-d0cc39f7c80fc40eff1ee1ce995f125df0596d37.zip | |
Notes
Diffstat (limited to 'x11-servers/XFree86-4-VirtualFramebufferServer')
3 files changed, 12 insertions, 14 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> diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo index 95b76fbc1ab0..e4832d764bce 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo @@ -1,4 +1,3 @@ MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f -MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887 -MD5 (xc/4.2.1-mit-shm-security.patch) = 18eb56110c7f66895111bd9f3513b54e MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659 +MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274 diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure index efba0bbf0d11..7065ae6b3640 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure @@ -50,6 +50,9 @@ configure () { echo "#define BuildServersOnly YES" >> $LOCALDEF echo "#define UseInstalledPrograms YES" >> $LOCALDEF echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF + echo "#define FreeBSDCC ${CC}" >> $LOCALDEF + echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF + echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF |