Mon Jul 2 15:55:04 2012 UTC ()
A number of Solaris/SmartOS fixes:

 - Use ${INSTALL}
 - Disable Solaris64bitSubdir
 - Find compiler tools on SmartOS

Bump PKGREVISION.


(jperkin)
diff -r1.20 -r1.21 pkgsrc/x11/xorg-cf-files/Makefile
diff -r1.15 -r1.16 pkgsrc/x11/xorg-cf-files/distinfo
diff -r1.3 -r1.4 pkgsrc/x11/xorg-cf-files/patches/patch-af
cvs diff -r1.20 -r1.21 pkgsrc/x11/xorg-cf-files/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/Makefile 2012/04/30 07:26:08 1.20
+++ pkgsrc/x11/xorg-cf-files/Makefile 2012/07/02 15:55:03 1.21
@@ -1,47 +1,62 @@ @@ -1,47 +1,62 @@
1# $NetBSD: Makefile,v 1.20 2012/04/30 07:26:08 sbd Exp $ 1# $NetBSD: Makefile,v 1.21 2012/07/02 15:55:03 jperkin Exp $
2# 2#
3 3
4DISTNAME= xorg-cf-files-1.0.4 4DISTNAME= xorg-cf-files-1.0.4
5PKGREVISION= 4 5PKGREVISION= 5
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
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20 20
21DARWIN_USE_QUARTZ?= 1 21DARWIN_USE_QUARTZ?= 1
22 22
 23# SmartOS puts compiler tools in /usr/bin and does not come with lex/yacc.
 24.if ${OS_VARIANT} == "SmartOS"
 25DEPENDS+= byacc-[0-9]*:../../devel/byacc
 26DEPENDS+= flex-[0-9]*:../../devel/flex
 27SUBST_CLASSES+= fixpaths
 28SUBST_STAGE.fixpaths= post-patch
 29SUBST_MESSAGE.fixpaths= Fixing compiler tool paths
 30SUBST_FILES.fixpaths= svr4.cf
 31SUBST_SED.fixpaths+= -e 's,/usr/ccs/bin/ar,/usr/bin/ar,g'
 32SUBST_SED.fixpaths+= -e 's,/usr/ccs/bin/ld,/usr/bin/ld,g'
 33SUBST_SED.fixpaths+= -e 's,/usr/ccs/bin/lex,${PREFIX}/bin/flex,g'
 34SUBST_SED.fixpaths+= -e 's,/usr/ccs/bin/yacc,${PREFIX}/bin/yacc,g'
 35.endif
 36
23post-extract: 37post-extract:
24 ${CP} ${FILESDIR}/host.def ${WRKSRC} 38 ${CP} ${FILESDIR}/host.def ${WRKSRC}
25 ${CP} ${FILESDIR}/xorgsite.def ${WRKSRC} 39 ${CP} ${FILESDIR}/xorgsite.def ${WRKSRC}
26 40
27pre-configure: 41pre-configure:
28.for sys in NetBSD FreeBSD DragonFly linux darwin sun 42.for sys in NetBSD FreeBSD DragonFly linux darwin sun
29 mv ${WRKSRC}/${sys}.cf ${WRKSRC}/${sys}.cf.before && \ 43 mv ${WRKSRC}/${sys}.cf ${WRKSRC}/${sys}.cf.before && \
30 ${SED} -e "s|@@PKGSRC_CC@@|${CC}|g" \ 44 ${SED} -e "s|@@PKGSRC_CC@@|${CC}|g" \
31 -e "s|@@PKGSRC_CPP@@|${CPP}|g" \ 45 -e "s|@@PKGSRC_CPP@@|${CPP}|g" \
32 -e "s|@@PKGSRC_CXX@@|${CXX}|g" \ 46 -e "s|@@PKGSRC_CXX@@|${CXX}|g" \
33 -e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g" \ 47 -e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g" \
34 -e "s|@@DARWIN_USE_QUARTZ@@|${DARWIN_USE_QUARTZ}|g" \ 48 -e "s|@@DARWIN_USE_QUARTZ@@|${DARWIN_USE_QUARTZ}|g" \
 49 -e "s|@@INSTALL@@|${INSTALL}|g" \
