pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/xorg-libs Fix an inverted condition for NetBSD/amd64.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/780f30dde54f
branches:  trunk
changeset: 490774:780f30dde54f
user:      hira <hira%pkgsrc.org@localhost>
date:      Sat Mar 19 19:34:49 2005 +0000

description:
Fix an inverted condition for NetBSD/amd64.

diffstat:

 x11/xorg-libs/distinfo         |   4 ++--
 x11/xorg-libs/patches/patch-ac |  14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (69 lines):

diff -r f1adc87240dd -r 780f30dde54f x11/xorg-libs/distinfo
--- a/x11/xorg-libs/distinfo    Sat Mar 19 17:52:53 2005 +0000
+++ b/x11/xorg-libs/distinfo    Sat Mar 19 19:34:49 2005 +0000
@@ -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 @@
 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 -r f1adc87240dd -r 780f30dde54f x11/xorg-libs/patches/patch-ac
--- a/x11/xorg-libs/patches/patch-ac    Sat Mar 19 17:52:53 2005 +0000
+++ b/x11/xorg-libs/patches/patch-ac    Sat Mar 19 19:34:49 2005 +0000
@@ -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 @@
  # else
  #  define ServerExtraSysLibs  /**/
  # endif
-@@ -280,10 +280,24 @@
+@@ -280,10 +280,25 @@
  #  ifndef XFree86ConsoleDefines
  #    define XFree86ConsoleDefines     -DWSCONS_SUPPORT
  #  endif
@@ -95,8 +94,9 @@
  
 +
 +#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 @@
  #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 @@
  /*
   * agpgart support (NetBSD 1.5Y and up)
   */
-@@ -588,7 +606,7 @@
+@@ -588,7 +607,7 @@
  # define BuildXInputLib          YES
  #endif
  



Home | Main Index | Thread Index | Old Index