diff options
| author | joerg <joerg> | 2009-02-25 14:20:50 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-02-25 14:20:50 +0000 |
| commit | e3313982448e0554a4109b2e84fcda2b47d5be77 (patch) | |
| tree | 9311e52425d09639c346c143b8858b0a2c915935 /x11 | |
| parent | ffa1f3e9928d5e2b18566013ad6484e373563ac2 (diff) | |
| download | pkgsrc-e3313982448e0554a4109b2e84fcda2b47d5be77.tar.gz | |
Newer Solaris doesn't have /usr/ucb/install, so use ginstall instead.
From PR 39867.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xorg-cf-files/Makefile | 4 | ||||
| -rw-r--r-- | x11/xorg-cf-files/patches/patch-af | 21 |
2 files changed, 19 insertions, 6 deletions
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile index 0d5205af002..06de6533fe9 100644 --- a/x11/xorg-cf-files/Makefile +++ b/x11/xorg-cf-files/Makefile @@ -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 --git a/x11/xorg-cf-files/patches/patch-af b/x11/xorg-cf-files/patches/patch-af index ed9a81efb8b..140b39e13dc 100644 --- a/x11/xorg-cf-files/patches/patch-af +++ b/x11/xorg-cf-files/patches/patch-af @@ -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) |