diff options
| author | hira <hira@pkgsrc.org> | 2005-03-19 19:34:49 +0000 |
|---|---|---|
| committer | hira <hira@pkgsrc.org> | 2005-03-19 19:34:49 +0000 |
| commit | 67eccb5772973e046986cbc5daadd76db66a331f (patch) | |
| tree | 59dd54a320d7daff1ee0827ca4c3d6f976a46577 /x11 | |
| parent | 72fe0284582f16faa2488dd460768922e95e1a31 (diff) | |
| download | pkgsrc-67eccb5772973e046986cbc5daadd76db66a331f.tar.gz | |
Fix an inverted condition for NetBSD/amd64.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xorg-libs/distinfo | 4 | ||||
| -rw-r--r-- | x11/xorg-libs/patches/patch-ac | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo index 623950596e4..330fd8118ad 100644 --- a/x11/xorg-libs/distinfo +++ b/x11/xorg-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2005/03/01 19:00:11 xtraeme Exp $ +$NetBSD: distinfo,v 1.14 2005/03/19 19:34:49 hira Exp $ SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8 @@ -10,7 +10,7 @@ SHA1 (X11R6.8.2-src3.tar.gz) = de1569856b8023c58fc92bd0b3c8406214451fce RMD160 (X11R6.8.2-src3.tar.gz) = d3c90401ba81dfeea843373d0d0d386962b636a6 Size (X11R6.8.2-src3.tar.gz) = 10379299 bytes SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1 -SHA1 (patch-ac) = 9ada5ad89af7f744a7951b0919a09f0b26d949e3 +SHA1 (patch-ac) = 444f724a62ec435cc804c4f91e310893583e205a SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d SHA1 (patch-ag) = 178d556fa11818420cd685308cf179ee5f6f7dac diff --git a/x11/xorg-libs/patches/patch-ac b/x11/xorg-libs/patches/patch-ac index b5a694ff978..2c87b61730e 100644 --- a/x11/xorg-libs/patches/patch-ac +++ b/x11/xorg-libs/patches/patch-ac @@ -1,7 +1,6 @@ -$NetBSD: patch-ac,v 1.4 2005/02/21 16:45:40 hira Exp $ --- config/cf/NetBSD.cf.in.orig 2004-08-15 09:03:36.000000000 +0900 -+++ config/cf/NetBSD.cf.in 2005-02-21 11:23:09.000000000 +0900 ++++ config/cf/NetBSD.cf.in 2005-03-20 03:57:25.000000000 +0900 @@ -123,7 +123,7 @@ # define ThreadedX YES # define HasThreadSafeAPI YES @@ -80,7 +79,7 @@ $NetBSD: patch-ac,v 1.4 2005/02/21 16:45:40 hira Exp $ # else # define ServerExtraSysLibs /**/ # endif -@@ -280,10 +280,24 @@ +@@ -280,10 +280,25 @@ # ifndef XFree86ConsoleDefines # define XFree86ConsoleDefines -DWSCONS_SUPPORT # endif @@ -95,8 +94,9 @@ $NetBSD: patch-ac,v 1.4 2005/02/21 16:45:40 hira Exp $ + +#if defined(AMD64Architecture) && \ -+ ((OSMajorVersion > 2) || \ -+ (OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion >= 16)) ++ ((OSMajorVersion < 2) || \ ++ (OSMajorVersion == 2 && OSMinorVersion < 99) || \ ++ (OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 16)) +#ifndef PassHintToMMAP +#define PassHintToMMAP +#endif @@ -105,7 +105,7 @@ $NetBSD: patch-ac,v 1.4 2005/02/21 16:45:40 hira Exp $ #define StandardDefines -DCSRG_BASED /* Citrus mb locale were added in 1.5P */ #if ((OSMajorVersion > 1) || \ -@@ -400,6 +414,10 @@ +@@ -400,6 +415,10 @@ # endif /* MTRRBuiltin */ #endif /* i386Architecture */ @@ -116,7 +116,7 @@ $NetBSD: patch-ac,v 1.4 2005/02/21 16:45:40 hira Exp $ /* * agpgart support (NetBSD 1.5Y and up) */ -@@ -588,7 +606,7 @@ +@@ -588,7 +607,7 @@ # define BuildXInputLib YES #endif |