Import sfw build 139
Bugs Fixed
----------
6839908 dlopen(pkcs11_kernel) and calling C_Initialize makes pkcs11 engine enter infinite loop
6937593 Upgrade LCMS to 1.19
6944247 getifaddrs in 137 breaks sfw build
--- a/usr/src/cmd/apr/apr-1.3/Makefile.sfw Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/cmd/apr/apr-1.3/Makefile.sfw Sun May 09 20:32:17 2010 -0700
@@ -20,10 +20,9 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.4 09/08/06 SMI"
+#ident "@(#)Makefile.sfw 1.5 10/04/15 SMI"
#
# This Makefile builds both 32 and 64 bit versions of APR binaries.
@@ -60,6 +59,7 @@
ENV_COMMON=\
LD_OPTIONS="-M $(MAPFILE_NOEXSTK)" \
+"ac_cv_func_getifaddrs=no" \
MAKE=$(CCSMAKE) \
DESTDIR=$(ROOT) \
INSTALL=/usr/ucb/install \
--- a/usr/src/cmd/bind/Makefile.sfw Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/cmd/bind/Makefile.sfw Sun May 09 20:32:17 2010 -0700
@@ -20,11 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#pragma ident "@(#)Makefile.sfw 1.22 09/12/14 SMI"
+#pragma ident "@(#)Makefile.sfw 1.23 10/04/15 SMI"
#
VER = $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
@@ -90,6 +89,7 @@
CONFIGURE_OPTIONS += --enable-devpoll=yes
CONFIGURE_OPTIONS += --disable-openssl-version-check
CONFIGURE_OPTIONS += --enable-fixed-rrset
+CONFIGURE_OPTIONS += --disable-getifaddrs
# Configure BIND ready for compilation.
# The openssl version check is disabled as we rely on dynamic SSL library
--- a/usr/src/cmd/cups/Makefile.sfw Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/cmd/cups/Makefile.sfw Sun May 09 20:32:17 2010 -0700
@@ -19,10 +19,10 @@
#
# CDDL HEADER END
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.11 10/02/19 SMI"
+
+#ident "@(#)Makefile.sfw 1.12 10/04/15 SMI"
#
include ../Makefile.cmd
@@ -61,6 +61,7 @@
TARGET_ENV += DSO64FLAGS="$(LDLIBS) -G"
TARGET_ENV += PATH="$(SFW_PATH)"
TARGET_ENV += MAKE="$(CCSMAKE)"
+TARGET_ENV += "ac_cv_search_getifaddrs=no"
all:= TARGET = all
install:= TARGET = install
--- a/usr/src/cmd/ntpd/Makefile.sfw Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/cmd/ntpd/Makefile.sfw Sun May 09 20:32:17 2010 -0700
@@ -20,10 +20,10 @@
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.1 09/05/17 SMI"
+
+#ident "@(#)Makefile.sfw 1.2 10/04/15 SMI"
#
include ../Makefile.cmd
@@ -46,6 +46,7 @@
CONFIGURE_OPTIONS += --without-ntpsnmpd
CONFIGURE_OPTIONS += --without-lineeditlibs
CONFIGURE_OPTIONS += --with-openssl-libdir=/lib
+CONFIGURE_OPTIONS += --disable-getifaddrs
SFW_PATH="$(SPRO_VROOT)/bin:/usr/perl5/bin:/usr/sfw/bin:$(PATH)"
--- a/usr/src/cmd/vim/runtime.patch Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/cmd/vim/runtime.patch Sun May 09 20:32:17 2010 -0700
@@ -3101,7 +3101,7 @@
+ \%f:%l:%c:\ %m,
\%f:%l:\ %m,
\\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
- \10/04/13*\\a[%*\\d]:\ Entering\ directory\ `%f',
+ \10/04/27*\\a[%*\\d]:\ Entering\ directory\ `%f',
diff -Nur runtime.patched/compiler/jikes.vim runtime/compiler/jikes.vim
--- runtime.patched/compiler/jikes.vim 2004-06-07 07:32:36.000000000 -0700
+++ runtime/compiler/jikes.vim 2009-01-28 08:23:44.000000000 -0800
--- a/usr/src/lib/curl/Makefile.sfw Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/lib/curl/Makefile.sfw Sun May 09 20:32:17 2010 -0700
@@ -19,10 +19,10 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.10 10/02/23 SMI"
+
+#ident "@(#)Makefile.sfw 1.11 10/04/15 SMI"
#
# This makefile builds both 32 and 64 bit versions of the library.
# Builds occur in separate directories.
@@ -71,6 +71,7 @@
CONFIGURE_OPTIONS += --with-gssapi=/usr --with-ca-bundle=/etc/curl/curlCA
CONFIGURE_OPTIONS += --with-zlib=/usr --with-libidn=/usr
CONFIGURE_OPTIONS += --with-pic
+CONFIGURE_OPTIONS += "curl_disallow_getifaddrs=yes"
all: real-all
--- a/usr/src/lib/lcms/METADATA Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/lib/lcms/METADATA Sun May 09 20:32:17 2010 -0700
@@ -1,15 +1,15 @@
NAME: lcms
-VERSION: 1.17
+VERSION: 1.19
DESCRIPTION: Little Color Management System (cms)
LICENSE: LCMS
PACKAGE: SUNWlcms
PROJECT_URL: http://www.littlecms.com/
-SOURCE_DOWNLOAD: http://www.littlecms.com/lcms-1.17.tar.gz
+SOURCE_DOWNLOAD: http://www.littlecms.com/lcms-1.19.tar.gz
SUPPORT: C
BUGTRAQ: solaris/utility/lcms
OSR: 7572
COMMENTS:
+=======================================================
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/lcms/Makefile.in.2.patch Sun May 09 20:32:17 2010 -0700
@@ -0,0 +1,20 @@
+--- python/Makefile.in 2009-07-17 07:35:22.000000000 -0700
++++ python/Makefile.in 2010-03-22 15:39:31.236788962 -0700
+@@ -71,7 +71,7 @@
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-CXXLD = $(CXX)
++CXXLD = $(CXX) $(CXXFLAGS) $(LDFLAGS)
+ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+@@ -126,7 +126,7 @@
+ LCMS_PYEXECDIR = @LCMS_PYEXECDIR@
+ LCMS_PYINCLUDE = @LCMS_PYINCLUDE@
+ LCMS_PYLIB = @LCMS_PYLIB@
+-LD = @LD@
++LD = $(CXX) $(CXXFLAGS) $(LDFLAGS)
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBRARY_AGE = @LIBRARY_AGE@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/lcms/Makefile.in.3.patch Sun May 09 20:32:17 2010 -0700
@@ -0,0 +1,11 @@
+--- src/Makefile.in 2009-07-17 07:35:22.000000000 -0700
++++ src/Makefile.in 2010-03-23 10:23:01.305941153 -0700
+@@ -127,7 +127,7 @@
+ LCMS_PYEXECDIR = @LCMS_PYEXECDIR@
+ LCMS_PYINCLUDE = @LCMS_PYINCLUDE@
+ LCMS_PYLIB = @LCMS_PYLIB@
+-LD = @LD@
++LD = $(CC) $(CFLAGS) $(LDFLAGS)
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBRARY_AGE = @LIBRARY_AGE@
--- a/usr/src/lib/lcms/Makefile.sfw Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/lib/lcms/Makefile.sfw Sun May 09 20:32:17 2010 -0700
@@ -19,72 +19,169 @@
# CDDL HEADER END
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.4 10/01/08 SMI"
+#ident "@(#)Makefile.sfw 1.6 10/04/26 SMI"
#
# This makefile builds both 32 and 64 bit versions of the library.
# Builds occur in separate directories.
#
-VER=lcms-1.17
+include ../Makefile.lib
+
+RELNUM=$(COMPONENT_VERSION:sh)
+RELNAME=$(COMPONENT_NAME:sh)
+VER=$(RELNAME)-$(RELNUM)
VER64=$(VER)-64
+VERPY26=$(VER)-py26
+VERPY26_64=$(VER64)-py26
LARGEFILES = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-PREFIX = /usr
DESTDIR = $(SRC)/lib/lcms/proto
+DESTDIR_26 = $(SRC)/lib/lcms/proto_26
# We need to do this because libtool adds wrong paths to RPATH.
-LDFLAGS = -L$(PREFIX)/lib -R$(PREFIX)/lib
+LDFLAGS = -z combreloc -z redlocsym -z ignore -KPIC
+EXTRA_LDFLAGS64 = -L$(CFGPREFIX)/lib/$(MACH64)
+EXTRA_LDFLAGS64 += -R$(CFGPREFIX)/lib/$(MACH64)
+RUNPATH_LDFLAGS64 = -R$(CFGPREFIX)/lib/$(MACH64)
-EXTRA_LDFLAGS64 = -L$(PREFIX)/lib/$(MACH64)
-EXTRA_LDFLAGS64 += -R$(PREFIX)/lib/$(MACH64)
+GSED = /usr/bin/gsed
+PYTHON_PATH_24 = /usr/lib/python2.4/vendor-packages
+PYTHON_PATH_24_64 = /usr/lib/python2.4/vendor-packages/64
+PYTHON_PATH_26 = /usr/lib/python2.6/vendor-packages
+PYTHON_PATH_26_64 = /usr/lib/python2.6/vendor-packages/64
+
+OPTIM_i386 = -xO3
+OPTIM_sparc= -xO4
+OPTIM = $(OPTIM_$(MACH))
CCFLAGS_GENERIC = -features=anachronisms,except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic \
-instances=global -template=geninlinefuncs -verbose=template \
- -xlang=c99 -xbuiltin=%all -xinline=%auto -xlibmil \
+ -xlang=c99 -xbuiltin=%none -xinline=%auto -xlibmil \
-xustr=ascii_utf16_ushort -xlibmopt \
-z combreloc -z redlocsym -z ignore -z rescan -z absexec \
- -xldscope=symbolic -xalias_level=compatible -KPIC \
+ -DPIC -KPIC \
-xF=%none -xthreadvar=%all -mt -D_REENTRANT -DNDEBUG \
-D__EXTENSIONS__ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
- -D_XOPEN_SOURCE=500 -D_POSIX_PTHREAD_SEMANTICS -s
+ -D_XPG5 -D_XOPEN_SOURCE=500 -D_POSIX_PTHREAD_SEMANTICS \
+ $(OPTIM) -s
+
+CFLAGS_GENERIC = -xc99=%all -features=extinl,extensions -xustr=ascii_utf16_ushort
+CFLAGS_GENERIC += -xbuiltin=%none -xinline=%auto -xlibmil
+CFLAGS_GENERIC += -z combreloc -z redlocsym -z ignore -z rescan -z absexec
+CFLAGS_GENERIC += -DPIC -KPIC -xF=%none -xthreadvar=%all
+CFLAGS_GENERIC += -mt -D_REENTRANT -DNDEBUG -D__EXTENSIONS__
+CFLAGS_GENERIC += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS_GENERIC += -D_XPG6 -D_XOPEN_SOURCE=600 -D_POSIX_PTHREAD_SEMANTICS
+CFLAGS_GENERIC += $(OPTIM) -s
-all: real-all
+CONFIGURE_OPTIONS = --localstatedir=/var
+CONFIGURE_OPTIONS += --enable-shared
+CONFIGURE_OPTIONS += --disable-static
+CONFIGURE_OPTIONS += --disable-libtool-lock
+CONFIGURE_OPTIONS += --with-jpeg
+CONFIGURE_OPTIONS += --with-tiff
+CONFIGURE_OPTIONS += --with-zlib
+CONFIGURE_OPTIONS += --with-python
+CONFIGURE_OPTIONS += --with-pic
-all32: $(VER)/config.status
- (cd $(VER); env "CFLAGS=$(CFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
+all: all32 all64 lint32 lint64
+
+all32: $(VER)/config.status $(VERPY26)/config.status
+ (cd $(VER); \
+ env - \
+ "CC=$(CC)" "CXX=$(CCC)" \
+ "CFLAGS=$(CFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
+ "CXXFLAGS=$(CCFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
+ "CPP=$(CC) $(CFLAGS) $(CPPFLAGS) -E" \
+ "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS) -E" \
+ "CXXLD=$(CCC) $(CCFLAGS) $(LDFLAGS)" \
"LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
"LDFLAGS=$(LDFLAGS)" \
- "MAKE=/usr/ccs/bin/make" /usr/ccs/bin/make -e)
+ "PYTHON=$(PYTHON24)" \
+ "PYTHONPATH=$(PYTHON_PATH_24)" \
+ "SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" $(GMAKE) -e)
+ (cd $(VERPY26); \
+ env - \
+ "CC=$(CC)" "CXX=$(CCC)" \
+ "CFLAGS=$(CFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
+ "CXXFLAGS=$(CCFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
+ "CPP=$(CC) $(CFLAGS) $(CPPFLAGS) -E" \
+ "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS) -E" \
+ "CXXLD=$(CCC) $(CCFLAGS) $(LDFLAGS)" \
+ "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
+ "LDFLAGS=$(LDFLAGS)" \
+ "PYTHON=$(PYTHON26)" \
+ "PYTHONPATH=$(PYTHON_PATH_26)" \
+ "SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" $(GMAKE) -e)
# if we do not add $($(MACH64)_XARCH), CXX will assume that it's linking
# 32-bit, and linking will fail.
-all64: $(VER64)/config.status
- (cd $(VER64); env "CFLAGS=$(CFLAGS64) $(XREGSFLAG64) $(LARGEFILES)" \
+all64: $(VER64)/config.status $(VERPY26_64)/config.status
+ (cd $(VER64); \
+ env - \
+ "CC=$(CC)" "CXX=$(CCC)" \
+ "CFLAGS=$(CFLAGS64) $(CPPFLAGS) $(XREGSFLAG64) $(LARGEFILES)" \
+ "CXXFLAGS=$(CCFLAGS64) $(CPPFLAGS) $(XREGSFLAG64) $(LARGEFILES)" \
+ "CPP=$(CC) $(CFLAGS64) $(CPPFLAGS) -E" \
+ "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS64) -E" \
+ "CXXLD=$(CCC) $(CCFLAGS64) $(LDFLAGS)" \
"LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
- "LDFLAGS=$(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
- "MAKE=/usr/ccs/bin/make" /usr/ccs/bin/make -e)
-
-include ../Makefile.lib
+ "LDFLAGS=$(LDFLAGS) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
+ "PYTHON=$(PYTHON24)" \
+ "PYTHONPATH=$(PYTHON_PATH_24_64)" \
+ "SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" $(GMAKE) -e)
+ (cd $(VERPY26_64); \
+ env - \
+ "CC=$(CC)" "CXX=$(CCC)" \
+ "CFLAGS=$(CFLAGS64) $(XREGSFLAG64) $(LARGEFILES)" \
+ "CXXFLAGS=$(CCFLAGS64) $(CPPFLAGS) $(XREGSFLAG64) $(LARGEFILES)" \
+ "CPP=$(CC) $(CFLAGS64) $(CPPFLAGS) -E" \
+ "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS64) -E" \
+ "CXXLD=$(CCC) $(CCFLAGS64) $(LDFLAGS)" \
+ "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
+ "LDFLAGS=$(LDFLAGS) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
+ "PYTHON=$(PYTHON26)" \
+ "PYTHONPATH=$(PYTHON_PATH_26_64)" \
+ "SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" $(GMAKE) -e)
CCC += -norunpath
CCC64 += -norunpath
-COMPAT_VERSION= 5
+COMPAT_VERSION=5
# override the defaults because -messages=no%anachronism and
# -features=no%conststrings cause C++ linking to fail
-sparc_CCFLAGS = -compat=$(COMPAT_VERSION) -xmemalign=8i \
+ILDOFF =
+sparc_XARCH = -xarch=sparcvis -xvis=yes -xcode=pic32
+sparcv9_XARCH= -xarch=sparcvis -xvis=yes -xcode=pic32
+i386_XARCH = -xarch=generic -xchip=pentium
+amd64_XARCH = -xarch=generic -Ui386 -U__i386
+sparc_CCFLAGS = -m32 $(sparc_XARCH) -compat=$(COMPAT_VERSION) -xmemalign=8i \
$(CCFLAGS_GENERIC)
-sparcv9_CCFLAGS = $(sparcv9_XARCH) -xmemalign=8i \
- -compat=$(COMPAT_VERSION) \
- $(CCFLAGS_GENERIC)
-i386_CCFLAGS = -compat=$(COMPAT_VERSION) $(CCFLAGS_GENERIC)
-amd64_CCFLAGS = $(amd64_XARCH) -compat=$(COMPAT_VERSION) \
- $(CCFLAGS_GENERIC)
+sparcv9_CCFLAGS = -m64 $(sparcv9_XARCH) -xmemalign=8i \
+ -compat=$(COMPAT_VERSION) $(CCFLAGS_GENERIC)
+i386_CCFLAGS = -m32 $(i386_XARCH) -compat=$(COMPAT_VERSION) $(CCFLAGS_GENERIC)
+amd64_CCFLAGS = -m64 $(amd64_XARCH) -compat=$(COMPAT_VERSION) \
+ $(CCFLAGS_GENERIC)
+
+sparc_CFLAGS = -m32 $(sparc_XARCH) -xmemalign=8i $(CFLAGS_GENERIC)
+sparcv9_CFLAGS = -m64 $(sparcv9_XARCH) -xmemalign=8i $(CFLAGS_GENERIC)
+i386_CFLAGS = -m32 $(i386_XARCH) $(CFLAGS_GENERIC)
+amd64_CFLAGS = -m64 $(amd64_XARCH) $(CFLAGS_GENERIC)
+
+sparc_COPTFLAG = $(OPTIM)
+sparcv9_COPTFLAG = $(OPTIM)
+i386_COPTFLAG = $(OPTIM)
+amd64_COPTFLAG = $(OPTIM)
+COPTFLAG = $($(MACH)_COPTFLAG)
+COPTFLAG64 = $($(MACH64)_COPTFLAG)
# lint stuff
LIBRARY=liblcms.a
@@ -98,22 +195,142 @@
install: all
mkdir -p $(DESTDIR)
- (cd $(VER); env "DESTDIR=$(DESTDIR)" \
- /usr/ccs/bin/make \
- DESTDIR=$(DESTDIR) \
- INSTALL=/usr/ucb/install \
- install)
- (cd $(VER)-64; env "DESTDIR=$(DESTDIR)" \
- /usr/ccs/bin/make \
- DESTDIR=$(DESTDIR) \
- INSTALL=/usr/ucb/install \
- install)
-
- INSTDIR=$(DESTDIR) $(SH) ./install-sfw
- INSTDIR=$(DESTDIR) MACH64=$(MACH64) $(SH) ./install-sfw-64
- rm -rf $(DESTDIR)
+ mkdir -p $(DESTDIR_26)
+ (cd $(VER); env - \
+ "CC=$(CC)" "CXX=$(CCC)" \
+ "CFLAGS=$(CFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
+ "CXXFLAGS=$(CCFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
+ "CPP=$(CC) $(CFLAGS) $(CPPFLAGS) -E" \
+ "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS) -E" \
+ "CXXLD=$(CCC) $(CCFLAGS) $(LDFLAGS)" \
+ "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
+ "LDFLAGS=$(LDFLAGS)" \
+ "PYTHON=$(PYTHON24)" \
+ "PYTHONPATH=$(PYTHON_PATH_24)" \
+ "DESTDIR=$(DESTDIR)" \
+ "SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" \
+ $(GMAKE) -e \
+ DESTDIR=$(DESTDIR) \
+ INSTALL=$(GINSTALL) \
+ install)
+ (cd $(VERPY26); env - \
+ "CC=$(CC)" "CXX=$(CCC)" \
+ "CFLAGS=$(CFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
+ "CXXFLAGS=$(CCFLAGS) $(CPPFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
+ "CPP=$(CC) $(CFLAGS) $(CPPFLAGS) -E" \
+ "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS) -E" \
+ "CXXLD=$(CCC) $(CCFLAGS) $(LDFLAGS)" \
+ "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
+ "LDFLAGS=$(LDFLAGS)" \
+ "PYTHON=$(PYTHON26)" \
+ "PYTHONPATH=$(PYTHON_PATH_26)" \
+ "SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" \
+ $(GMAKE) -e \
+ DESTDIR=$(DESTDIR_26) \
+ INSTALL=$(GINSTALL) \
+ install)
+ (cd $(VER64); \
+ MACH64=$(MACH64) $(GSED) -e "s#-L/usr/lib/${MACH64}##g" src/liblcms.la > liblcms.la.sed ; \
+ cp -fp liblcms.la.sed src/liblcms.la ; \
+ env - \
+ "CC=$(CC)" "CXX=$(CCC)" \
+ "CFLAGS=$(CFLAGS64) $(CPPFLAGS) $(XREGSFLAG64) $(LARGEFILES)" \
+ "CXXFLAGS=$(CCFLAGS64) $(CPPFLAGS) $(XREGSFLAG64) $(LARGEFILES)" \
+ "CPP=$(CC) $(CFLAGS64) $(CPPFLAGS) -E" \
+ "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS64) -E" \
+ "CXXLD=$(CCC) $(CCFLAGS64) $(LDFLAGS)" \
+ "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
+ "LDFLAGS=$(LDFLAGS) $(RUNPATH_LDFLAGS64) $($(MACH64)_XARCH)" \
+ "PYTHON=$(PYTHON24)" \
+ "PYTHONPATH=$(PYTHON_PATH_24_64)" \
+ "SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" \
+ $(GMAKE) -e \
+ DESTDIR=$(DESTDIR) \
+ INSTALL=$(GINSTALL) \
+ install)
+ (cd $(VERPY26_64); \
+ MACH64=$(MACH64) $(GSED) -e "s#-L/usr/lib/${MACH64}##g" src/liblcms.la > liblcms.la.sed ; \
+ cp -fp liblcms.la.sed src/liblcms.la ; \
+ env - \
+ "CC=$(CC)" "CXX=$(CCC)" \
+ "CFLAGS=$(CFLAGS64) $(XREGSFLAG64) $(LARGEFILES)" \
+ "CXXFLAGS=$(CCFLAGS64) $(CPPFLAGS) $(XREGSFLAG64) $(LARGEFILES)" \
+ "CPP=$(CC) $(CFLAGS64) $(CPPFLAGS) -E" \
+ "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS64) -E" \
+ "CXXLD=$(CCC) $(CCFLAGS64) $(LDFLAGS)" \
+ "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
+ "LDFLAGS=$(LDFLAGS) $(RUNPATH_LDFLAGS64) $($(MACH64)_XARCH)" \
+ "PYTHON=$(PYTHON26)" \
+ "PYTHONPATH=$(PYTHON_PATH_26_64)" \
+ "SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" \
+ $(GMAKE) -e \
+ DESTDIR=$(DESTDIR_26) \
+ INSTALL=$(GINSTALL) \
+ install)
+ INSTDIR=$(DESTDIR) INSTDIR_26=$(DESTDIR_26) VERS=$(VER) VERS_26=$(VERPY26) $(SHELL) ./install-sfw
+ INSTDIR=$(DESTDIR) INSTDIR_26=$(DESTDIR_26) VERS=$(VER64) VERS_26=$(VERPY26_64) MACH64=$(MACH64) $(SHELL) ./install-sfw-64
-real-all: all32 all64 lint32 lint64
+test32: $(VER)/config.status $(VERPY26)/config.status
+ ( cd $(VER); \
+ env "CC=$(CC)" "CFLAGS=$(CPPFLAGS) $(CFLAGS)" \
+ "CPP=$(CC) $(CFLAGS) $(CPPFLAGS) -E" \
+ "CXX=$(CCC)" "CXXFLAGS=$(CPPFLAGS) $(CCFLAGS)" \
+ "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS) -E" \
+ "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
+ "LDFLAGS=$(LDFLAGS)" \
+ "CXXLD=$(CCC) $(CCFLAGS) $(LDFLAGS)" \
+ "INSTALL=$(GINSTALL)" \
+ "PYTHON=$(PYTHON24)" \
+ "PYTHONPATH=$(PYTHON_PATH_24)" \
+ "SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" $(GMAKE) -e check )
+ ( cd $(VERPY26) ; \
+ env "CC=$(CC)" "CFLAGS=$(CPPFLAGS) $(CFLAGS)" \
+ "CPP=$(CC) $(CFLAGS) $(CPPFLAGS) -E" \
+ "CXX=$(CCC)" "CXXFLAGS=$(CPPFLAGS) $(CCFLAGS)" \
+ "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS) -E" \
+ "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
+ "LDFLAGS=$(LDFLAGS)" \
+ "CXXLD=$(CCC) $(CCFLAGS) $(LDFLAGS)" \
+ "INSTALL=$(GINSTALL)" \
+ "PYTHON=$(PYTHON26)" \
+ "PYTHONPATH=$(PYTHON_PATH_26)" \
+ "SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" $(GMAKE) -e check )
+
+test64: $(VER64)/config.status $(VERPY26_64)/config.status
+ ( cd $(VER64); \
+ env - \
+ "CC=$(CC)" "CXX=$(CCC)" \
+ "CFLAGS=$(CFLAGS64) $(CPPFLAGS) $(XREGSFLAG64) $(LARGEFILES)" \
+ "CXXFLAGS=$(CCFLAGS64) $(CPPFLAGS) $(XREGSFLAG64) $(LARGEFILES)" \
+ "CPP=$(CC) $(CFLAGS64) $(CPPFLAGS) -E" \
+ "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS64) -E" \
+ "CXXLD=$(CCC) $(CCFLAGS64) $(LDFLAGS)" \
+ "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
+ "LDFLAGS=$(LDFLAGS) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
+ "PYTHON=$(PYTHON24)" \
+ "PYTHONPATH=$(PYTHON_PATH_24_64)" \
+ "SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" $(GMAKE) -e check )
+ ( cd $(VERPY26_64); \
+ env - \
+ "CC=$(CC)" "CXX=$(CCC)" \
+ "CFLAGS=$(CFLAGS64) $(XREGSFLAG64) $(LARGEFILES)" \
+ "CXXFLAGS=$(CCFLAGS64) $(CPPFLAGS) $(XREGSFLAG64) $(LARGEFILES)" \
+ "CPP=$(CC) $(CFLAGS64) $(CPPFLAGS) -E" \
+ "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS64) -E" \
+ "CXXLD=$(CCC) $(CCFLAGS64) $(LDFLAGS)" \
+ "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
+ "LDFLAGS=$(LDFLAGS) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
+ "PYTHON=$(PYTHON26)" \
+ "PYTHONPATH=$(PYTHON_PATH_26_64)" \
+ "SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" $(GMAKE) -e check )
test: test32 test64
@@ -125,18 +342,39 @@
"CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS) -E" \
"LDFLAGS=$(LDFLAGS)" \
"CXXLD=$(CCC) $(CCFLAGS) $(LDFLAGS)" \
- "INSTALL=/usr/ucb/install" \
- PYTHON=$(PYTHON24) \
- ./configure --prefix=$(PREFIX) \
- --localstatedir=/var \
- --enable-shared \
- --disable-static \
- --disable-libtool-lock \
- --with-jpeg \
- --with-tiff \
- --with-zlib \
- --with-python \
- --with-pic)
+ "INSTALL=$(GINSTALL)" \
+ "PYTHON=$(PYTHON24)" \
+ "PYTHONPATH=$(PYTHON_PATH_24)" \
+ "SHELL=$(SHELL)" \
+ "CONFIG_SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" \
+ ./configure --prefix=$(CFGPREFIX) \
+ $(CONFIGURE_OPTIONS) )
+ (cd $(VER); \
+ gpatch -N -p0 <../libtool.1.patch ; \
+ touch -acm libtool ; \
+ chmod 0755 libtool )
+
+$(VERPY26)/config.status: $(VERPY26)/configure
+ ( cd $(VERPY26) ; \
+ env "CC=$(CC)" "CFLAGS=$(CPPFLAGS) $(CFLAGS)" \
+ "CPP=$(CC) $(CFLAGS) $(CPPFLAGS) -E" \
+ "CXX=$(CCC)" "CXXFLAGS=$(CPPFLAGS) $(CCFLAGS)" \
+ "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS) -E" \
+ "LDFLAGS=$(LDFLAGS)" \
+ "CXXLD=$(CCC) $(CCFLAGS) $(LDFLAGS)" \
+ "INSTALL=$(GINSTALL)" \
+ "PYTHON=$(PYTHON26)" \
+ "PYTHONPATH=$(PYTHON_PATH_26)" \
+ "SHELL=$(SHELL)" \
+ "CONFIG_SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" \
+ ./configure --prefix=$(CFGPREFIX) \
+ $(CONFIGURE_OPTIONS) )
+ ( cd $(VERPY26) ; \
+ gpatch -N -p0 <../libtool.1.patch ; \
+ touch -acm libtool ; \
+ chmod 0755 libtool )
$(VER64)/config.status: $(VER64)/configure
(cd $(VER64); \
@@ -144,35 +382,72 @@
"CPP=$(CC64) $(CFLAGS64) $(CPPFLAGS) -E" \
"CXX=$(CCC64)" "CXXFLAGS=$(CPPFLAGS) $(CCFLAGS64)" \
"CXXCPP=$(CCC64) $(CPPFLAGS) $(CCFLAGS64) -E" \
- "LDFLAGS=$(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
+ "LDFLAGS=$(LDFLAGS) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
"CXXLDFLAGS=$(EXTRA_LDFLAGS64) $($(MACH64)_XARCH) -norunpath" \
"CXXLD=$(CCC64) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
"CXXLINKLIB=$(CCC64) $(CCFLAGS64) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
"MACH64=$(MACH64)" \
- "INSTALL=/usr/ucb/install" \
- PYTHON=$(PYTHON24_64) \
- ./configure --prefix=$(PREFIX) \
- --bindir=$(PREFIX)/bin/$(MACH64) \
- --libdir=$(PREFIX)/lib/$(MACH64) \
- --libexecdir=$(PREFIX)/libexec/$(MACH64) \
- --localstatedir=/var \
- --enable-shared \
- --disable-static \
- --disable-libtool-lock \
- --with-jpeg \
- --with-tiff \
- --with-zlib \
- --with-python \
- --with-pic)
+ "INSTALL=$(GINSTALL)" \
+ "PYTHON=$(PYTHON24_64)" \
+ "PYTHONPATH=$(PYTHON_PATH_24_64)" \
+ "SHELL=$(SHELL)" \
+ "CONFIG_SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" \
+ ./configure --prefix=$(CFGPREFIX) \
+ --bindir=$(CFGPREFIX)/bin/$(MACH64) \
+ --libdir=$(CFGPREFIX)/lib/$(MACH64) \
+ --libexecdir=$(CFGPREFIX)/libexec/$(MACH64) \
+ $(CONFIGURE_OPTIONS) )
+ (cd $(VER64); \
+ gpatch -N -p0 <../libtool.1.patch ; \
+ touch -acm libtool ; \
+ chmod 0755 libtool )
+
+$(VERPY26_64)/config.status: $(VERPY26_64)/configure
+ (cd $(VERPY26_64); \
+ env "CC=$(CC64)" "CFLAGS=$(CPPFLAGS) $(CFLAGS64)" \
+ "CPP=$(CC64) $(CFLAGS64) $(CPPFLAGS) -E" \
+ "CXX=$(CCC64)" "CXXFLAGS=$(CPPFLAGS) $(CCFLAGS64)" \
+ "CXXCPP=$(CCC64) $(CPPFLAGS) $(CCFLAGS64) -E" \
+ "LDFLAGS=$(LDFLAGS) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
+ "CXXLDFLAGS=$(EXTRA_LDFLAGS64) $($(MACH64)_XARCH) -norunpath" \
+ "CXXLD=$(CCC64) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
+ "CXXLINKLIB=$(CCC64) $(CCFLAGS64) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
+ "MACH64=$(MACH64)" \
+ "INSTALL=$(GINSTALL)" \
+ "PYTHON=$(PYTHON26_64)" \
+ "PYTHONPATH=$(PYTHON_PATH_26_64)" \
+ "SHELL=$(SHELL)" \
+ "CONFIG_SHELL=$(SHELL)" \
+ "MAKE=$(GMAKE)" \
+ ./configure --prefix=$(CFGPREFIX) \
+ --bindir=$(CFGPREFIX)/bin/$(MACH64) \
+ --libdir=$(CFGPREFIX)/lib/$(MACH64) \
+ --libexecdir=$(CFGPREFIX)/libexec/$(MACH64) \
+ $(CONFIGURE_OPTIONS) )
+ (cd $(VERPY26_64); \
+ gpatch -N -p0 <../libtool.1.patch ; \
+ touch -acm libtool ; \
+ chmod 0755 libtool )
$(VER)/configure: $(VER).tar.gz
mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
mv tmp/$(VER) $(VER); rmdir tmp
touch $(VER)/configure
(cd $(VER); \
- gpatch -p0 <../configure.patch ; \
- gpatch -p0 <../python.Makefile.in.patch ; \
- gpatch -p0 <../install-sh.patch ; \
+ gpatch -N -p0 <../configure.0-32.patch ; \
+ gpatch -N -p0 <../Makefile.in.2.patch ; \
+ gpatch -N -p0 <../Makefile.in.3.patch ; \
+ cd ..)
+
+$(VERPY26)/configure: $(VER).tar.gz
+ mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
+ mv tmp/$(VER) $(VERPY26); rmdir tmp
+ touch $(VERPY26)/configure
+ (cd $(VERPY26); \
+ gpatch -N -p0 <../configure.0-32.patch ; \
+ gpatch -N -p0 <../Makefile.in.2.patch ; \
+ gpatch -N -p0 <../Makefile.in.3.patch ; \
cd ..)
$(VER64)/configure: $(VER).tar.gz
@@ -180,15 +455,23 @@
mv tmp/$(VER) $(VER64); rmdir tmp
touch $(VER64)/configure
(cd $(VER64); \
- gpatch -p0 <../configure.patch ; \
- gpatch -p0 <../python.Makefile.in.patch ; \
- gpatch -p0 <../install-sh.patch ; \
- gpatch -p0 <../lcms.python-64.patch ; \
+ gpatch -N -p0 <../configure.0-64.patch ; \
+ gpatch -N -p0 <../Makefile.in.2.patch ; \
+ gpatch -N -p0 <../Makefile.in.3.patch ; \
+ cd ..)
+
+$(VERPY26_64)/configure: $(VER).tar.gz
+ mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
+ mv tmp/$(VER) $(VERPY26_64); rmdir tmp
+ touch $(VERPY26_64)/configure
+ (cd $(VERPY26_64); \
+ gpatch -N -p0 <../configure.0-64.patch ; \
+ gpatch -N -p0 <../Makefile.in.2.patch ; \
+ gpatch -N -p0 <../Makefile.in.3.patch ; \
cd ..)
clean:
- -rm -rf $(VER)
- -rm -rf $(VER64)
+ -rm -rf $(VER) $(VER64) $(VERPY26) $(VERPY26_64) $(DESTDIR) $(DESTDIR_26)
lint32: $(VER)/config.status
(cd $(VER); \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/lcms/configure.0-32.patch Sun May 09 20:32:17 2010 -0700
@@ -0,0 +1,67 @@
+--- configure 2009-10-30 08:57:45.000000000 -0700
++++ configure 2010-04-15 08:59:26.926442400 -0700
+@@ -5246,13 +5246,8 @@
+
+
+ # Configure python. AM_PATH_PYTHON is basically braindead
+-PYTHON=''
+ if test "$with_python" = 'yes'
+ then
+-
+-
+-
+-
+ if test -n "$PYTHON"; then
+ # If the user set $PYTHON, use it and don't search something else.
+ { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5
+@@ -5400,8 +5395,7 @@
+ if test "${am_cv_python_pythondir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_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"`
+ fi
+ { echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+ echo "${ECHO_T}$am_cv_python_pythondir" >&6; }
+@@ -5417,8 +5411,7 @@
+ if test "${am_cv_python_pyexecdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_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"`
+ fi
+ { echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
+@@ -5436,7 +5429,8 @@
+ if test -n "$PYTHON"
+ then
+ LCMS_PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
+- LCMS_PYEXECDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1)"`
++ LCMS_PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"`
++ LCMS_PYEXECDIR=`echo "$LCMS_PYTHON_PREFIX/lib/python$LCMS_PYTHON_VERSION/vendor-packages"`
+ LCMS_PYINCLUDE=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"`
+ LCMS_PYLIB=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1)"`
+ as_ac_File=`echo "ac_cv_file_$LCMS_PYINCLUDE/Python.h" | $as_tr_sh`
+@@ -9489,9 +9483,9 @@
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+ else
+ wlarc=''
+- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ archive_cmds='$CXX $CXXFLAGS $LDFLAGS -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++ $CXX $CXXFLAGS $LDFLAGS -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+ fi
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_shlibpath_var=no
+@@ -11270,7 +11264,7 @@
+ echo "$as_me: creating $ofile" >&6;}
+
+ cat <<__EOF__ >> "$cfgfile"
+-#! $SHELL
++#! $CONFIG_SHELL
+
+ # `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/lcms/configure.0-64.patch Sun May 09 20:32:17 2010 -0700
@@ -0,0 +1,67 @@
+--- configure 2009-10-30 08:57:45.000000000 -0700
++++ configure 2010-04-15 08:59:26.926442400 -0700
+@@ -5246,13 +5246,8 @@
+
+
+ # Configure python. AM_PATH_PYTHON is basically braindead
+-PYTHON=''
+ if test "$with_python" = 'yes'
+ then
+-
+-
+-
+-
+ if test -n "$PYTHON"; then
+ # If the user set $PYTHON, use it and don't search something else.
+ { echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5
+@@ -5400,8 +5395,7 @@
+ if test "${am_cv_python_pythondir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_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/64"`
+ fi
+ { echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+ echo "${ECHO_T}$am_cv_python_pythondir" >&6; }
+@@ -5417,8 +5411,7 @@
+ if test "${am_cv_python_pyexecdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_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/64"`
+ fi
+ { echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6; }
+@@ -5436,7 +5429,8 @@
+ if test -n "$PYTHON"
+ then
+ LCMS_PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
+- LCMS_PYEXECDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1)"`
++ LCMS_PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"`
++ LCMS_PYEXECDIR=`echo "$LCMS_PYTHON_PREFIX/lib/python$LCMS_PYTHON_VERSION/vendor-packages/64"`
+ LCMS_PYINCLUDE=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"`
+ LCMS_PYLIB=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1)"`
+ as_ac_File=`echo "ac_cv_file_$LCMS_PYINCLUDE/Python.h" | $as_tr_sh`
+@@ -9489,9 +9483,9 @@
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+ else
+ wlarc=''
+- archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++ archive_cmds='$CXX $CXXFLAGS $LDFLAGS -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++ $CXX $CXXFLAGS $LDFLAGS -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+ fi
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_shlibpath_var=no
+@@ -11270,7 +11264,7 @@
+ echo "$as_me: creating $ofile" >&6;}
+
+ cat <<__EOF__ >> "$cfgfile"
+-#! $SHELL
++#! $CONFIG_SHELL
+
+ # `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
--- a/usr/src/lib/lcms/configure.patch Sat Apr 17 01:03:10 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- configure.orig Thu Jan 7 10:53:52 2010
-+++ configure Thu Jan 7 10:54:09 2010
-@@ -5246,7 +5246,7 @@
-
-
- # Configure python. AM_PATH_PYTHON is basically braindead
--PYTHON=''
-+#PYTHON=''
- if test "$with_python" = 'yes'
- then
-
--- a/usr/src/lib/lcms/install-sfw Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/lib/lcms/install-sfw Sun May 09 20:32:17 2010 -0700
@@ -20,16 +20,14 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)install-sfw 1.1 08/04/14 SMI"
-
-VERS=lcms-1.17
+# ident "@(#)install-sfw 1.2 10/04/20 SMI"
PREFIX=${ROOT}/usr
LIBDIR=${PREFIX}/lib
-PYTHONLCMSDIR=${LIBDIR}/python2.4/vendor-packages
+PYTHON24LCMSDIR=${LIBDIR}/python2.4/vendor-packages
+PYTHON26LCMSDIR=${LIBDIR}/python2.6/vendor-packages
PKGCONFIGDIR=${LIBDIR}/pkgconfig
INCDIR=${PREFIX}/include/lcms
BINDIR=${PREFIX}/bin
@@ -51,15 +49,17 @@
_install N include/lcms.h ${INCDIR}/lcms.h 0644
_install N include/icc34.h ${INCDIR}/icc34.h 0644
-_install D ${INSTDIR}/usr/lib/liblcms.so.1.0.16 ${LIBDIR}/liblcms.so.1.0.16 0755
+_install D ${INSTDIR}/usr/lib/liblcms.so.1.0.19 ${LIBDIR}/liblcms.so.1.0.19 0755
cd ${LIBDIR}
-ln -sf liblcms.so.1.0.16 liblcms.so.1
-ln -sf liblcms.so.1.0.16 liblcms.so
+ln -sf liblcms.so.1.0.19 liblcms.so.1
+ln -sf liblcms.so.1.0.19 liblcms.so
cd ${HERE}
-_install D ${INSTDIR}/usr/lib/python2.4/site-packages/_lcms.so ${PYTHONLCMSDIR}/_lcms.so 0755
-_install N python/lcms.py ${PYTHONLCMSDIR}/lcms.py 0644
+_install D ${INSTDIR}/usr/lib/python2.4/vendor-packages/_lcms.so ${PYTHON24LCMSDIR}/_lcms.so 0755
+_install D ${INSTDIR_26}/usr/lib/python2.6/vendor-packages/_lcms.so ${PYTHON26LCMSDIR}/_lcms.so 0755
+_install N ${INSTDIR}/usr/lib/python2.4/vendor-packages/lcms.py ${PYTHON24LCMSDIR}/lcms.py 0644
+_install N ${INSTDIR_26}/usr/lib/python2.6/vendor-packages/lcms.py ${PYTHON26LCMSDIR}/lcms.py 0644
_install E samples/.libs/icc2ps ${BINDIR}/icc2ps 0555
_install E samples/.libs/icclink ${BINDIR}/icclink 0555
--- a/usr/src/lib/lcms/install-sfw-64 Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/lib/lcms/install-sfw-64 Sun May 09 20:32:17 2010 -0700
@@ -20,18 +20,16 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)install-sfw-64 1.2 08/06/06 SMI"
-
-VERS=lcms-1.17-64
+# ident "@(#)install-sfw-64 1.3 10/04/20 SMI"
PREFIX=${ROOT}/usr
LIBDIR=${PREFIX}/lib/${MACH64} # MACH64 passed in by makefile
# 64-bit Python does not create isalist 64-bit directories,
# but only a "64" generic directory.
-PYTHONLCMSDIR=${PREFIX}/lib/python2.4/vendor-packages/64
+PYTHON24LCMSDIR=${PREFIX}/lib/python2.4/vendor-packages/64
+PYTHON26LCMSDIR=${PREFIX}/lib/python2.6/vendor-packages/64
BINDIR=${PREFIX}/bin/${MACH64} # MACH64 passed in by makefile
PKGCONFIGDIR=${LIBDIR}/pkgconfig
@@ -40,16 +38,17 @@
cd ${VERS}
HERE="`pwd`"
-_install D ${INSTDIR}/usr/lib/${MACH64}/liblcms.so.1.0.16 ${LIBDIR}/liblcms.so.1.0.16 0755
+_install D ${INSTDIR}/usr/lib/${MACH64}/liblcms.so.1.0.19 ${LIBDIR}/liblcms.so.1.0.19 0755
cd ${LIBDIR}
-ln -sf liblcms.so.1.0.16 liblcms.so.1
-ln -sf liblcms.so.1.0.16 liblcms.so
+ln -sf liblcms.so.1.0.19 liblcms.so.1
+ln -sf liblcms.so.1.0.19 liblcms.so
cd ${HERE}
_install N llib-llcms.ln ${LIBDIR}/llib-llcms.ln 0644
-_install D ${INSTDIR}/usr/lib/python2.4/site-packages/64/_lcms.so ${PYTHONLCMSDIR}/_lcms.so 0755
+_install D ${INSTDIR}/usr/lib/python2.4/vendor-packages/64/_lcms.so ${PYTHON24LCMSDIR}/_lcms.so 0755
+_install D ${INSTDIR_26}/usr/lib/python2.6/vendor-packages/64/_lcms.so ${PYTHON26LCMSDIR}/_lcms.so 0755
sed -e 's#\${prefix}/include#\${prefix}/include/lcms#g' ${INSTDIR}/usr/lib/${MACH64}/pkgconfig/lcms.pc > ${INSTDIR}/usr/lib/${MACH64}/pkgconfig/lcms.pc.tmp
cp -fp ${INSTDIR}/usr/lib/${MACH64}/pkgconfig/lcms.pc.tmp ${INSTDIR}/usr/lib/${MACH64}/pkgconfig/lcms.pc
--- a/usr/src/lib/lcms/install-sh.patch Sat Apr 17 01:03:10 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- install-sh.orig Fri Jul 27 03:00:01 2007
-+++ install-sh Thu Feb 28 10:47:04 2008
-@@ -56,7 +56,7 @@
- chgrpprog="${CHGRPPROG-chgrp}"
- stripprog="${STRIPPROG-strip}"
- rmprog="${RMPROG-rm}"
--mkdirprog="${MKDIRPROG-mkdir}"
-+mkdirprog="/usr/bin/mkdir -p"
-
- chmodcmd="$chmodprog 0755"
- chowncmd=
-@@ -239,6 +239,7 @@
- # mkdir can fail with a `File exist' error in case several
- # install-sh are creating the directory concurrently. This
- # is OK.
-+ # No, this is not OK.
- test -d "$pathcomp" || exit
- fi
- pathcomp=$pathcomp/
Binary file usr/src/lib/lcms/lcms-1.17.tar.gz has changed
Binary file usr/src/lib/lcms/lcms-1.19.tar.gz has changed
--- a/usr/src/lib/lcms/lcms.python-64.patch Sat Apr 17 01:03:10 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- python/Makefile.in 2008-05-13 14:27:29.671667000 -0700
-+++ python/Makefile.in 2008-05-13 14:38:27.351909045 -0700
-@@ -123,7 +123,7 @@
- INT8_T = @INT8_T@
- JPEGICC_DEPLIBS = @JPEGICC_DEPLIBS@
- LCMS_LIB_DEPLIBS = @LCMS_LIB_DEPLIBS@
--LCMS_PYEXECDIR = @LCMS_PYEXECDIR@
-+LCMS_PYEXECDIR = /usr/lib/python2.4/site-packages/64
- LCMS_PYINCLUDE = @LCMS_PYINCLUDE@
- LCMS_PYLIB = @LCMS_PYLIB@
- LD = @LD@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/lcms/libtool.1.patch Sun May 09 20:32:17 2010 -0700
@@ -0,0 +1,62 @@
+--- libtool 2010-03-22 17:31:44.722414303 -0700
++++ libtool 2010-03-23 09:32:42.039483543 -0700
+@@ -323,10 +323,10 @@
+ link_all_deplibs=yes
+
+ # Compile-time system search path for libraries
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++sys_lib_search_path_spec=""
+
+ # Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_dlsearch_path_spec=""
+
+ # Fix the shell variable $srcfile for the compiler.
+ fix_srcfile_path=""
+@@ -7434,7 +7434,7 @@
+
+ # Commands used to build and install an old-style archive.
+ RANLIB="ranlib"
+-old_archive_cmds="\$CC -xar -o \$oldlib \$oldobjs"
++old_archive_cmds="\$CC \$CXXFLAGS -xar -o \$oldlib \$oldobjs"
+ old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
+ old_postuninstall_cmds=""
+
+@@ -7445,9 +7445,9 @@
+ old_archive_from_expsyms_cmds=""
+
+ # Commands used to build and install a shared archive.
+-archive_cmds="\$CC -G\${allow_undefined_flag} -h\$soname -o \$lib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags"
++archive_cmds="\$CC \$CXXFLAGS \$LDFLAGS -G\${allow_undefined_flag} -h\$soname -o \$lib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags"
+ archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$lib.exp~cat \$export_symbols | \$SED -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$lib.exp~\$echo \\\"local: *; };\\\" >> \$lib.exp~
+- \$CC -G\${allow_undefined_flag} \${wl}-M \${wl}\$lib.exp -h\$soname -o \$lib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags~\$rm \$lib.exp"
++ \$CC \$CXXFLAGS \$LDFLAGS -G\${allow_undefined_flag} \${wl}-M \${wl}\$lib.exp -h\$soname -o \$lib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags~\$rm \$lib.exp"
+ postinstall_cmds="chmod +x \$lib"
+ postuninstall_cmds=""
+
+@@ -7557,10 +7557,10 @@
+ link_all_deplibs=yes
+
+ # Compile-time system search path for libraries
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++sys_lib_search_path_spec=""
+
+ # Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_dlsearch_path_spec=""
+
+ # Fix the shell variable $srcfile for the compiler.
+ fix_srcfile_path=""
+@@ -7863,10 +7863,10 @@
+ link_all_deplibs=yes
+
+ # Compile-time system search path for libraries
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++sys_lib_search_path_spec=""
+
+ # Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_dlsearch_path_spec=""
+
+ # Fix the shell variable $srcfile for the compiler.
+ fix_srcfile_path=""
--- a/usr/src/lib/lcms/llib-llcms Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/lib/lcms/llib-llcms Sun May 09 20:32:17 2010 -0700
@@ -20,11 +20,10 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
*/
-# ident "@(#)llib-llcms 1.1 08/04/14 SMI"
+# ident "@(#)llib-llcms 1.2 10/04/20 SMI"
/* LINTLIBRARY */
/* PROTOLIB1 */
--- a/usr/src/lib/lcms/python.Makefile.in.patch Sat Apr 17 01:03:10 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- python/Makefile.in.orig 2007-07-27 03:10:45.000000000 -0700
-+++ python/Makefile.in 2007-12-06 10:37:52.883765388 -0800
-@@ -71,7 +71,7 @@
- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--CXXLD = $(CXX)
-+CXXLD = $(CXX) $(CXXFLAGS) $(LDFLAGS)
- CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
--- a/usr/src/lib/libpcap/Makefile.sfw Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/lib/libpcap/Makefile.sfw Sun May 09 20:32:17 2010 -0700
@@ -18,10 +18,10 @@
#
# CDDL HEADER END
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-#ident "@(#)Makefile.sfw 1.3 09/11/10 SMI"
+
+#ident "@(#)Makefile.sfw 1.4 10/04/15 SMI"
include ../Makefile.lib
@@ -35,6 +35,7 @@
TARGET_COMENV += PATH="$(SFW_PATH)"
TARGET_COMENV += MAKE="$(GMAKE)"
TARGET_COMENV += LIBS="$(LIBS)"
+TARGET_COMENV += "ac_cv_func_getifaddrs=no"
PATCHES:sh = echo Patches/*.patch
--- a/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11.c Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11.c Sun May 09 20:32:17 2010 -0700
@@ -1,9 +1,8 @@
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
*/
-#pragma ident "@(#)hw_pk11.c 1.3 10/02/01 SMI"
+#pragma ident "@(#)hw_pk11.c 1.4 10/04/14 SMI"
/* crypto/engine/hw_pk11.c */
/*
@@ -3627,7 +3626,12 @@
fprintf(stderr, "%s: SOLARIS_HW_SLOT_SELECTION code running\n",
PK11_DBG);
#endif
- if ((handle = dlopen(pkcs11_kernel, RTLD_LAZY)) == NULL)
+ /*
+ * Use RTLD_GROUP to limit the pkcs11_kernel provider to its own
+ * symbols, which prevents it from mistakenly accessing C_* functions
+ * from the top-level PKCS#11 library.
+ */
+ if ((handle = dlopen(pkcs11_kernel, RTLD_LAZY | RTLD_GROUP)) == NULL)
{
PK11err(PK11_F_CHECK_HW_MECHANISMS, PK11_R_DSO_FAILURE);
goto err;
--- a/usr/src/pkgdefs/SUNWlcms/depend Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/pkgdefs/SUNWlcms/depend Sun May 09 20:32:17 2010 -0700
@@ -1,6 +1,5 @@
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
# CDDL HEADER START
#
@@ -21,7 +20,7 @@
#
# CDDL HEADER END
#
-#ident "@(#)depend 1.2 08/08/04 SMI"
+#ident "@(#)depend 1.3 10/04/20 SMI"
#
# This package information file defines software dependencies associated
# with the pkg. You can define three types of pkg dependencies with this file:
@@ -53,6 +52,7 @@
P SUNWTiff libtiff - library for reading and writing TIFF
P SUNWjpg jpeg - The Independent JPEG Groups JPEG software
P SUNWPython The Python interpreter, libraries and utilities
+P SUNWPython26 The Python 2.6 interpreter, libraries and utilities
P SUNWzlib The Zip compression library
P SUNWlibms Math & Microtasking Libraries (Usr)
P SUNWlibmsr Math & Microtasking Libraries (Root)
--- a/usr/src/pkgdefs/SUNWlcms/pkginfo.tmpl Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/pkgdefs/SUNWlcms/pkginfo.tmpl Sun May 09 20:32:17 2010 -0700
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)pkginfo.tmpl 1.1 08/04/14 SMI"
+# ident "@(#)pkginfo.tmpl 1.2 10/04/20 SMI"
#
# This required package information file describes characteristics of the
# package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
SUNW_PKGTYPE="usr"
MAXINST="1000"
CATEGORY="system"
-DESC="LCMS - Little Color Management System (1.17)"
+DESC="LCMS - Little Color Management System (1.19)"
VENDOR="Sun Microsystems, Inc."
HOTLINE="Please contact your local service provider"
EMAIL=""
--- a/usr/src/pkgdefs/SUNWlcms/prototype_com Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/pkgdefs/SUNWlcms/prototype_com Sun May 09 20:32:17 2010 -0700
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_com 1.1 08/04/14 SMI"
+# ident "@(#)prototype_com 1.2 10/04/20 SMI"
#
# This required package information file contains a list of package contents.
# The 'pkgmk' command uses this file to identify the contents of a package
@@ -56,9 +55,9 @@
f none usr/include/lcms/lcms.h 0644 root bin
f none usr/include/lcms/icc34.h 0644 root bin
d none usr/lib 0755 root bin
-f none usr/lib/liblcms.so.1.0.16 0755 root bin
-s none usr/lib/liblcms.so.1=liblcms.so.1.0.16
-s none usr/lib/liblcms.so=liblcms.so.1.0.16
+f none usr/lib/liblcms.so.1.0.19 0755 root bin
+s none usr/lib/liblcms.so.1=liblcms.so.1.0.19
+s none usr/lib/liblcms.so=liblcms.so.1.0.19
f none usr/lib/llib-llcms 0644 root bin
f none usr/lib/llib-llcms.ln 0644 root bin
d none usr/lib/pkgconfig 0755 root other
@@ -67,6 +66,10 @@
d none usr/lib/python2.4/vendor-packages 0755 root bin
f none usr/lib/python2.4/vendor-packages/_lcms.so 0755 root bin
f none usr/lib/python2.4/vendor-packages/lcms.py 0644 root bin
+d none usr/lib/python2.6 0755 root bin
+d none usr/lib/python2.6/vendor-packages 0755 root bin
+f none usr/lib/python2.6/vendor-packages/_lcms.so 0755 root bin
+f none usr/lib/python2.6/vendor-packages/lcms.py 0644 root bin
d none usr/share 0755 root sys
d none usr/share/doc 0755 root other
d none usr/share/doc/lcms 0755 root bin
--- a/usr/src/pkgdefs/SUNWlcms/prototype_i386 Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/pkgdefs/SUNWlcms/prototype_i386 Sun May 09 20:32:17 2010 -0700
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_i386 1.3 08/07/10 SMI"
+# ident "@(#)prototype_i386 1.4 10/04/20 SMI"
#
# This required package information file contains a list of package contents.
# The 'pkgmk' command uses this file to identify the contents of a package
@@ -48,11 +47,13 @@
# SUNWlcms
#
d none usr/lib/amd64 0755 root bin
-f none usr/lib/amd64/liblcms.so.1.0.16 0755 root bin
-s none usr/lib/amd64/liblcms.so.1=liblcms.so.1.0.16
-s none usr/lib/amd64/liblcms.so=liblcms.so.1.0.16
+f none usr/lib/amd64/liblcms.so.1.0.19 0755 root bin
+s none usr/lib/amd64/liblcms.so.1=liblcms.so.1.0.19
+s none usr/lib/amd64/liblcms.so=liblcms.so.1.0.19
f none usr/lib/amd64/llib-llcms.ln 0644 root bin
d none usr/lib/python2.4/vendor-packages/64 0755 root bin
f none usr/lib/python2.4/vendor-packages/64/_lcms.so 0755 root bin
+d none usr/lib/python2.6/vendor-packages/64 0755 root bin
+f none usr/lib/python2.6/vendor-packages/64/_lcms.so 0755 root bin
d none usr/lib/amd64/pkgconfig 0755 root other
f none usr/lib/amd64/pkgconfig/lcms.pc 0644 root other
--- a/usr/src/pkgdefs/SUNWlcms/prototype_sparc Sat Apr 17 01:03:10 2010 -0700
+++ b/usr/src/pkgdefs/SUNWlcms/prototype_sparc Sun May 09 20:32:17 2010 -0700
@@ -18,10 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
#
-# ident "@(#)prototype_sparc 1.3 08/07/08 SMI"
+# ident "@(#)prototype_sparc 1.4 10/04/20 SMI"
#
# This required package information file contains a list of package contents.
# The 'pkgmk' command uses this file to identify the contents of a package
@@ -48,11 +47,13 @@
# SUNWlcms
#
d none usr/lib/sparcv9 0755 root bin
-f none usr/lib/sparcv9/liblcms.so.1.0.16 0755 root bin
-s none usr/lib/sparcv9/liblcms.so.1=liblcms.so.1.0.16
-s none usr/lib/sparcv9/liblcms.so=liblcms.so.1.0.16
+f none usr/lib/sparcv9/liblcms.so.1.0.19 0755 root bin
+s none usr/lib/sparcv9/liblcms.so.1=liblcms.so.1.0.19
+s none usr/lib/sparcv9/liblcms.so=liblcms.so.1.0.19
d none usr/lib/python2.4/vendor-packages/64 0755 root bin
f none usr/lib/python2.4/vendor-packages/64/_lcms.so 0755 root bin
+d none usr/lib/python2.6/vendor-packages/64 0755 root bin
+f none usr/lib/python2.6/vendor-packages/64/_lcms.so 0755 root bin
f none usr/lib/sparcv9/llib-llcms.ln 0644 root bin
d none usr/lib/sparcv9/pkgconfig 0755 root other
f none usr/lib/sparcv9/pkgconfig/lcms.pc 0644 root other