summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2007-12-02 00:35:23 +0000
committerjoerg <joerg@pkgsrc.org>2007-12-02 00:35:23 +0000
commit2ab9e539e7a8c75a80bc8f2086462df1d7268aaf (patch)
tree13eff82ef4f51bfd25c9ebc01b85bf7fe139c3de
parenta2ed90727a63b43631b7a84f4e4d148b89587e30 (diff)
downloadpkgsrc-2ab9e539e7a8c75a80bc8f2086462df1d7268aaf.tar.gz
On Linux, don't say we are using gmake when we aren't. Bump revision.
-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-ac25
3 files changed, 21 insertions, 12 deletions
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 82c4814b76e..7d9df2d4713 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/06/17 19:33:54 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2007/12/02 00:35:23 joerg Exp $
#
DISTNAME= xorg-cf-files-1.0.2
-PKGREVISION= 2
+PKGREVISION= 3
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 7a4636c394d..60f7f547f0d 100644
--- a/x11/xorg-cf-files/distinfo
+++ b/x11/xorg-cf-files/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/12/02 00:35:23 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) = 7ed4cd5b33759736d86cdb6226ef53a42bbf7d7e
+SHA1 (patch-ac) = abc9659d3b87186f833f64cdfab5130ab1182c9d
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 6ee415c26af..4826e28f516 100644
--- a/x11/xorg-cf-files/patches/patch-ac
+++ b/x11/xorg-cf-files/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2007/12/02 00:35:23 joerg Exp $
---- linux.cf.orig 2005-12-06 11:06:50.000000000 +0100
-+++ linux.cf 2005-12-06 11:09:08.000000000 +0100
-@@ -609,10 +609,10 @@
+--- linux.cf.orig 2005-10-21 21:10:27.000000000 +0200
++++ linux.cf
+@@ -609,10 +609,10 @@ InstallNamedTargetNoClobber(install,file
# if defined (i386Architecture) && ((GccMajorVersion >3) \
|| ((GccMajorVersion == 3) && (GccMinorVersion >= 1)))
# ifndef CcCmd
@@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
# endif
# endif
# if defined (Ppc64Architecture)
-@@ -624,8 +624,8 @@
+@@ -624,8 +624,8 @@ InstallNamedTargetNoClobber(install,file
# endif
# endif
# ifndef CcCmd
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
# endif
# ifndef AsCmd
# define AsCmd CcCmd -c -x assembler
-@@ -779,7 +779,6 @@
+@@ -779,7 +779,6 @@ InstallNamedTargetNoClobber(install,file
#define YaccCmd bison -y
#define LexCmd flex -l
#define HasFlex YES
@@ -34,7 +34,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
#define PreProcessCmd CcCmd -E
#define PostIncDir DefaultGccIncludeDir
#define LdCombineFlags -r
-@@ -853,7 +852,7 @@
+@@ -853,7 +852,7 @@ InstallNamedTargetNoClobber(install,file
#ifdef i386Architecture
# ifndef OptimizedCDebugFlags
@@ -43,7 +43,16 @@ $NetBSD: patch-ac,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
# endif
# define LinuxMachineDefines -D__i386__
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-@@ -1053,9 +1052,6 @@ InstallNamedTargetNoClobber(install,file
+@@ -1042,8 +1041,6 @@ InstallNamedTargetNoClobber(install,file
+ #endif
+
+
+-#define HasGnuMake YES
+-
+ #define MakeNamedTargetSubdir(dir,flags,subname)\
+ $(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
+
+@@ -1053,9 +1050,6 @@ InstallNamedTargetNoClobber(install,file
#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
#if HaveLib64