35 ${WRKSRC}/${sys}.cf.before > ${WRKSRC}/${sys}.cf 50 ${WRKSRC}/${sys}.cf.before > ${WRKSRC}/${sys}.cf
36.endfor 51.endfor
37 ${SED} -e "s|@PREFIX@|${PREFIX}|g" \ 52 ${SED} -e "s|@PREFIX@|${PREFIX}|g" \
38 -e "s|@PKGMANDIR@|${PKGMANDIR}|" \ 53 -e "s|@PKGMANDIR@|${PKGMANDIR}|" \
39 -e "s|@MAKE@|${MAKE_PROGRAM}|" ${FILESDIR}/host.def > \ 54 -e "s|@MAKE@|${MAKE_PROGRAM}|" ${FILESDIR}/host.def > \
40 ${WRKSRC}/host.def 55 ${WRKSRC}/host.def
41 if [ ${X11BASE} != ${PREFIX} ]; then \ 56 if [ ${X11BASE} != ${PREFIX} ]; then \
42 echo '#define RealProjectRoot ${X11BASE}' >> ${WRKSRC}/host.def; \ 57 echo '#define RealProjectRoot ${X11BASE}' >> ${WRKSRC}/host.def; \
43 fi 58 fi
44 59
45.include "../../x11/xproto/buildlink3.mk" 60.include "../../x11/xproto/buildlink3.mk"
46 61
47.include "../../mk/bsd.pkg.mk" 62.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/x11/xorg-cf-files/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/distinfo 2012/05/04 11:38:20 1.15
+++ pkgsrc/x11/xorg-cf-files/distinfo 2012/07/02 15:55:03 1.16
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.15 2012/05/04 11:38:20 obache Exp $ 1$NetBSD: distinfo,v 1.16 2012/07/02 15:55:03 jperkin Exp $
2 2
3SHA1 (xorg-cf-files-1.0.4.tar.bz2) = c58b7252df481572ec1ccd77b9f1ab561ed89e45 3SHA1 (xorg-cf-files-1.0.4.tar.bz2) = c58b7252df481572ec1ccd77b9f1ab561ed89e45
4RMD160 (xorg-cf-files-1.0.4.tar.bz2) = 975942e8974812aae91c45d81eb27522e5aa0a5d 4RMD160 (xorg-cf-files-1.0.4.tar.bz2) = 975942e8974812aae91c45d81eb27522e5aa0a5d
5Size (xorg-cf-files-1.0.4.tar.bz2) = 367380 bytes 5Size (xorg-cf-files-1.0.4.tar.bz2) = 367380 bytes
6SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927 6SHA1 (patch-OpenBSDLib.rules) = 65b02b660839adb6e9c13287396a794a4586d927
7SHA1 (patch-X11.rules) = 13fee315aced521bef608e9341fc72526341bb1f 7SHA1 (patch-X11.rules) = 13fee315aced521bef608e9341fc72526341bb1f
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) = e48481afac82cd93e61a1f44dab84876d645ce09 14SHA1 (patch-af) = f637bbf08a42d750f6279fa02ee4abd286c169bc
15SHA1 (patch-ag) = 20010c3ade12a6ee07e1093c6143d9600cca3b37 15SHA1 (patch-ag) = 20010c3ade12a6ee07e1093c6143d9600cca3b37
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.3 -r1.4 pkgsrc/x11/xorg-cf-files/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/x11/xorg-cf-files/patches/patch-af 2012/02/15 15:25:15 1.3
+++ pkgsrc/x11/xorg-cf-files/patches/patch-af 2012/07/02 15:55:03 1.4
@@ -1,64 +1,72 @@ @@ -1,64 +1,72 @@
1$NetBSD: patch-af,v 1.3 2012/02/15 15:25:15 hans Exp $ 1$NetBSD: patch-af,v 1.4 2012/07/02 15:55:03 jperkin Exp $
2 
3Use ginstall on Solaris 11, /usr/ucb/install has been removed. 
4 2
5Run-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
6patch, 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
7to /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
8with other (non-Pkgsrc) X libraries on the system! 6with other (non-Pkgsrc) X libraries on the system!
9 7
10Use pkgsrc CC, CXX and CFLAGS. 8Disable Solaris64bitSubdir, at least until multi-arch is supported.
 9
 10Use pkgsrc CC, CXX, CFLAGS and INSTALL.
