summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorhira <hira>2005-10-16 16:28:27 +0000
committerhira <hira>2005-10-16 16:28:27 +0000
commit00264534097b3362b386c93dd7a7bc65ad91f433 (patch)
treec3b3102cb27684f1df5aec2a2d066c1a2df8a367 /x11
parent772c86299b4de7642e25fe36afed2d3adb17fa31 (diff)
downloadpkgsrc-00264534097b3362b386c93dd7a7bc65ad91f433.tar.gz
Avoid warning of `OptimizedCDebugFlags redefined' on NetBSD/macppc.
Diffstat (limited to 'x11')
-rw-r--r--x11/xorg-imake/distinfo4
-rw-r--r--x11/xorg-imake/patches/patch-ac14
2 files changed, 13 insertions, 5 deletions
diff --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo
index 0b3aaa2b33b..c974f7b6d18 100644
--- a/x11/xorg-imake/distinfo
+++ b/x11/xorg-imake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2005/09/13 22:51:42 reed Exp $
+$NetBSD: distinfo,v 1.16 2005/10/16 16:28:27 hira Exp $
SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
@@ -8,7 +8,7 @@ RMD160 (X11R6.8.2-src3.tar.gz) = d3c90401ba81dfeea843373d0d0d386962b636a6
Size (X11R6.8.2-src3.tar.gz) = 10379299 bytes
SHA1 (patch-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322
SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
-SHA1 (patch-ac) = 998b6f0f2541306ccba576974e83aa79be5c1bb8
+SHA1 (patch-ac) = 9849c826bb5b25dce8b52fb689672dd485daa34d
SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d
SHA1 (patch-af) = 178d556fa11818420cd685308cf179ee5f6f7dac
diff --git a/x11/xorg-imake/patches/patch-ac b/x11/xorg-imake/patches/patch-ac
index 5e846c521c4..3b3458e9baa 100644
--- a/x11/xorg-imake/patches/patch-ac
+++ b/x11/xorg-imake/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.4 2005/09/13 22:51:42 reed Exp $
+$NetBSD: patch-ac,v 1.5 2005/10/16 16:28:27 hira Exp $
---- config/cf/NetBSD.cf.in.orig 2004-08-14 17:03:36.000000000 -0700
-+++ config/cf/NetBSD.cf.in 2005-09-12 15:21:11.000000000 -0700
+--- config/cf/NetBSD.cf.in.orig 2004-08-15 09:03:36.000000000 +0900
++++ config/cf/NetBSD.cf.in 2005-10-17 01:14:50.000000000 +0900
@@ -123,7 +123,7 @@
# define ThreadedX YES
# define HasThreadSafeAPI YES
@@ -123,3 +123,11 @@ $NetBSD: patch-ac,v 1.4 2005/09/13 22:51:42 reed Exp $
# include <xorg.cf>
#endif
+@@ -649,6 +656,7 @@
+ */
+ #ifdef PpcArchitecture
+
++# undef OptimizedCDebugFlags
+ # define OptimizedCDebugFlags -O2
+ # define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
+