summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-libs/distinfo3
-rw-r--r--x11/XFree86-libs/patches/patch-aj49
2 files changed, 51 insertions, 1 deletions
diff --git a/x11/XFree86-libs/distinfo b/x11/XFree86-libs/distinfo
index 41aba5079fb..b864e4c681e 100644
--- a/x11/XFree86-libs/distinfo
+++ b/x11/XFree86-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2004/07/03 06:26:08 grant Exp $
+$NetBSD: distinfo,v 1.6 2004/07/21 22:21:49 xtraeme Exp $
SHA1 (XFree86-4.4.0-src-1.tgz) = 44b38a7044c82d0b2f785b0e6a935349abcb5d79
Size (XFree86-4.4.0-src-1.tgz) = 11760814 bytes
@@ -17,3 +17,4 @@ SHA1 (patch-af) = b34f46d715e90159df3897cf20023b58b9deff67
SHA1 (patch-ag) = a06752ee9f55e64a407fac6fbde3547fd096c71d
SHA1 (patch-ah) = 30618658577dd37b31191197cd2c156ff72e0d90
SHA1 (patch-ai) = 178d556fa11818420cd685308cf179ee5f6f7dac
+SHA1 (patch-aj) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
diff --git a/x11/XFree86-libs/patches/patch-aj b/x11/XFree86-libs/patches/patch-aj
new file mode 100644
index 00000000000..32f082f89b9
--- /dev/null
+++ b/x11/XFree86-libs/patches/patch-aj
@@ -0,0 +1,49 @@
+$NetBSD: patch-aj,v 1.3 2004/07/21 22:21:49 xtraeme Exp $
+
+--- config/cf/OpenBSD.cf.in.orig 2004-07-22 00:18:37.000000000 +0200
++++ config/cf/OpenBSD.cf.in 2004-07-22 00:19:48.000000000 +0200
+@@ -162,7 +162,7 @@
+ #define MkdirHierCmd mkdir -p
+
+ #ifndef CppCmd
+-#define CppCmd /usr/libexec/cpp
++#define CppCmd @@PKGSRC_CPP@@
+ #endif
+ #define StandardCppOptions -traditional
+ #define StandardCppDefines /**/
+@@ -170,10 +170,10 @@
+ #define PreIncDir DefaultGccIncludeDir
+
+ #ifndef CcCmd
+-#define CcCmd cc
++#define CcCmd @@PKGSRC_CC@@
+ #endif
+ #ifndef AsCmd
+-#define AsCmd cc -c -x assembler
++#define AsCmd @@PKGSRC_CC@@ -c -x assembler
+ #endif
+ #ifndef DefaultCCOptions
+ #if defined(UseInstalled)
+@@ -226,7 +226,6 @@
+
+ #define HasBsdMake YES
+
+-#define BuildCyrillicFonts YES
+ #define GzipFontCompression YES
+ #define DefaultUserPath /bin:/usr/bin:/usr/local/bin:$(BINDIR)
+ #define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
+@@ -481,13 +480,7 @@
+ # endif
+
+
+-# ifndef DefaultGcc2i386Opt
+-# if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2
+- /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */
+-# define DefaultGcc2i386Opt -O2 GccAliasingArgs
+-# endif
+-# endif
+-# define OptimizedCDebugFlags DefaultGcc2i386Opt
++# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
+ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+ # define ServerExtraSysLibs -li386
+ # define LdPostLib /**/