--- a/open-src/util/xorg-cf-files/Makefile Thu Aug 30 15:54:30 2012 -0700
+++ b/open-src/util/xorg-cf-files/Makefile Tue Sep 04 15:21:16 2012 -0700
@@ -1,6 +1,6 @@
###############################################################################
#
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -38,7 +38,7 @@
TARBALL_SHA1 = c58b7252df481572ec1ccd77b9f1ab561ed89e45
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES=
+SOURCE_PATCHES= usr-ucb.patch,-p1
### Include common rulesets
include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/util/xorg-cf-files/usr-ucb.patch Tue Sep 04 15:21:16 2012 -0700
@@ -0,0 +1,33 @@
+From 488dc6dfa535206cf63c1c8cfefe972bee059c6f Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Thu, 2 Aug 2012 17:55:47 -0700
+Subject: [PATCH:cf] On Solaris 11 & later, use /usr/gnu/bin/install for
+ InstallCmd
+
+Older Solaris releases use /usr/ucb/install from the SunOS 4 compatibility
+packages, but the EOL of that package has been announced now that it has
+been 20 years since the SunOS 4.x -> Solaris 2.x transition.
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ sun.cf | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/sun.cf b/sun.cf
+index 516a586..3f93d03 100644
+--- a/sun.cf
++++ b/sun.cf
+@@ -429,7 +429,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
+ # define XawI18nDefines -DHAS_WCHAR_H -DHAS_ISW_FUNCS
+ # endif
+ # endif
+-# if OSMinorVersion > 3
++# if OSMinorVersion > 10
++# define InstallCmd /usr/gnu/bin/install
++# elif OSMinorVersion > 3
+ # define InstallCmd /usr/ucb/install
+ # endif
+ #ifndef LargefileDefines
+--
+1.7.9.2
+
--- a/pkg/manifests/developer-build-imake.p5m Thu Aug 30 15:54:30 2012 -0700
+++ b/pkg/manifests/developer-build-imake.p5m Tue Sep 04 15:21:16 2012 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -155,3 +155,6 @@
file path=usr/share/man/man1/imake.1
file path=usr/share/man/man1/mkdirhier.1
file path=usr/share/man/man1/xmkmf.1
+
+# imake now uses GNU install from coreutils package in generated Makefiles
+depend type=require fmri=pkg:/file/gnu-coreutils