pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/xorg-cf-files Remove gmakeism from Linux rules.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/721e732adb4c
branches:  trunk
changeset: 537635:721e732adb4c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Jan 12 21:19:34 2008 +0000

description:
Remove gmakeism from Linux rules.

diffstat:

 x11/xorg-cf-files/Makefile         |   4 ++--
 x11/xorg-cf-files/distinfo         |   4 ++--
 x11/xorg-cf-files/patches/patch-ac |  15 +++++++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diffs (60 lines):

diff -r b6ae00435e40 -r 721e732adb4c x11/xorg-cf-files/Makefile
--- a/x11/xorg-cf-files/Makefile        Sat Jan 12 20:39:22 2008 +0000
+++ b/x11/xorg-cf-files/Makefile        Sat Jan 12 21:19:34 2008 +0000
@@ -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 -r b6ae00435e40 -r 721e732adb4c x11/xorg-cf-files/distinfo
--- a/x11/xorg-cf-files/distinfo        Sat Jan 12 20:39:22 2008 +0000
+++ b/x11/xorg-cf-files/distinfo        Sat Jan 12 21:19:34 2008 +0000
@@ -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 -r b6ae00435e40 -r 721e732adb4c x11/xorg-cf-files/patches/patch-ac
--- a/x11/xorg-cf-files/patches/patch-ac        Sat Jan 12 20:39:22 2008 +0000
+++ b/x11/xorg-cf-files/patches/patch-ac        Sat Jan 12 21:19:34 2008 +0000
@@ -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 @@
  #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



Home | Main Index | Thread Index | Old Index