summaryrefslogtreecommitdiff
path: root/x11/xorg-imake
diff options
context:
space:
mode:
authorjoerg <joerg>2006-06-12 00:36:25 +0000
committerjoerg <joerg>2006-06-12 00:36:25 +0000
commitcdee1a604faaafd1e2907257ff4cad657b040f65 (patch)
treefbdbe90cc89f74523b4d89c7d8d86518e97b811e /x11/xorg-imake
parente1c10cd40e81a98c27d01a64242cf6e932f6f774 (diff)
downloadpkgsrc-cdee1a604faaafd1e2907257ff4cad657b040f65.tar.gz
Improve Linux/AMD64 support. Bump revisions of xorg-imake and
xorg-libs due to changed packages.
Diffstat (limited to 'x11/xorg-imake')
-rw-r--r--x11/xorg-imake/Makefile4
-rw-r--r--x11/xorg-imake/distinfo4
-rw-r--r--x11/xorg-imake/patches/patch-ae12
3 files changed, 15 insertions, 5 deletions
diff --git a/x11/xorg-imake/Makefile b/x11/xorg-imake/Makefile
index 758165c2777..6c5c9d08acd 100644
--- a/x11/xorg-imake/Makefile
+++ b/x11/xorg-imake/Makefile
@@ -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 --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo
index b01fb6f2dfa..03b2faa83de 100644
--- a/x11/xorg-imake/distinfo
+++ b/x11/xorg-imake/distinfo
@@ -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-aa) = f8d35ceb67df85ca04d9567d66bf99c5d292d322
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 --git a/x11/xorg-imake/patches/patch-ae b/x11/xorg-imake/patches/patch-ae
index 3e2ca944340..663a82cb453 100644
--- a/x11/xorg-imake/patches/patch-ae
+++ b/x11/xorg-imake/patches/patch-ae
@@ -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 @@ $NetBSD: patch-ae,v 1.2 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