--- a/open-src/lib/DPS/sun-src/libdpstk/Makefile Thu Oct 27 17:46:12 2011 -0700
+++ b/open-src/lib/DPS/sun-src/libdpstk/Makefile Fri Oct 28 14:17:15 2011 -0700
@@ -110,10 +110,15 @@
$(INSTALL) -m 0444 FontSelect.ad \
$(DESTDIR)$(datadir)/X11/app-defaults/FontSelect
-ColorSB.c: CSBwraps.h
-DPSScrollW.c: DSWwraps.h
-FontCreato.c: FSBwraps.h
-FontSample.c: FSBwraps.h
-FontSB.c: FSBwraps.h
-XDPSpreview.c: XDPSpwraps.h
-XDPSshare.c: XDPSswraps.h
+ColorSB.o: CSBwraps.h
+CSBwraps.o: CSBwraps.h
+DPSScrollW.o: DSWwraps.h
+DSWwraps.o: DSWwraps.h
+FontCreato.o: FSBwraps.h
+FontSample.o: FSBwraps.h
+FontSB.o: FSBwraps.h
+FSBWraps.o: FSBwraps.h
+XDPSpreview.o: XDPSpwraps.h
+XDPSpwraps.o: XDPSpwraps.h
+XDPSshare.o: XDPSswraps.h
+XDPSswraps.o: XDPSswraps.h
--- a/open-src/lib/libxcb/Makefile Thu Oct 27 17:46:12 2011 -0700
+++ b/open-src/lib/libxcb/Makefile Fri Oct 28 14:17:15 2011 -0700
@@ -46,8 +46,6 @@
tsol-sockets.patch,-p1 \
unix-sockets.patch,-p1 \
Makefile.am.0.patch \
- configure.1.patch \
- aclocal.m4.2.patch \
xcb_conn.c.3.patch \
Makefile.am.4.patch
--- a/open-src/lib/libxcb/aclocal.m4.2.patch Thu Oct 27 17:46:12 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- aclocal.m4 2010-08-13 04:46:51.000000000 -0700
-+++ aclocal.m4 2010-10-12 11:20:55.270006000 -0700
-@@ -8911,7 +8911,7 @@
- am_display_PYTHON=python
- ], [
- dnl A version check is needed.
-- if test -n "$PYTHON"; then
-+ if [ "x$PYTHON" = "x" ] ; then
- # If the user set $PYTHON, use it and don't search something else.
- AC_MSG_CHECKING([whether $PYTHON version >= $1])
- AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
-@@ -8929,7 +8929,7 @@
- done])
- # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
- if test "$am_cv_pathless_PYTHON" = none; then
-- PYTHON=:
-+ PYTHON=/usr/bin/python2.6
- else
- AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
- fi
--- a/open-src/lib/libxcb/configure.1.patch Thu Oct 27 17:46:12 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
---- configure 2010-08-13 04:46:52.000000000 -0700
-+++ configure 2010-10-12 11:26:34.563891000 -0700
-@@ -3024,7 +3024,7 @@
- $as_echo_n "(cached) " >&6
- else
-
-- for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
-+ for am_cv_pathless_PYTHON in python2.6 none; do
- test "$am_cv_pathless_PYTHON" = none && break
- prog="import sys
- # split strings by '.' and convert to numeric. Append some zeros
-@@ -3113,9 +3113,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX="/usr"
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX="/usr"
-
-
-
-@@ -3144,8 +3144,7 @@
- else
- am_py_prefix=$prefix
- fi
-- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
-- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-+ am_cv_python_pythondir=`echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/vendor-packages"`
- case $am_cv_python_pythondir in
- $am_py_prefix*)
- am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
-@@ -3182,8 +3181,7 @@
- else
- am_py_exec_prefix=$exec_prefix
- fi
-- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
-- echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-+ am_cv_python_pyexecdir=`echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/vendor-packages"`
- case $am_cv_python_pyexecdir in
- $am_py_exec_prefix*)
- am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
--- a/pkg/exceptions-validate_pkg.p5m Thu Oct 27 17:46:12 2011 -0700
+++ b/pkg/exceptions-validate_pkg.p5m Fri Oct 28 14:17:15 2011 -0700
@@ -36,8 +36,8 @@
dir path=etc
dir path=etc/hal
dir path=etc/hal/fdi
-$(i386_ONLY)dir path=etc/hal/fdi/policy
-$(i386_ONLY)dir path=etc/hal/fdi/policy/10osvendor
+$(i386_ONLY)dir path=etc/hal/fdi/policy
+$(i386_ONLY)dir path=etc/hal/fdi/policy/10osvendor
dir path=etc/hal/fdi/preprobe
dir path=etc/hal/fdi/preprobe/10osvendor
dir path=etc/security
@@ -59,7 +59,7 @@
dir path=usr/lib
dir path=usr/lib/$(ARCH64)
dir path=usr/lib/$(ARCH64)/pkgconfig
-$(i386_ONLY)dir path=usr/lib/hal
+$(i386_ONLY)dir path=usr/lib/hal
dir path=usr/lib/help
dir path=usr/lib/help/auths
dir path=usr/lib/help/auths/locale
--- a/pkg/manifests/x11-font-utilities.p5m Thu Oct 27 17:46:12 2011 -0700
+++ b/pkg/manifests/x11-font-utilities.p5m Fri Oct 28 14:17:15 2011 -0700
@@ -24,7 +24,7 @@
set name=pkg.description \
value="Utilities for building and installing X font and font metadata files."
link path=usr/X11/bin/bdftopcf target=../../bin/bdftopcf
-link path=usr/X11/bin/mkfontdir target=../../bin/mkfontdir
+link path=usr/X11/bin/mkfontdir target=../../bin/mkfontdir
link path=usr/X11/bin/mkfontscale target=../../bin/mkfontscale
file path=usr/bin/bdftopcf
file path=usr/bin/bdftruncate
--- a/pkg/transforms/defaults Thu Oct 27 17:46:12 2011 -0700
+++ b/pkg/transforms/defaults Fri Oct 28 14:17:15 2011 -0700
@@ -57,6 +57,13 @@
# This is set to the final version number delivered as SVR4 format
<transform legacy -> default version "6.9.0.5.11.14300,REV=0.2010.06.21">
+# Ensure we don't accidentally list dependencies on gcc-4 runtime libraries
+# if they're installed on build systems, since we always build with gcc-3
+# Also works around https://defect.opensolaris.org/bz/show_bug.cgi?id=19009
+<transform file -> add pkg.depend.bypass-generate usr/gcc/4.*>
+<transform file -> add pkg.depend.bypass-generate usr/lib(.*)/libgcc_s.so.1>
+<transform file -> add pkg.depend.bypass-generate usr/lib(.*)/libstdc\\+\\+\\.so.*>
+
#
# These aren't really transforms, but are valid defaults for
# current packages, but not the renamed/obsolete ones, which is