Improve Linux/AMD64 support. Bump revisions of xorg-imake and

xorg-libs due to changed packages.

4 files changed, 23 insertions, 7 deletions

diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index 865bc1e0ad0..431fa17a2b8 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -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 --git a/x11/xorg-libs/PLIST b/x11/xorg-libs/PLIST
index 49c7e1ad627..b9e76251543 100644
--- a/x11/xorg-libs/PLIST
+++ b/x11/xorg-libs/PLIST
@@ -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
 ${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
 ${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/libXcomposite.so.1.0
 ${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 --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 2285becad65..854b8689c35 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -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 @@ Size (X11R6.9.0-src3.tar.gz) = 10872474 bytes
 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 --git a/x11/xorg-libs/patches/patch-ad b/x11/xorg-libs/patches/patch-ad
index d6dc9c0a2b4..b977fd8ae8a 100644
--- a/x11/xorg-libs/patches/patch-ad
+++ b/x11/xorg-libs/patches/patch-ad
@@ -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 @@ $NetBSD: patch-ad,v 1.4 2006/01/18 23:53:06 xtraeme Exp $
  # 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