[pkgsrc/trunk]: pkgsrc/x11 Improve Linux/AMD64 support. Bump revisions of xor...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f992e4df0f79
branches:  trunk
changeset: 514430:f992e4df0f79
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jun 12 00:36:25 2006 +0000

description:
Improve Linux/AMD64 support. Bump revisions of xorg-imake and
xorg-libs due to changed packages.

diffstat:

 x11/xorg-imake/Makefile         |   4 ++--
 x11/xorg-imake/distinfo         |   4 ++--
 x11/xorg-imake/patches/patch-ae |  12 +++++++++++-
 x11/xorg-libs/Makefile          |   4 ++--
 x11/xorg-libs/PLIST             |  10 ++++++++--
 x11/xorg-libs/distinfo          |   4 ++--
 x11/xorg-libs/patches/patch-ad  |  12 +++++++++++-
 7 files changed, 38 insertions(+), 12 deletions(-)

diffs (148 lines):

diff -r c996bfdb11d0 -r f992e4df0f79 x11/xorg-imake/Makefile
--- a/x11/xorg-imake/Makefile   Sun Jun 11 23:51:16 2006 +0000
+++ b/x11/xorg-imake/Makefile   Mon Jun 12 00:36:25 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2006/04/22 09:22:17 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2006/06/12 00:36:25 joerg Exp $
 
 DISTNAME=      ${DISTFILES}
 PKGNAME=       xorg-imake-${XORG_VER}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG}
 DISTFILES=     X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src3.tar.gz
diff -r c996bfdb11d0 -r f992e4df0f79 x11/xorg-imake/distinfo
--- a/x11/xorg-imake/distinfo   Sun Jun 11 23:51:16 2006 +0000
+++ b/x11/xorg-imake/distinfo   Mon Jun 12 00:36:25 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2006/04/28 21:52:19 joerg Exp $
+$NetBSD: distinfo,v 1.20 2006/06/12 00:36:25 joerg Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -10,7 +10,7 @@
 SHA1 (patch-ab) = ae90c06b50d5d8b84054cc66beec0d0e3049d0aa
 SHA1 (patch-ac) = edd7ae5601783d65bec21b5aaed3fd879bc0ed99
 SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
-SHA1 (patch-ae) = f6bff42193905fd3158b3de52bf925b5fb5f002a
+SHA1 (patch-ae) = 33233761a745b4c62cf64855a5d9c196cd679cf2
 SHA1 (patch-ag) = 79d826e9d8d4a05f250378814d47f0383ab2eafe
 SHA1 (patch-ah) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d
 SHA1 (patch-ai) = eb3853e360dd5e05ca5978791734bcba5541b162
diff -r c996bfdb11d0 -r f992e4df0f79 x11/xorg-imake/patches/patch-ae
--- a/x11/xorg-imake/patches/patch-ae   Sun Jun 11 23:51:16 2006 +0000
+++ b/x11/xorg-imake/patches/patch-ae   Mon Jun 12 00:36:25 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2006/01/18 23:53:06 xtraeme Exp $
+$NetBSD: patch-ae,v 1.3 2006/06/12 00:36:25 joerg Exp $
 
 --- config/cf/linux.cf.in.orig 2005-12-06 11:06:50.000000000 +0100
 +++ config/cf/linux.cf.in      2005-12-06 11:09:08.000000000 +0100
@@ -43,3 +43,13 @@
  # endif
  # define LinuxMachineDefines  -D__i386__
  # define ServerOSDefines      XFree86ServerOSDefines -DDDXTIME
+@@ -1053,9 +1052,6 @@ InstallNamedTargetNoClobber(install,file
+ #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
+ 
+ #if HaveLib64
+-# ifndef LibDirName
+-#  define LibDirName          lib64
+-# endif
+ # ifndef SystemUsrLibDir
+ #  define SystemUsrLibDir     /usr/lib64
+ # endif
diff -r c996bfdb11d0 -r f992e4df0f79 x11/xorg-libs/Makefile
--- a/x11/xorg-libs/Makefile    Sun Jun 11 23:51:16 2006 +0000
+++ b/x11/xorg-libs/Makefile    Mon Jun 12 00:36:25 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2006/06/01 22:44:08 tron Exp $
+# $NetBSD: Makefile,v 1.36 2006/06/12 00:36:25 joerg Exp $
 
 DISTNAME=              ${DISTFILES}
 PKGNAME=               xorg-libs-${XORG_VER}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_XORG}
 DISTFILES=             X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \
