summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjperkin <jperkin>2013-08-15 08:15:04 +0000
committerjperkin <jperkin>2013-08-15 08:15:04 +0000
commit8e73125529be315f4b841fc8d8e072f651302c3d (patch)
tree7ac744898fe958bba812f0998784f2b686c87e02 /x11
parentb6ab8862dc953296961b397d9e641ae11b083e28 (diff)
downloadpkgsrc-8e73125529be315f4b841fc8d8e072f651302c3d.tar.gz
Use pkgsrc INSTALL in more places, not all SunOS 5.11 systems
have /usr/gnu tools. Bump PKGREVISION.
Diffstat (limited to 'x11')
-rw-r--r--x11/xorg-cf-files/Makefile3
-rw-r--r--x11/xorg-cf-files/distinfo4
-rw-r--r--x11/xorg-cf-files/patches/patch-af9
3 files changed, 10 insertions, 6 deletions
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 77ef9c7f253..d1b33743bdc 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2013/07/23 06:50:39 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2013/08/15 08:15:04 jperkin Exp $
DISTNAME= xorg-cf-files-1.0.5
+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 80fde1f28e0..d304e84b5c3 100644
--- a/x11/xorg-cf-files/distinfo
+++ b/x11/xorg-cf-files/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2013/07/23 06:50:39 wiz Exp $
+$NetBSD: distinfo,v 1.20 2013/08/15 08:15:04 jperkin Exp $
SHA1 (xorg-cf-files-1.0.5.tar.bz2) = ae22eb81d56d018f0b3b149f70965ebfef2385fd
RMD160 (xorg-cf-files-1.0.5.tar.bz2) = c389c5c1642a7a3b3bc9603c2cb0217a028f905e
@@ -11,7 +11,7 @@ SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d
SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8
SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
SHA1 (patch-ae) = b1c870feb6372b8443aac498c24dfa802a536ba2
-SHA1 (patch-af) = 17705b0951630d241cbdd6f6329f50d6d345b3fc
+SHA1 (patch-af) = 554586a02da2bd6d16658c82152d4f9ab21be448
SHA1 (patch-ag) = 7f2e6061670cb98d6498cc4e156a8e909881635e
SHA1 (patch-ah) = 9b64b2e5f419ab190d47dd8156b8f84634fd6a36
SHA1 (patch-ai) = 455b398bba0d06ded08ed99f1e0e85cc4ff20449
diff --git a/x11/xorg-cf-files/patches/patch-af b/x11/xorg-cf-files/patches/patch-af
index 42832fd3ec2..ef7df30283e 100644
--- a/x11/xorg-cf-files/patches/patch-af
+++ b/x11/xorg-cf-files/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2013/07/23 06:50:39 wiz Exp $
+$NetBSD: patch-af,v 1.6 2013/08/15 08:15:04 jperkin Exp $
Run-time path fix for Solaris for the X client libraries. Without this
patch, libraries such as libXext.so will not contain a run-time link path
@@ -11,9 +11,12 @@ Use pkgsrc CC, CXX, CFLAGS and INSTALL.
--- sun.cf.orig 2013-07-23 05:23:14.000000000 +0000
+++ sun.cf
-@@ -432,7 +432,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
+@@ -430,9 +430,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
+ # endif
+ # endif
# if OSMinorVersion > 10
- # define InstallCmd /usr/gnu/bin/install
+-# define InstallCmd /usr/gnu/bin/install
++# define InstallCmd @@INSTALL@@
# elif OSMinorVersion > 3
-# define InstallCmd /usr/ucb/install
+# define InstallCmd @@INSTALL@@