A number of Solaris/SmartOS fixes:

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

Bump PKGREVISION.

3 files changed, 43 insertions, 20 deletions

diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 95ccc39673c..bb7525c4349 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2012/04/30 07:26:08 sbd Exp $
+# $NetBSD: Makefile,v 1.21 2012/07/02 15:55:03 jperkin Exp $
 #
 
 DISTNAME=		xorg-cf-files-1.0.4
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=		.tar.bz2
@@ -20,6 +20,20 @@ USE_TOOLS+=		pkg-config
 
 DARWIN_USE_QUARTZ?=	1
 
+# SmartOS puts compiler tools in /usr/bin and does not come with lex/yacc.
+.if ${OS_VARIANT} == "SmartOS"
+DEPENDS+=		byacc-[0-9]*:../../devel/byacc
+DEPENDS+=		flex-[0-9]*:../../devel/flex
+SUBST_CLASSES+=		fixpaths
+SUBST_STAGE.fixpaths=	post-patch
+SUBST_MESSAGE.fixpaths=	Fixing compiler tool paths
+SUBST_FILES.fixpaths=	svr4.cf
+SUBST_SED.fixpaths+=	-e 's,/usr/ccs/bin/ar,/usr/bin/ar,g'
+SUBST_SED.fixpaths+=	-e 's,/usr/ccs/bin/ld,/usr/bin/ld,g'
+SUBST_SED.fixpaths+=	-e 's,/usr/ccs/bin/lex,${PREFIX}/bin/flex,g'
+SUBST_SED.fixpaths+=	-e 's,/usr/ccs/bin/yacc,${PREFIX}/bin/yacc,g'
+.endif
+
 post-extract:
 	${CP} ${FILESDIR}/host.def ${WRKSRC}
 	${CP} ${FILESDIR}/xorgsite.def ${WRKSRC}
@@ -32,6 +46,7 @@ pre-configure:
 		-e "s|@@PKGSRC_CXX@@|${CXX}|g"		\
 		-e "s|@@PKGSRC_CFLAGS@@|${CFLAGS}|g"	\
 		-e "s|@@DARWIN_USE_QUARTZ@@|${DARWIN_USE_QUARTZ}|g"	\
+		-e "s|@@INSTALL@@|${INSTALL}|g"	\
 		${WRKSRC}/${sys}.cf.before > ${WRKSRC}/${sys}.cf
 .endfor
 	${SED} -e "s|@PREFIX@|${PREFIX}|g"		\
diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
index e5779d63145..18e1da82350 100644
--- a/x11/xorg-cf-files/distinfo
+++ b/x11/xorg-cf-files/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2012/05/04 11:38:20 obache Exp $
+$NetBSD: distinfo,v 1.16 2012/07/02 15:55:03 jperkin Exp $
 
 SHA1 (xorg-cf-files-1.0.4.tar.bz2) = c58b7252df481572ec1ccd77b9f1ab561ed89e45
 RMD160 (xorg-cf-files-1.0.4.tar.bz2) = 975942e8974812aae91c45d81eb27522e5aa0a5d
@@ -11,7 +11,7 @@ SHA1 (patch-ab) = f8f816409eb233ae4d8430bd9d43b9bf83c5711d
 SHA1 (patch-ac) = 1f977650d9e903a4ea72afc8541b7649cb989ab8
 SHA1 (patch-ad) = 12c918ad85fa44518525d2c4bc628b342b8c0280
 SHA1 (patch-ae) = b1c870feb6372b8443aac498c24dfa802a536ba2
-SHA1 (patch-af) = e48481afac82cd93e61a1f44dab84876d645ce09
+SHA1 (patch-af) = f637bbf08a42d750f6279fa02ee4abd286c169bc
 SHA1 (patch-ag) = 20010c3ade12a6ee07e1093c6143d9600cca3b37
 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 8471b3dc7fd..8aea2abace8 100644
--- a/x11/xorg-cf-files/patches/patch-af
+++ b/x11/xorg-cf-files/patches/patch-af
@@ -1,40 +1,38 @@
-$NetBSD: patch-af,v 1.3 2012/02/15 15:25:15 hans Exp $
-
-Use ginstall on Solaris 11, /usr/ucb/install has been removed.
+$NetBSD: patch-af,v 1.4 2012/07/02 15:55:03 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
 to /usr/pkg/xorg/lib, causing run time link failures or possibly linking
 with other (non-Pkgsrc) X libraries on the system!
 
-Use pkgsrc CC, CXX and CFLAGS.
+Disable Solaris64bitSubdir, at least until multi-arch is supported.
+
+Use pkgsrc CC, CXX, CFLAGS and INSTALL.
 
---- 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
+--- sun.cf.orig	Fri Oct 16 21:45:42 2009
++++ sun.cf	Tue Jun 26 09:27:13 2012
+@@ -430,7 +430,7 @@
  #  endif
  # endif
--# if OSMinorVersion > 3
-+# if OSMinorVersion >= 11
-+#  define InstallCmd	    /usr/bin/ginstall
-+# elif OSMinorVersion > 3 
- #  define InstallCmd	    /usr/ucb/install
+ # if OSMinorVersion > 3
+-#  define InstallCmd	    /usr/ucb/install
++#  define InstallCmd	    @@INSTALL@@
  # endif
  #ifndef LargefileDefines
-@@ -669,29 +671,29 @@ XCOMM SunPro C++ CplusplusCompilerMajorV
+ # if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
+@@ -669,19 +669,19 @@
  # endif
  # if HasGcc2
  #  ifndef CcCmd
 -#   define CcCmd gcc
 +#   define CcCmd @@PKGSRC_CC@@
-+#  endif
+ #  endif
 +#  ifndef CppCmd
 +#   define CppCmd @@PKGSRC_CPP@@
 +#  endif
 +#  ifndef CplusplusCmd
 +#   define CplusplusCmd @@PKGSRC_CXX@@
- #  endif
++#  endif
  #  ifndef AsCmd
  #   define AsCmd CcCmd -c -x assembler
  #  endif
@@ -50,6 +48,7 @@ Use pkgsrc CC, CXX and CFLAGS.
  #  endif
  #  if !defined(SharedLibraryLoadFlags) && !defined(SharedLibraryLdCmd)
  #   if OSMajorVersion == 5 && OSMinorVersion > 6 && defined(i386Architecture)
+@@ -688,10 +688,10 @@
      /* 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)
@@ -62,3 +61,12 @@ Use pkgsrc CC, CXX and CFLAGS.
  #   endif
  #  endif
  # else
+@@ -840,7 +840,7 @@
+ # endif
+ #endif
+ 
+-#ifdef Solaris64bitSubdir
++#ifdef NotYetSolaris64bitSubdir
+ # define LibDirName Concat3(lib,/,Solaris64bitSubdir)
+ #endif
+