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 | |
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')
-rw-r--r-- | x11/XFree86-4-libraries/Makefile | 18 | ||||
-rw-r--r-- | x11/XFree86-4-libraries/distinfo | 2 | ||||
-rw-r--r-- | x11/XFree86-4-libraries/files/patch-c | 28 | ||||
-rw-r--r-- | x11/XFree86-4-libraries/files/patch-c2 | 20 | ||||
-rw-r--r-- | x11/XFree86-4-libraries/files/patch-d | 42 | ||||
-rw-r--r-- | x11/XFree86-4-libraries/scripts/configure | 3 |
6 files changed, 41 insertions, 72 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 \ diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo index 70ec99893759..e4832d764bce 100644 --- a/x11/XFree86-4-libraries/distinfo +++ b/x11/XFree86-4-libraries/distinfo @@ -1,3 +1,3 @@ MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659 -MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887 +MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274 diff --git a/x11/XFree86-4-libraries/files/patch-c b/x11/XFree86-4-libraries/files/patch-c index 268c3604a167..407ea771acc7 100644 --- a/x11/XFree86-4-libraries/files/patch-c +++ b/x11/XFree86-4-libraries/files/patch-c @@ -1,5 +1,5 @@ ---- config/cf/Imake.tmpl.orig Tue Jan 15 13:22:33 2002 -+++ config/cf/Imake.tmpl Tue Sep 3 23:37:40 2002 +--- config/cf/Imake.tmpl.orig Wed Oct 16 20:56:39 2002 ++++ config/cf/Imake.tmpl Wed Oct 16 21:52:31 2002 @@ -220,7 +220,7 @@ #ifndef RmanCmd @@ -9,7 +9,7 @@ #define RmanCmd rman #else #define RmanCmd $(TOP)/config/util/rman -@@ -1273,7 +1273,7 @@ +@@ -1282,7 +1282,7 @@ #define LoaderLibPrefix /**/ #endif #ifndef ImakeCmd @@ -18,7 +18,7 @@ #define ImakeCmd imake #else #define ImakeCmd $(IMAKESRC)/imake -@@ -1281,19 +1281,19 @@ +@@ -1290,19 +1290,19 @@ #endif #ifndef DependCmd #if UseGccMakeDepend @@ -41,7 +41,7 @@ #define DependCmd makedepend #else #define DependCmd $(DEPENDSRC)/makedepend -@@ -1320,21 +1320,21 @@ +@@ -1329,21 +1329,21 @@ #ifndef ExportListCmd # ifndef ExportListGenSource # define ExportListCmd /**/ @@ -66,21 +66,3 @@ #define RevPathCmd revpath #else #define RevPathCmd $(CONFIGSRC)/util/revpath -@@ -1536,7 +1536,7 @@ - CXXOPTIONS = CplusplusOptions - CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) - CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) -- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) -+ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) - #endif - - #if !BuildLibraries && AlternateIncRoot -@@ -1736,7 +1736,7 @@ - */ - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) -- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) -+ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) - LDPRELIB = LdPreLib - LDPOSTLIB = LdPostLib diff --git a/x11/XFree86-4-libraries/files/patch-c2 b/x11/XFree86-4-libraries/files/patch-c2 index 810389b5eb75..bbebc76c13e0 100644 --- a/x11/XFree86-4-libraries/files/patch-c2 +++ b/x11/XFree86-4-libraries/files/patch-c2 @@ -1,23 +1,5 @@ --- config/cf/Library.tmpl.orig Mon Aug 27 10:40:55 2001 -+++ config/cf/Library.tmpl Mon Sep 2 12:06:46 2002 -@@ -67,7 +67,7 @@ - STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) - CDEBUGFLAGS = LibraryCDebugFlags - CLIBDEBUGFLAGS = LibraryDebugOpt -- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) -+ CFLAGS += $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) - # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) - PICFLAGS = LargePositionIndependentCFlags - # endif -@@ -92,7 +92,7 @@ - STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) - CXXDEBUGFLAGS = LibraryCplusplusDebugFlags - CXXLIBDEBUGFLAGS = LibraryDebugOpt -- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) -+ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) - # if defined(LargePICTable) && LargePICTable - # ifdef LargePositionIndependentCplusplusFlags - CXXPICFLAGS = LargePositionIndependentCplusplusFlags ++++ config/cf/Library.tmpl Wed Oct 16 21:53:13 2002 @@ -300,6 +300,10 @@ */ diff --git a/x11/XFree86-4-libraries/files/patch-d b/x11/XFree86-4-libraries/files/patch-d index 0b413d45abd7..6dd191f728b3 100644 --- a/x11/XFree86-4-libraries/files/patch-d +++ b/x11/XFree86-4-libraries/files/patch-d @@ -1,5 +1,5 @@ ---- config/cf/FreeBSD.cf.orig Sun Oct 6 18:14:59 2002 -+++ config/cf/FreeBSD.cf Sun Oct 6 18:28:12 2002 +--- config/cf/FreeBSD.cf.orig Wed Oct 16 20:31:40 2002 ++++ config/cf/FreeBSD.cf Wed Oct 16 20:32:04 2002 @@ -43,11 +43,15 @@ #define GccUsesGas YES #define UseGas YES @@ -58,13 +58,13 @@ #if BuildThreadStubLibrary && !UseInstalled -# define CcCmd $(CLIENTENVSETUP) cc -# define CplusplusCmd $(CLIENTENVSETUP) c++ -+# define CcCmd $(CLIENTENVSETUP) ${FBSDCC} -+# define CplusplusCmd $(CLIENTENVSETUP) ${FBSDCXX} ++# define CcCmd $(CLIENTENVSETUP) FreeBSDCC ++# define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX #else -# define CcCmd cc -# define CplusplusCmd c++ -+# define CcCmd ${FBSDCC} -+# define CplusplusCmd ${FBSDCXX} ++# define CcCmd FreeBSDCC ++# define CplusplusCmd FreeBSDCXX #endif #define CppCmd /usr/bin/cpp @@ -99,24 +99,28 @@ #define StandardDefines -DCSRG_BASED -@@ -448,14 +469,14 @@ - /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ - #ifndef DefaultGcc2i386Opt - #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) --#define DefaultGcc2i386Opt -O2 -+#define DefaultGcc2i386Opt - #endif +@@ -445,18 +466,8 @@ + #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif - #ifdef i386Architecture - # define OptimizedCDebugFlags DefaultGcc2i386Opt - #else +-/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ +-#ifndef DefaultGcc2i386Opt +-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) +-#define DefaultGcc2i386Opt -O2 +-#endif +-#endif +- +-#ifdef i386Architecture +-# define OptimizedCDebugFlags DefaultGcc2i386Opt +-#else -# define OptimizedCDebugFlags -O -+# define OptimizedCDebugFlags - #endif +-#endif ++#define DefaultGcc2i386Opt ++#define OptimizedCDebugFlags FreeBSDCFLAGS #ifndef PreIncDir -@@ -509,6 +530,10 @@ + # define PreIncDir /usr/include +@@ -509,6 +520,10 @@ #ifndef PamLibraries #define PamLibraries -lpam DlLibrary diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure index 832eec9686a8..d37c78c4c1cc 100644 --- a/x11/XFree86-4-libraries/scripts/configure +++ b/x11/XFree86-4-libraries/scripts/configure @@ -73,6 +73,9 @@ configure () { echo "#define FreeBSDBuildXlib YES" >> $LOCALDEF echo "#define FreeBSDBuildXbin 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 |