Thu Aug 15 08:15:04 2013 UTC ()
Use pkgsrc INSTALL in more places, not all SunOS 5.11 systems
have /usr/gnu tools.

Bump PKGREVISION.


(jperkin)
diff -r1.25 -r1.26 pkgsrc/x11/xorg-cf-files/Makefile
diff -r1.19 -r1.20 pkgsrc/x11/xorg-cf-files/distinfo
diff -r1.5 -r1.6 pkgsrc/x11/xorg-cf-files/patches/patch-af
cvs diff -r1.25 -r1.26 pkgsrc/x11/xorg-cf-files/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/Makefile 2013/07/23 06:50:39 1.25
+++ pkgsrc/x11/xorg-cf-files/Makefile 2013/08/15 08:15:04 1.26
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.25 2013/07/23 06:50:39 wiz Exp $ 1# $NetBSD: Makefile,v 1.26 2013/08/15 08:15:04 jperkin Exp $
2 2
3DISTNAME= xorg-cf-files-1.0.5 3DISTNAME= xorg-cf-files-1.0.5
 4PKGREVISION= 1
4CATEGORIES= x11 devel 5CATEGORIES= x11 devel
5MASTER_SITES= ${MASTER_SITE_XORG:=util/} 6MASTER_SITES= ${MASTER_SITE_XORG:=util/}
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
10COMMENT= Xorg imake rules 11COMMENT= Xorg imake rules
11 12
12GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
13USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
14 15
15.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
16 17
cvs diff -r1.19 -r1.20 pkgsrc/x11/xorg-cf-files/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/distinfo 2013/07/23 06:50:39 1.19
+++ pkgsrc/x11/xorg-cf-files/distinfo 2013/08/15 08:15:04 1.20
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.19 2013/07/23 06:50:39 wiz Exp $ 1$NetBSD: distinfo,v 1.20 2013/08/15 08:15:04 jperkin Exp $
2 2
3SHA1 (xorg-cf-files-1.0.5.tar.bz2) = ae22eb81d56d018f0b3b149f70965ebfef2385fd 3SHA1 (xorg-cf-files-1.0.5.tar.bz2) = ae22eb81d56d018f0b3b149f70965ebfef2385fd
4RMD160 (xorg-cf-files-1.0.5.tar.bz2) = c389c5c1642a7a3b3bc9603c2cb0217a028f905e 4RMD160 (xorg-cf-files-1.0.5.tar.bz2) = c389c5c1642a7a3b3bc9603c2cb0217a028f905e
5Size (xorg-cf-files-1.0.5.tar.bz2) = 377835 bytes 5Size (xorg-cf-files-1.0.5.tar.bz2) = 377835 bytes
6SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927 6SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927
7SHA1 (patch-X11.rules) = 2dac9bcc111f63b2dd887967ea5fab656f52f06b 7SHA1 (patch-X11.rules) = 2dac9bcc111f63b2dd887967ea5fab656f52f06b
8SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed 8SHA1 (patch-X11.tmpl) = 3f0c5b8ad7a60cd0e1e47afcddaace936b9aaeed
9SHA1 (patch-aa) = 6b776ab3c9cc04759eb2fefcd95dcd65ea5909b3 9SHA1 (patch-aa) = 6b776ab3c9cc04759eb2fefcd95dcd65ea5909b3
10SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d 10SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d
11SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8 11SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8
12SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280 12SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
13SHA1 (patch-ae) = b1c870feb6372b8443aac498c24dfa802a536ba2 13SHA1 (patch-ae) = b1c870feb6372b8443aac498c24dfa802a536ba2
14SHA1 (patch-af) = 17705b0951630d241cbdd6f6329f50d6d345b3fc 14SHA1 (patch-af) = 554586a02da2bd6d16658c82152d4f9ab21be448
15SHA1 (patch-ag) = 7f2e6061670cb98d6498cc4e156a8e909881635e 15SHA1 (patch-ag) = 7f2e6061670cb98d6498cc4e156a8e909881635e
16SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36 16SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
17SHA1 (patch-ai) = 455b398bba0d06ded08ed99f1e0e85cc4ff20449 17SHA1 (patch-ai) = 455b398bba0d06ded08ed99f1e0e85cc4ff20449
18SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501 18SHA1 (patch-aj) = 3be677041b6bff008caa1375d1e6dd5c90d9f501
19SHA1 (patch-ak) = dba7e9f6bd9043e438bf6f309a5dc6f424204fd9 19SHA1 (patch-ak) = dba7e9f6bd9043e438bf6f309a5dc6f424204fd9
20SHA1 (patch-gnuLib.rules) = 44a39881b4f4b6a10250f7ae4b4508af76cef71d 20SHA1 (patch-gnuLib.rules) = 44a39881b4f4b6a10250f7ae4b4508af76cef71d
21SHA1 (patch-sv4Lib.rules) = 20bd05fe6e49cabb74317ded2f4b7565dd45c49d 21SHA1 (patch-sv4Lib.rules) = 20bd05fe6e49cabb74317ded2f4b7565dd45c49d
cvs diff -r1.5 -r1.6 pkgsrc/x11/xorg-cf-files/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/patches/patch-af 2013/07/23 06:50:39 1.5
+++ pkgsrc/x11/xorg-cf-files/patches/patch-af 2013/08/15 08:15:04 1.6
@@ -1,29 +1,32 @@ @@ -1,29 +1,32 @@
1$NetBSD: patch-af,v 1.5 2013/07/23 06:50:39 wiz Exp $ 1$NetBSD: patch-af,v 1.6 2013/08/15 08:15:04 jperkin Exp $
2 2
3Run-time path fix for Solaris for the X client libraries. Without this 3Run-time path fix for Solaris for the X client libraries. Without this
4patch, libraries such as libXext.so will not contain a run-time link path 4patch, libraries such as libXext.so will not contain a run-time link path
5to /usr/pkg/xorg/lib, causing run time link failures or possibly linking 5to /usr/pkg/xorg/lib, causing run time link failures or possibly linking
6with other (non-Pkgsrc) X libraries on the system! 6with other (non-Pkgsrc) X libraries on the system!
7 7
8Disable Solaris64bitSubdir, at least until multi-arch is supported. 8Disable Solaris64bitSubdir, at least until multi-arch is supported.
9 9
10Use pkgsrc CC, CXX, CFLAGS and INSTALL. 10Use pkgsrc CC, CXX, CFLAGS and INSTALL.
11 11
12--- sun.cf.orig 2013-07-23 05:23:14.000000000 +0000 12--- sun.cf.orig 2013-07-23 05:23:14.000000000 +0000
13+++ sun.cf 13+++ sun.cf
14@@ -432,7 +432,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorV 14@@ -430,9 +430,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
 15 # endif
 16 # endif
15 # if OSMinorVersion > 10 17 # if OSMinorVersion > 10
16 # define InstallCmd /usr/gnu/bin/install 18-# define InstallCmd /usr/gnu/bin/install
 19+# define InstallCmd @@INSTALL@@
17 # elif OSMinorVersion > 3 20 # elif OSMinorVersion > 3
18-# define InstallCmd /usr/ucb/install 21-# define InstallCmd /usr/ucb/install
19+# define InstallCmd @@INSTALL@@ 22+# define InstallCmd @@INSTALL@@
20 # endif 23 # endif
21 #ifndef LargefileDefines 24 #ifndef LargefileDefines
22 # if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6) 25 # if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
23@@ -682,29 +682,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorV 26@@ -682,29 +682,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
24 # endif 27 # endif
25 # if HasGcc2 28 # if HasGcc2
26 # ifndef CcCmd 29 # ifndef CcCmd
27-# define CcCmd gcc 30-# define CcCmd gcc
28+# define CcCmd @@PKGSRC_CC@@ 31+# define CcCmd @@PKGSRC_CC@@
29+# endif 32+# endif