diff options
| author | dholland <dholland@pkgsrc.org> | 2013-07-17 06:13:22 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2013-07-17 06:13:22 +0000 |
| commit | 6feb870d55ef34cdf4ed83903e806a1d6ccbee67 (patch) | |
| tree | 73666c67a294f3ee10af46b37cbae4e7892384ec /x11 | |
| parent | 98db757306a5c5b2979b3512764b3a25c40e27ce (diff) | |
| download | pkgsrc-6feb870d55ef34cdf4ed83903e806a1d6ccbee67.tar.gz | |
Recognize "__sun" as well as "sun" as tradcpp doesn't define the
latter. Otherwise, Solaris ends up using the svr4 config and assorted
crazy things happen. Diagnosed by Joern Clausen. PKGREVISION -> 6.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xorg-cf-files/Makefile | 4 | ||||
| -rw-r--r-- | x11/xorg-cf-files/distinfo | 4 | ||||
| -rw-r--r-- | x11/xorg-cf-files/patches/patch-ag | 23 |
3 files changed, 21 insertions, 10 deletions
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile index 1e8e45f79b6..73d49a21f5e 100644 --- a/x11/xorg-cf-files/Makefile +++ b/x11/xorg-cf-files/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2013/04/06 14:58:21 rodent Exp $ +# $NetBSD: Makefile,v 1.24 2013/07/17 06:13:22 dholland Exp $ # DISTNAME= xorg-cf-files-1.0.4 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XORG:=util/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo index 25082fc72cc..2f4881520a1 100644 --- a/x11/xorg-cf-files/distinfo +++ b/x11/xorg-cf-files/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2012/07/02 18:55:02 jperkin Exp $ +$NetBSD: distinfo,v 1.18 2013/07/17 06:13:22 dholland Exp $ SHA1 (xorg-cf-files-1.0.4.tar.bz2) = c58b7252df481572ec1ccd77b9f1ab561ed89e45 RMD160 (xorg-cf-files-1.0.4.tar.bz2) = 975942e8974812aae91c45d81eb27522e5aa0a5d @@ -12,7 +12,7 @@ SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8 SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280 SHA1 (patch-ae) = b1c870feb6372b8443aac498c24dfa802a536ba2 SHA1 (patch-af) = acf4b7deb0643867fd1551e9199fd1e7c06b71bd -SHA1 (patch-ag) = 20010c3ade12a6ee07e1093c6143d9600cca3b37 +SHA1 (patch-ag) = 7f2e6061670cb98d6498cc4e156a8e909881635e SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36 SHA1 (patch-ai) = 455b398bba0d06ded08ed99f1e0e85cc4ff20449 SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501 diff --git a/x11/xorg-cf-files/patches/patch-ag b/x11/xorg-cf-files/patches/patch-ag index fc331b9c245..77afaa5bf08 100644 --- a/x11/xorg-cf-files/patches/patch-ag +++ b/x11/xorg-cf-files/patches/patch-ag @@ -1,9 +1,11 @@ -$NetBSD: patch-ag,v 1.3 2011/10/25 01:36:45 mef Exp $ +$NetBSD: patch-ag,v 1.4 2013/07/17 06:13:22 dholland Exp $ Add __ppc64__ and __arm__ ---- Imake.cf.orig 2010-09-04 08:19:43.000000000 +0900 -+++ Imake.cf 2011-10-14 19:04:02.000000000 +0900 -@@ -25,9 +25,10 @@ +Recognize __sun as well as sun + +--- Imake.cf.orig 2010-09-03 23:19:43.000000000 +0000 ++++ Imake.cf +@@ -25,9 +25,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # define MacroIncludeFile <darwin.cf> # define MacroFile darwin.cf # define DarwinArchitecture @@ -15,7 +17,7 @@ Add __ppc64__ and __arm__ # endif # ifdef __i386__ # define i386DarwinArchitecture -@@ -238,8 +239,9 @@ +@@ -238,8 +239,9 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # ifdef mc68000 # define Mc68020Architecture # endif @@ -26,7 +28,7 @@ Add __ppc64__ and __arm__ # undef __arm32__ # endif # ifdef __vax__ -@@ -250,6 +252,10 @@ +@@ -250,6 +252,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # define PpcArchitecture # undef __powerpc__ # endif @@ -37,3 +39,12 @@ Add __ppc64__ and __arm__ #endif /* NetBSD */ /* Systems based on kernel of NetBSD */ +@@ -347,7 +353,7 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v + # endif + #endif /* AMOEBA */ + +-#ifdef sun ++#if defined(sun) || defined(__sun) + # define MacroIncludeFile <sun.cf> + # define MacroFile sun.cf + # ifdef SVR4 |