diff -r c996bfdb11d0 -r f992e4df0f79 x11/xorg-libs/PLIST
--- a/x11/xorg-libs/PLIST       Sun Jun 11 23:51:16 2006 +0000
+++ b/x11/xorg-libs/PLIST       Mon Jun 12 00:36:25 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/01/20 23:13:32 reed Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/06/12 00:36:25 joerg Exp $
 ${X11ROOT_PREFIX}/include/DPS/ColorSB.h
 ${X11ROOT_PREFIX}/include/DPS/ColorSBP.h
 ${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h
@@ -1001,7 +1001,7 @@
 ${X11ROOT_PREFIX}/lib/libI810XvMC.so.1.0
 ${X11ROOT_PREFIX}/lib/libICE.so
 ${X11ROOT_PREFIX}/lib/libICE.so.6
-${X11ROOT_PREFIX}/lib/libICE.so.6.3
+${X11ROOT_PREFIX}/lib/libICE.so.6.4
 ${X11ROOT_PREFIX}/lib/libOSMesa.a
 ${X11ROOT_PREFIX}/lib/libOSMesa.so
 ${X11ROOT_PREFIX}/lib/libOSMesa.so.4
@@ -1019,6 +1019,9 @@
 ${X11ROOT_PREFIX}/lib/libXTrap.so.6
 ${X11ROOT_PREFIX}/lib/libXTrap.so.6.4
 ${X11ROOT_PREFIX}/lib/libXau.a
+${X11ROOT_PREFIX}/lib/libXau.so
+${X11ROOT_PREFIX}/lib/libXau.so.6
+${X11ROOT_PREFIX}/lib/libXau.so.6.0
 ${X11ROOT_PREFIX}/lib/libXaw.so
 ${X11ROOT_PREFIX}/lib/libXaw.so.6
 ${X11ROOT_PREFIX}/lib/libXaw.so.6.1
@@ -1046,6 +1049,9 @@
 ${X11ROOT_PREFIX}/lib/libXdamage.so
 ${X11ROOT_PREFIX}/lib/libXdamage.so.1
 ${X11ROOT_PREFIX}/lib/libXdamage.so.1.0
+${X11ROOT_PREFIX}/lib/libXdmcp.so
+${X11ROOT_PREFIX}/lib/libXdmcp.so.6
+${X11ROOT_PREFIX}/lib/libXdmcp.so.6.0
 ${X11ROOT_PREFIX}/lib/libXevie.so
 ${X11ROOT_PREFIX}/lib/libXevie.so.1
 ${X11ROOT_PREFIX}/lib/libXevie.so.1.0
diff -r c996bfdb11d0 -r f992e4df0f79 x11/xorg-libs/distinfo
--- a/x11/xorg-libs/distinfo    Sun Jun 11 23:51:16 2006 +0000
+++ b/x11/xorg-libs/distinfo    Mon Jun 12 00:36:25 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.44 2006/06/01 22:44:08 tron Exp $
+$NetBSD: distinfo,v 1.45 2006/06/12 00:36:25 joerg Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -12,7 +12,7 @@
 SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1
 SHA1 (patch-ab) = 45f06a7d1ac2316621c5707bb202b7f6042699be
 SHA1 (patch-ac) = 841979893b72455ce59b951ac137ca0c236a39f3
-SHA1 (patch-ad) = f6bff42193905fd3158b3de52bf925b5fb5f002a
+SHA1 (patch-ad) = 33233761a745b4c62cf64855a5d9c196cd679cf2
 SHA1 (patch-ae) = 4d4e00a8f9e226323975596070a8fb3f59c34b4d
 SHA1 (patch-af) = 62127e39c829cba6b01bd9f3aaaea682eec52c9e
 SHA1 (patch-ag) = d300aa92052bdfe13e799223cf055c7955e7bb8f
diff -r c996bfdb11d0 -r f992e4df0f79 x11/xorg-libs/patches/patch-ad
--- a/x11/xorg-libs/patches/patch-ad    Sun Jun 11 23:51:16 2006 +0000
+++ b/x11/xorg-libs/patches/patch-ad    Mon Jun 12 00:36:25 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2006/01/18 23:53:06 xtraeme Exp $
+$NetBSD: patch-ad,v 1.5 2006/06/12 00:36:25 joerg Exp $
 
 --- config/cf/linux.cf.in.orig 2005-12-06 11:06:50.000000000 +0100
 +++ config/cf/linux.cf.in      2005-12-06 11:09:08.000000000 +0100
@@ -43,3 +43,13 @@
  # endif
  # define LinuxMachineDefines  -D__i386__
  # define ServerOSDefines      XFree86ServerOSDefines -DDDXTIME
+@@ -1053,9 +1052,6 @@ InstallNamedTargetNoClobber(install,file
+ #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
+ 
+ #if HaveLib64
+-# ifndef LibDirName
+-#  define LibDirName          lib64
+-# endif
+ # ifndef SystemUsrLibDir
+ #  define SystemUsrLibDir     /usr/lib64
+ # endif