[pkgsrc/trunk]: pkgsrc/x11/xorg-cf-files Newer Solaris doesn't have /usr/ucb/...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d5bd799fe0ac
branches:  trunk
changeset: 555148:d5bd799fe0ac
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Feb 25 14:20:50 2009 +0000

description:
Newer Solaris doesn't have /usr/ucb/install, so use ginstall instead.
>From PR 39867.

diffstat:

 x11/xorg-cf-files/Makefile         |   4 ++--
 x11/xorg-cf-files/patches/patch-af |  21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r e4b27d923bda -r d5bd799fe0ac x11/xorg-cf-files/Makefile
--- a/x11/xorg-cf-files/Makefile        Wed Feb 25 14:13:21 2009 +0000
+++ b/x11/xorg-cf-files/Makefile        Wed Feb 25 14:20:50 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2009/02/07 21:30:34 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2009/02/25 14:20:50 joerg Exp $
 #
 
 DISTNAME=              xorg-cf-files-1.0.2
-PKGREVISION=           7
+PKGREVISION=           8
 CATEGORIES=            x11 devel
 MASTER_SITES=          ${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=          .tar.bz2
diff -r e4b27d923bda -r d5bd799fe0ac x11/xorg-cf-files/patches/patch-af
--- a/x11/xorg-cf-files/patches/patch-af        Wed Feb 25 14:13:21 2009 +0000
+++ b/x11/xorg-cf-files/patches/patch-af        Wed Feb 25 14:20:50 2009 +0000
@@ -1,13 +1,26 @@
-$NetBSD: patch-af,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $
+$NetBSD: patch-af,v 1.2 2009/02/25 14:20:50 joerg Exp $
+
+Use ginstall on Solaris 11, /usr/ucb/install has been removed.
 
 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
 to /usr/pkg/xorg/lib, causing run time link failures or possibly linking
 with other (non-Pkgsrc) X libraries on the system!
 
---- sun.cf.orig        2005-12-04 06:20:48.000000000 +1300
-+++ sun.cf     2006-10-26 13:11:56.535497000 +1300
-@@ -688,10 +688,10 @@
+--- sun.cf.orig        2005-12-03 18:20:48.000000000 +0100
++++ sun.cf
+@@ -429,7 +429,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
+ #   define XawI18nDefines    -DHAS_WCHAR_H -DHAS_ISW_FUNCS
+ #  endif
+ # endif
+-# if OSMinorVersion > 3
++# if OSMinorVersion >= 11
++#  define InstallCmd      /usr/bin/ginstall
++# elif OSMinorVersion > 3 
+ #  define InstallCmd      /usr/ucb/install
+ # endif
+ #ifndef LargefileDefines
+@@ -688,10 +690,10 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
      /* This is to work around what appears to be a PIC bug in some gcc/egcs
         versions that shows up with the Solaris 7/x86 <ctype.h>. */
  #    define SharedLibraryLdCmd $(LD)