11 11
12--- sun.cf.orig 2005-12-03 18:20:48.000000000 +0100 12--- sun.cf.orig Fri Oct 16 21:45:42 2009
13+++ sun.cf 13+++ sun.cf Tue Jun 26 09:27:13 2012
14@@ -429,7 +429,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorV 14@@ -430,7 +430,7 @@
15 # define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS 
16 # endif 15 # endif
17 # endif 16 # endif
18-# if OSMinorVersion > 3 17 # if OSMinorVersion > 3
19+# if OSMinorVersion >= 11 18-# define InstallCmd /usr/ucb/install
20+# define InstallCmd /usr/bin/ginstall 19+# define InstallCmd @@INSTALL@@
21+# elif OSMinorVersion > 3  
22 # define InstallCmd /usr/ucb/install 
23 # endif 20 # endif
24 #ifndef LargefileDefines 21 #ifndef LargefileDefines
25@@ -669,29 +671,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorV 22 # if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
 23@@ -669,19 +669,19 @@
26 # endif 24 # endif
27 # if HasGcc2 25 # if HasGcc2
28 # ifndef CcCmd 26 # ifndef CcCmd
29-# define CcCmd gcc 27-# define CcCmd gcc
30+# define CcCmd @@PKGSRC_CC@@ 28+# define CcCmd @@PKGSRC_CC@@
31+# endif 29 # endif
32+# ifndef CppCmd 30+# ifndef CppCmd
33+# define CppCmd @@PKGSRC_CPP@@ 31+# define CppCmd @@PKGSRC_CPP@@
34+# endif 32+# endif
35+# ifndef CplusplusCmd 33+# ifndef CplusplusCmd
36+# define CplusplusCmd @@PKGSRC_CXX@@ 34+# define CplusplusCmd @@PKGSRC_CXX@@
37 # endif 35+# endif
38 # ifndef AsCmd 36 # ifndef AsCmd
39 # define AsCmd CcCmd -c -x assembler 37 # define AsCmd CcCmd -c -x assembler
40 # endif 38 # endif
41 # ifndef OptimizedCDebugFlags 39 # ifndef OptimizedCDebugFlags
42-# ifdef i386Architecture 40-# ifdef i386Architecture
43-# define OptimizedCDebugFlags DefaultGcc2i386Opt 41-# define OptimizedCDebugFlags DefaultGcc2i386Opt
44-# elif defined(AMD64Architecture) 42-# elif defined(AMD64Architecture)
45-# define OptimizedCDebugFlags DefaultGcc2AMD64Opt 43-# define OptimizedCDebugFlags DefaultGcc2AMD64Opt
46-# else 44-# else
47-# define OptimizedCDebugFlags -O2 45-# define OptimizedCDebugFlags -O2
48-# endif 46-# endif
49+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@ 47+# define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
50 # endif 48 # endif
51 # if !defined(SharedLibraryLoadFlags) && !defined(SharedLibraryLdCmd) 49 # if !defined(SharedLibraryLoadFlags) && !defined(SharedLibraryLdCmd)
52 # if OSMajorVersion == 5 && OSMinorVersion > 6 && defined(i386Architecture) 50 # if OSMajorVersion == 5 && OSMinorVersion > 6 && defined(i386Architecture)
 51@@ -688,10 +688,10 @@
53 /* This is to work around what appears to be a PIC bug in some gcc/egcs 52 /* This is to work around what appears to be a PIC bug in some gcc/egcs
54 versions that shows up with the Solaris 7/x86 <ctype.h>. */ 53 versions that shows up with the Solaris 7/x86 <ctype.h>. */
55 # define SharedLibraryLdCmd $(LD) 54 # define SharedLibraryLdCmd $(LD)
56-# define SharedLibraryLoadFlags -G -z textwarn 55-# define SharedLibraryLoadFlags -G -z textwarn
57+# define SharedLibraryLoadFlags -G -z textwarn LibraryRpathLoadFlags 56+# define SharedLibraryLoadFlags -G -z textwarn LibraryRpathLoadFlags
58 # else 57 # else
59 # define SharedLibraryLdCmd $(CC) 58 # define SharedLibraryLdCmd $(CC)
60-# define SharedLibraryLoadFlags -shared -z text 59-# define SharedLibraryLoadFlags -shared -z text
61+# define SharedLibraryLoadFlags -shared -z text LibraryRpathLoadFlags 60+# define SharedLibraryLoadFlags -shared -z text LibraryRpathLoadFlags
62 # endif 61 # endif
63 # endif 62 # endif
64 # else 63 # else
 64@@ -840,7 +840,7 @@
 65 # endif
 66 #endif
 67
 68-#ifdef Solaris64bitSubdir
 69+#ifdef NotYetSolaris64bitSubdir
 70 # define LibDirName Concat3(lib,/,Solaris64bitSubdir)
 71 #endif
 72