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-libraries/Makefile | |
| 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-libraries/Makefile')
| -rw-r--r-- | x11/XFree86-4-libraries/Makefile | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index afc36b49b2d0..0c2a2766d585 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -7,21 +7,20 @@ PORTNAME= libraries 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_LOCAL:S/$/:local/} MASTER_SITE_SUBDIR= 4.2.0/:x \ - ${PORTVERSION}/patches/:x421patch \ anholt/:local PKGNAMEPREFIX= XFree86- DISTFILES= X420src-1.tgz:x \ - 4.2.0-4.2.1.diff.gz:x421patch \ Wraphelp.gz:local 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 @@ -43,7 +42,10 @@ SCRIPTS_ENV= HasSecureRPC=${HasSecureRPC} \ BuildXIE=${BuildXIE} \ BuildAoutLibraries=${BuildAoutLibraries} \ ForceNormalLib=${ForceNormalLib} \ - DebuggableLibraries=${DebuggableLibraries} + DebuggableLibraries=${DebuggableLibraries} \ + CC="${CC}" \ + CXX="${CXX}" \ + CFLAGS="${CFLAGS}" MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \ PORTNAME=${PORTNAME} \ PORTVERSION=${PORTVERSION} @@ -105,10 +107,6 @@ 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} ${PATCH_DIST_ARGS} --batch - post-patch: cd ${WRKSRC}/nls; \ for i in Compose XI18N_OBJS XLC_LOCALE; do \ |