summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2008-01-12 21:19:34 +0000
committerjoerg <joerg@pkgsrc.org>2008-01-12 21:19:34 +0000
commit47399dde35ecd46ee4084a758100b1886b7bc975 (patch)
tree2c140e1c999894f6ddaba8b115ecb29ab7056111 /x11
parenta59bb44b3c5fc0dbee7c5934bdd47bbe0f8163d7 (diff)
downloadpkgsrc-47399dde35ecd46ee4084a758100b1886b7bc975.tar.gz
Remove gmakeism from Linux rules.
Diffstat (limited to 'x11')
-rw-r--r--x11/xorg-cf-files/Makefile4
-rw-r--r--x11/xorg-cf-files/distinfo4
-rw-r--r--x11/xorg-cf-files/patches/patch-ac15
3 files changed, 17 insertions, 6 deletions
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 7d9df2d4713..187d54665b4 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2007/12/02 00:35:23 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/01/12 21:19:34 joerg Exp $
#
DISTNAME= xorg-cf-files-1.0.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 devel
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/util/
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
index 60f7f547f0d..ab32bb9775f 100644
--- a/x11/xorg-cf-files/distinfo
+++ b/x11/xorg-cf-files/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2007/12/02 00:35:23 joerg Exp $
+$NetBSD: distinfo,v 1.3 2008/01/12 21:19:34 joerg Exp $
SHA1 (xorg-cf-files-1.0.2.tar.bz2) = a1182e1fd05a648e6282598a355b7c4be9339755
RMD160 (xorg-cf-files-1.0.2.tar.bz2) = dc42aa06d7fb5bc073d51958763bf1bfcfd22926
Size (xorg-cf-files-1.0.2.tar.bz2) = 264638 bytes
SHA1 (patch-aa) = afe809bcc5d93be3b8a74e720faf2dc1daa4634d
SHA1 (patch-ab) = 42fb5238ca07a25d54069aca72882fd36fb118cc
-SHA1 (patch-ac) = abc9659d3b87186f833f64cdfab5130ab1182c9d
+SHA1 (patch-ac) = 134c15ae840750d4752717295da96637befa4ed3
SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
SHA1 (patch-ae) = bc41dbcfdb45fce8be152cd2ea275954d4aad935
SHA1 (patch-af) = 6fdcbcb8858bd82d260d00563980e80e314b899c
diff --git a/x11/xorg-cf-files/patches/patch-ac b/x11/xorg-cf-files/patches/patch-ac
index 4826e28f516..1a4b1c41ecb 100644
--- a/x11/xorg-cf-files/patches/patch-ac
+++ b/x11/xorg-cf-files/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 2007/12/02 00:35:23 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2008/01/12 21:19:34 joerg Exp $
--- linux.cf.orig 2005-10-21 21:10:27.000000000 +0200
+++ linux.cf
@@ -52,7 +52,18 @@ $NetBSD: patch-ac,v 1.2 2007/12/02 00:35:23 joerg Exp $
#define MakeNamedTargetSubdir(dir,flags,subname)\
$(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
-@@ -1053,9 +1050,6 @@ InstallNamedTargetNoClobber(install,file
+@@ -1042,20 +1041,12 @@ InstallNamedTargetNoClobber(install,file
+ #endif
+
+
+-#define HasGnuMake YES
+-
+-#define MakeNamedTargetSubdir(dir,flags,subname)\
+- $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
+-
+ #define ArchitectureDefines -DLINUX_ARCHITECTURE
+
+ #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
#if HaveLib64