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/XFree86-4-clients | |
| parent | Damage to the CVS repository has been corrected, so add RDF files (diff) | |
[1] Make the 4.2.1 ports all use the merged 4.2.1+mitshm patch.
[2] Make the ports respect CFLAGS better. Now CFLAGS (and CC/CXX) are set for
the build during the configure stage.
PR: [2] 40271, 43369
Notes
Notes:
svn path=/head/; revision=68192
Diffstat (limited to 'x11/XFree86-4-clients')
| -rw-r--r-- | x11/XFree86-4-clients/Makefile | 25 | ||||
| -rw-r--r-- | x11/XFree86-4-clients/distinfo | 3 | ||||
| -rw-r--r-- | x11/XFree86-4-clients/scripts/configure | 3 |
3 files changed, 15 insertions, 16 deletions
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile index b77dd5d00a35..622f3f5ecf56 100644 --- a/x11/XFree86-4-clients/Makefile +++ b/x11/XFree86-4-clients/Makefile @@ -7,20 +7,17 @@ PORTNAME= clients PORTVERSION= 4.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} -MASTER_SITE_SUBDIR= 4.2.0/:x \ - ${PORTVERSION}/patches/:x421patch \ - anholt/:local +MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} +MASTER_SITE_SUBDIR= 4.2.0/:x PKGNAMEPREFIX= XFree86- -DISTFILES= X420src-1.tgz:x \ - X420src-2.tgz:x \ - 4.2.0-4.2.1.diff.gz:x421patch +DISTFILES= X420src-1.tgz:x EXTRACT_ONLY= X420src-1.tgz -PATCH_DIST_STRIP= -p1 +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 @@ -36,7 +33,10 @@ SCRIPTS_ENV= InstallXdmConfig=${InstallXdmConfig} \ InstallXinitConfig=${InstallXinitConfig} \ InstallAppDefFiles=${InstallAppDefFiles} \ HasSecureRPC=${HasSecureRPC} \ - HasPam=${HasPam} + HasPam=${HasPam} \ + CC="${CC}" \ + CXX="${CXX}" \ + CFLAGS="${CFLAGS}" MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \ PORTNAME=${PORTNAME} \ PORTVERSION=${PORTVERSION} @@ -67,9 +67,6 @@ post-extract: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ ${DISTDIR}/${DIST_SUBDIR}/X420src-2.tgz \ | ${TAR} -xf - xc/fonts/util ) -pre-patch: - -@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \ - | ${PATCH} ${PATCH_DIST_ARGS} --batch post-patch: cd ${WRKSRC}/nls; \ diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo index b55c970ec727..e4832d764bce 100644 --- a/x11/XFree86-4-clients/distinfo +++ b/x11/XFree86-4-clients/distinfo @@ -1,4 +1,3 @@ MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f -MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e -MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887 MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659 +MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274 diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure index 3a792aa57e49..23b4aeb368b7 100644 --- a/x11/XFree86-4-clients/scripts/configure +++ b/x11/XFree86-4-clients/scripts/configure @@ -75,6 +75,9 @@ configure () { echo "#define PreloadSetup" >> $LOCALDEF echo "#define BuildPlugin NO" >> $LOCALDEF echo "#define UseInstalledPrograms YES" >> $LOCALDEF + echo "#define FreeBSDCC ${CC}" >> $LOCALDEF + echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF + echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF |