diff options
Diffstat (limited to 'x11/XFree86-libs/patches')
| -rw-r--r-- | x11/XFree86-libs/patches/patch-au | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/x11/XFree86-libs/patches/patch-au b/x11/XFree86-libs/patches/patch-au index 20c29ce2a21..a3827467ed7 100644 --- a/x11/XFree86-libs/patches/patch-au +++ b/x11/XFree86-libs/patches/patch-au @@ -1,37 +1,36 @@ -$NetBSD: patch-au,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ +$NetBSD: patch-au,v 1.2 2004/01/31 15:06:24 xtraeme Exp $ ---- config/cf/FreeBSD.cf.in.orig Tue Jul 22 05:38:50 2003 -+++ config/cf/FreeBSD.cf.in Tue Jul 22 05:42:22 2003 -@@ -162,14 +162,14 @@ +--- config/cf/FreeBSD.cf.in.orig Sat Jan 31 15:05:04 2004 ++++ config/cf/FreeBSD.cf.in Sat Jan 31 15:07:28 2004 +@@ -161,15 +161,10 @@ + * * ld: warning: libXThrStub.so.6, needed by libX11.so, not found */ - #if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) +-#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) -# define CcCmd $(CLIENTENVSETUP) cc -# define CplusplusCmd $(CLIENTENVSETUP) c++ -+# define CcCmd $(CLIENTENVSETUP) @@PKGSRC_CC@@ -+# define CplusplusCmd $(CLIENTENVSETUP) @@PKGSRC_CXX@@ - #else +-#else -# define CcCmd cc -# define CplusplusCmd c++ -+# define CcCmd @@PKGSRC_CC@@ -+# define CplusplusCmd @@PKGSRC_CXX@@ - #endif +-#endif ++#define CcCmd @@PKGSRC_CC@@ ++#define CplusplusCmd @@PKGSRC_CXX@@ -#define CppCmd /usr/bin/cpp +#define CppCmd @@PKGSRC_CPP@@ #define PreProcessCmd CppCmd #define StandardCppOptions -traditional #define StandardCppDefines /**/ -@@ -177,7 +177,7 @@ +@@ -177,7 +172,7 @@ #if defined(UseInstalled) #define DefaultCCOptions /**/ #else -#define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions -+#define DefaultCCOptions -ansi @@PKGSRC_CFLAGS@@ -Dasm=__asm ++#define DefaultCCOptions -ansi -Dasm=__asm #endif #endif #ifndef ExtraLibraries -@@ -482,17 +482,12 @@ +@@ -482,18 +477,9 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #endif @@ -41,13 +40,23 @@ $NetBSD: patch-au,v 1.1.1.1 2004/01/24 08:47:32 xtraeme Exp $ -#define DefaultGcc2i386Opt -O2 -#endif -#endif -+#define DefaultGcc2i386Opt - #ifdef i386Architecture - # define OptimizedCDebugFlags DefaultGcc2i386Opt - #else +-#ifdef i386Architecture +-# define OptimizedCDebugFlags DefaultGcc2i386Opt +-#else -# define OptimizedCDebugFlags -O -+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ - #endif +-#endif ++#define DefaultGcc2i386Opt ++#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ #ifndef PreIncDir + # define PreIncDir /usr/include +@@ -519,7 +505,7 @@ + * Compress manual pages + */ + #ifndef CompressManPages +-# define CompressManPages YES ++# define CompressManPages NO + #endif + + #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) |