diff options
| author | shattered <shattered> | 2012-01-15 14:01:59 +0000 |
|---|---|---|
| committer | shattered <shattered> | 2012-01-15 14:01:59 +0000 |
| commit | 701b49f4aededbc00b76def1abfe66e8417c35c1 (patch) | |
| tree | 43a9de25409150f2043ebb048409a39d433c970f /x11/xorg-cf-files | |
| parent | deefa2408f57fedd100c975b24e43efe97d71c99 (diff) | |
| download | pkgsrc-701b49f4aededbc00b76def1abfe66e8417c35c1.tar.gz | |
PR 40970: Always include <xorg.cf> for GccAliasingArgs regardless
of server support on the target plattform. Fixes "GccAliasingArgs"
leftovers in Makefiles generated by imake(1) on m68k and sh3 etc.
OK joerg@
Diffstat (limited to 'x11/xorg-cf-files')
| -rw-r--r-- | x11/xorg-cf-files/Makefile | 3 | ||||
| -rw-r--r-- | x11/xorg-cf-files/distinfo | 4 | ||||
| -rw-r--r-- | x11/xorg-cf-files/patches/patch-aa | 36 |
3 files changed, 37 insertions, 6 deletions
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile index e82a94e0cd4..ea0d9535d93 100644 --- a/x11/xorg-cf-files/Makefile +++ b/x11/xorg-cf-files/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2011/10/25 01:36:44 mef Exp $ +# $NetBSD: Makefile,v 1.17 2012/01/15 14:01:59 shattered Exp $ # DISTNAME= xorg-cf-files-1.0.4 +PKGREVISION= 1 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 47ef61c61e3..344c5efd8d0 100644 --- a/x11/xorg-cf-files/distinfo +++ b/x11/xorg-cf-files/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2011/10/25 01:36:44 mef Exp $ +$NetBSD: distinfo,v 1.11 2012/01/15 14:01:59 shattered Exp $ SHA1 (xorg-cf-files-1.0.4.tar.bz2) = c58b7252df481572ec1ccd77b9f1ab561ed89e45 RMD160 (xorg-cf-files-1.0.4.tar.bz2) = 975942e8974812aae91c45d81eb27522e5aa0a5d Size (xorg-cf-files-1.0.4.tar.bz2) = 367380 bytes -SHA1 (patch-aa) = af182a4c4a4f6675946f40eed3fd8914ea7aebd3 +SHA1 (patch-aa) = 6b776ab3c9cc04759eb2fefcd95dcd65ea5909b3 SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8 SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280 diff --git a/x11/xorg-cf-files/patches/patch-aa b/x11/xorg-cf-files/patches/patch-aa index 97e26b2b838..4382e59f445 100644 --- a/x11/xorg-cf-files/patches/patch-aa +++ b/x11/xorg-cf-files/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2010/05/21 22:09:43 schwarz Exp $ +$NetBSD: patch-aa,v 1.3 2012/01/15 14:01:59 shattered Exp $ ---- NetBSD.cf.orig 2010-05-16 12:26:19.000000000 +0200 -+++ NetBSD.cf 2010-05-16 12:27:44.000000000 +0200 +--- NetBSD.cf.orig 2009-10-16 21:45:42.000000000 +0000 ++++ NetBSD.cf @@ -126,7 +126,7 @@ # if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \ (OSMajorVersion == 2 && OSMinorVersion < 99) || \ @@ -49,3 +49,33 @@ $NetBSD: patch-aa,v 1.2 2010/05/21 22:09:43 schwarz Exp $ /* * NetBSD doesn't have gperf in default system * you may override this in host.def if you installed perl from the packages +@@ -596,10 +602,6 @@ + # define BuildXInputLib YES + #endif + +-#if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture) || defined(AMD64Architecture) +-# include <xorg.cf> +-#endif +- + /* + * Definitions for the SUN server on NetBSD/sparc + */ +@@ -629,7 +631,6 @@ + #define BuildXF86VidModeExt NO + #define BuildXF86DGA NO + #define BuildXInputExt NO +-#include <xorg.cf> + #endif + + /* +@@ -696,3 +697,10 @@ + #define HasDevRandom YES + #define RandomDeviceFile /dev/urandom + #endif ++ ++/* ++ * Always include xorg.cf for GccAliasingArgs, ++ * regardless of server support on this plattform ++ */ ++#include <xorg.cf> ++ |