Wed Feb 25 14:20:50 2009 UTC ()
Newer Solaris doesn't have /usr/ucb/install, so use ginstall instead.
>From PR 39867.


(joerg)
diff -r1.10 -r1.11 pkgsrc/x11/xorg-cf-files/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/x11/xorg-cf-files/patches/patch-af
cvs diff -r1.10 -r1.11 pkgsrc/x11/xorg-cf-files/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/Makefile 2009/02/07 21:30:34 1.10
+++ pkgsrc/x11/xorg-cf-files/Makefile 2009/02/25 14:20:50 1.11
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.10 2009/02/07 21:30:34 joerg Exp $ 1# $NetBSD: Makefile,v 1.11 2009/02/25 14:20:50 joerg Exp $
2# 2#
3 3
4DISTNAME= xorg-cf-files-1.0.2 4DISTNAME= xorg-cf-files-1.0.2
5PKGREVISION= 7 5PKGREVISION= 8
6CATEGORIES= x11 devel 6CATEGORIES= x11 devel
7MASTER_SITES= ${MASTER_SITE_XORG:=util/} 7MASTER_SITES= ${MASTER_SITE_XORG:=util/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= joerg@NetBSD.org 10MAINTAINER= joerg@NetBSD.org
11HOMEPAGE= http://xorg.freedesktop.org/ 11HOMEPAGE= http://xorg.freedesktop.org/
12COMMENT= Xorg imake rules 12COMMENT= Xorg imake rules
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
18 18
cvs diff -r1.1.1.1 -r1.2 pkgsrc/x11/xorg-cf-files/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/patches/patch-af 2006/12/19 22:54:51 1.1.1.1
+++ pkgsrc/x11/xorg-cf-files/patches/patch-af 2009/02/25 14:20:50 1.2
@@ -1,22 +1,35 @@ @@ -1,22 +1,35 @@
1$NetBSD: patch-af,v 1.1.1.1 2006/12/19 22:54:51 joerg Exp $ 1$NetBSD: patch-af,v 1.2 2009/02/25 14:20:50 joerg Exp $
 2
 3Use ginstall on Solaris 11, /usr/ucb/install has been removed.
2 4
3Run-time path fix for Solaris for the X client libraries. Without this 5Run-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 6patch, 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 7to /usr/pkg/xorg/lib, causing run time link failures or possibly linking
6with other (non-Pkgsrc) X libraries on the system! 8with other (non-Pkgsrc) X libraries on the system!
7 9
8--- sun.cf.orig 2005-12-04 06:20:48.000000000 +1300 10--- sun.cf.orig 2005-12-03 18:20:48.000000000 +0100
9+++ sun.cf 2006-10-26 13:11:56.535497000 +1300 11+++ sun.cf
10@@ -688,10 +688,10 @@ 12@@ -429,7 +429,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
 13 # define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
 14 # endif
 15 # endif
 16-# if OSMinorVersion > 3
 17+# if OSMinorVersion >= 11
 18+# define InstallCmd /usr/bin/ginstall
 19+# elif OSMinorVersion > 3
 20 # define InstallCmd /usr/ucb/install
 21 # endif
 22 #ifndef LargefileDefines
 23@@ -688,10 +690,10 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
11 /* This is to work around what appears to be a PIC bug in some gcc/egcs 24 /* This is to work around what appears to be a PIC bug in some gcc/egcs
12 versions that shows up with the Solaris 7/x86 <ctype.h>. */ 25 versions that shows up with the Solaris 7/x86 <ctype.h>. */
13 # define SharedLibraryLdCmd $(LD) 26 # define SharedLibraryLdCmd $(LD)
14-# define SharedLibraryLoadFlags -G -z textwarn 27-# define SharedLibraryLoadFlags -G -z textwarn
15+# define SharedLibraryLoadFlags -G -z textwarn LibraryRpathLoadFlags 28+# define SharedLibraryLoadFlags -G -z textwarn LibraryRpathLoadFlags
16 # else 29 # else
17 # define SharedLibraryLdCmd $(CC) 30 # define SharedLibraryLdCmd $(CC)
18-# define SharedLibraryLoadFlags -shared -z text 31-# define SharedLibraryLoadFlags -shared -z text
19+# define SharedLibraryLoadFlags -shared -z text LibraryRpathLoadFlags 32+# define SharedLibraryLoadFlags -shared -z text LibraryRpathLoadFlags
20 # endif 33 # endif
21 # endif 34 # endif
22 # else 35 # else