Clean up subversion and remove py24 dep oi_151a
authorJon Tibble <meths@btinternet.com>
Tue, 18 Jun 2013 18:57:27 +0100
branchoi_151a
changeset 226 21c05f2041ca
parent 225 f9781a41b7c3
child 227 fbe7929c18b4
Clean up subversion and remove py24 dep
usr/src/Targetdirs
usr/src/cmd/subversion/Makefile.sfw
usr/src/cmd/subversion/install-sfw
usr/src/cmd/subversion/subversion-1.6.5-py26.patch
usr/src/cmd/subversion/subversion-1.6.5.patch
usr/src/pkgdefs/SUNWsvn-python/depend
usr/src/pkgdefs/SUNWsvn-python/prototype_com
--- a/usr/src/Targetdirs	Tue Jun 18 18:56:22 2013 +0100
+++ b/usr/src/Targetdirs	Tue Jun 18 18:57:27 2013 +0100
@@ -341,8 +341,6 @@
 	/usr/lib/python2.4/site-packages/epydoc/test \
 	/usr/lib/python2.4/vendor-packages \
 	/usr/lib/python2.4/vendor-packages/64 \
-	/usr/lib/python2.4/vendor-packages/libsvn \
-	/usr/lib/python2.4/vendor-packages/svn \
 	/usr/lib/python2.4/vendor-packages/OpenSSL \
 	/usr/lib/python2.4/vendor-packages/OpenSSL/64 \
 	/usr/lib/python2.4/vendor-packages/OpenSSL/test \
--- a/usr/src/cmd/subversion/Makefile.sfw	Tue Jun 18 18:56:22 2013 +0100
+++ b/usr/src/cmd/subversion/Makefile.sfw	Tue Jun 18 18:57:27 2013 +0100
@@ -19,15 +19,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile.sfw	1.16	09/10/21 SMI"
+# ident	"@(#)Makefile.sfw	1.20	11/04/15 SMI"
 
 VER=subversion-1.6.5
-VERPY26=subversion-1.6.5-py26
 SVN_PACKAGES=SUNWsvn SUNWsvn-java SUNWsvn-perl SUNWsvn-python
-SWIGPROG=$(ROOT)/usr/bin/swig
+SWIGPROG=/usr/bin/swig
 PERL=/usr/perl5/bin/perl
 GSED=/usr/bin/gsed
 TOP = $(SRC)/cmd/subversion
@@ -41,6 +39,7 @@
     -lsocket -lresolv -lnsl -lgen -z ignore
 
 include ../Makefile.cmd
+
 include $(SRC)/cmd/apache2/apache.build.env
 include $(SRC)/cmd/apr/apr-1.3/apr.build.env
 include $(SRC)/cmd/apr-util/apr-util-1.3/apr-util.build.env
@@ -88,53 +87,20 @@
 CCFLAGS_GENERIC += -D_POSIX_PTHREAD_SEMANTICS -s
 CCFLAGS = $(CCFLAGS_GENERIC) $(CXXFLAGS_$(MACH))
 
-CPPFLAGS = -I$(ROOT)/usr/include/neon -I$(ROOT)/usr/include
+CPPFLAGS = -I/usr/include/neon -I$(ROOT)/usr/include
 
 LDFLAGS = -L$(ROOT)/usr/lib -L/usr/lib -R/usr/lib
 LDFLAGS += -m32 -s -z ignore
 
-PYVER24=2.4
 PYVER26=2.6
-PYTHON24=/usr/bin/python$(PYVER24)
 PYTHON26=/usr/bin/python$(PYVER26)
-PYDIR24=$(ROOTLIB)/python$(PYVER24)
 PYDIR26=$(ROOTLIB)/python$(PYVER26)
-PYVENDORDIR24=$(PYDIR24)/vendor-packages
 PYVENDORDIR26=$(PYDIR26)/vendor-packages
 PYMODS=client core delta fs ra repos wc
 
-all: $(VER)/config.status $(VERPY26)/config.status
+all: $(VER)/config.status
 	$(INCREFIXUP) $(VER)
-	$(INCREFIXUP) $(VERPY26)
-	( cd $(VER) ; \
-	    $(GSED) -e "s#-I/usr/include/neon#-I$(ROOT)/usr/include/neon#g" Makefile > Makefile.sed ; \
-	    cp -fp Makefile.sed Makefile ; \
-	    touch -acm Makefile ; \
-	    rm -f Makefile.sed )
-	( cd $(VERPY26) ; \
-	    $(GSED) -e "s#-I/usr/include/neon#-I$(ROOT)/usr/include/neon#g" Makefile > Makefile.sed ; \
-	    cp -fp Makefile.sed Makefile ; \
-	    touch -acm Makefile ; \
-	    rm -f Makefile.sed )
 	( cd $(VER) ; env - \
-	    "PYVER=$(PYVER24)" \
-	    "PYTHON=$(PYTHON24)" \
-	    "PYDIR=$(PYDIR24)" \
-	    "PYVENDORDIR=$(PYVENDORDIR24)" \
-	    "PYMODS=$(PYMODS)" \
-	    "LDFLAGS=$(LDFLAGS) $(SVN_LDFLAGS)" \
-	    "LD_OPTIONS=$(LDFLAGS) $(SVN_LDFLAGS)" \
-	    "SWIG_LDFLAGS=$(LDFLAGS) $(SVN_LDFLAGS)" \
-	    CC=$(CC) CXX=$(CCC) \
-	    "CPPFLAGS=$(CPPFLAGS)" \
-	    "CFLAGS=$(CFLAGS)" \
-	    "CXXFLAGS=$(CCFLAGS)" \
-	    NEON_LIBS="-L$(ROOT)/usr/lib -lneon" \
-	    MAKE=$(GMAKE) \
-	    PATH=$(SFW_PATH) \
-	    INSTALL=$(GINSTALL) \
-	    $(GMAKE) all swig-py swig-pl javahl )
-	( cd $(VERPY26) ; env - \
 	    "PYVER=$(PYVER26)" \
 	    "PYTHON=$(PYTHON26)" \
 	    "PYDIR=$(PYDIR26)" \
@@ -147,11 +113,11 @@
 	    "CPPFLAGS=$(CPPFLAGS)" \
 	    "CFLAGS=$(CFLAGS)" \
 	    "CXXFLAGS=$(CCFLAGS)" \
-	    NEON_LIBS="-L$(ROOT)/usr/lib -lneon" \
+	    NEON_LIBS="-lneon" \
 	    MAKE=$(GMAKE) \
 	    PATH=$(SFW_PATH) \
 	    INSTALL=$(GINSTALL) \
-	    $(GMAKE) all swig-py )
+	    $(GMAKE) all swig-py swig-pl javahl )
 	@find . -name core -exec rm -f {} \;
 
 _ARCH:sh=arch
@@ -174,26 +140,15 @@
 	    env - "DESTDIR=$(DESTDIR)" \
 	    "INSTALL=$(GINSTALL)" \
 	    "MAKE=$(GMAKE)" \
-	    "PYVER=$(PYVER24)" \
-	    "PYTHON=$(PYTHON24)" \
-	    "PYDIR=$(PYDIR24)" \
-	    "PYVENDORDIR=$(PYVENDORDIR24)" \
-	    "PYMODS=$(PYMODS)" \
-	    $(GMAKE) DESTDIR=$(DESTDIR) \
-	    INSTALL=$(GINSTALL) install install-lib \
-	    install-swig-pl-lib install-swig-py install-javahl-lib \
-	    install-bin install-docs )
-	( cd $(VERPY26) ; \
-	    env - "DESTDIR=$(DESTDIR)" \
-	    "INSTALL=$(GINSTALL)" \
-	    "MAKE=$(GMAKE)" \
 	    "PYVER=$(PYVER26)" \
 	    "PYTHON=$(PYTHON26)" \
 	    "PYDIR=$(PYDIR26)" \
 	    "PYVENDORDIR=$(PYVENDORDIR26)" \
 	    "PYMODS=$(PYMODS)" \
 	    $(GMAKE) DESTDIR=$(DESTDIR) \
-	    INSTALL=$(GINSTALL) install-swig-py )
+	    INSTALL=$(GINSTALL) install install-lib \
+	    install-swig-pl-lib install-swig-py install-javahl-lib \
+	    install-bin install-docs )
 	( cd $(VER) ; \
 	    env - "DESTDIR=$(DESTDIR)" \
 	    "INSTALL=$(GINSTALL)" \
@@ -217,10 +172,10 @@
 
 $(VER)/config.status: $(VER)/configure
 	( cd $(VER) ; env - \
-	    "PYVER=$(PYVER24)" \
-	    "PYTHON=$(PYTHON24)" \
-	    "PYDIR=$(PYDIR24)" \
-	    "PYVENDORDIR=$(PYVENDORDIR24)" \
+	    "PYVER=$(PYVER26)" \
+	    "PYTHON=$(PYTHON26)" \
+	    "PYDIR=$(PYDIR26)" \
+	    "PYVENDORDIR=$(PYVENDORDIR26)" \
 	    "PYMODS=$(PYMODS)" \
 	    "CC=$(CC)" \
 	    "CXX=$(CCC)" \
@@ -234,7 +189,7 @@
 	    "INSTALL=$(GINSTALL)" \
 	    "PATH=$(SFW_PATH)" \
 	    "MAKE=$(GMAKE)" \
-	    "NEON_LIBS=-L$(ROOT)/usr/lib -lneon" \
+	    "NEON_LIBS=-lneon" \
 	    ./configure \
 	    --prefix=$(PREFIX) \
 	    --libdir=$(PREFIX)/lib/svn \
@@ -256,50 +211,7 @@
 	    --disable-static \
 	    --enable-shared \
 	    --with-swig \
-	    --with-neon=$(ROOT)/usr )
-
-$(VERPY26)/config.status: $(VERPY26)/configure
-	( cd $(VERPY26) ; env - \
-	    "PYVER=$(PYVER26)" \
-	    "PYTHON=$(PYTHON26)" \
-	    "PYDIR=$(PYDIR26)" \
-	    "PYVENDORDIR=$(PYVENDORDIR26)" \
-	    "PYMODS=$(PYMODS)" \
-	    "CC=$(CC)" \
-	    "CXX=$(CCC)" \
-	    "CPPFLAGS=$(CPPFLAGS)" \
-	    "CFLAGS=$(CFLAGS)" \
-	    "CXXFLAGS=$(CCFLAGS)" \
-	    "LDFLAGS=$(LDFLAGS) $(SVN_LDFLAGS)" \
-	    "SWIG=$(SWIGPROG)" \
-	    "PERL=$(PERL)" \
-	    "ROOT=$(ROOT)" \
-	    "INSTALL=$(GINSTALL)" \
-	    "PATH=$(SFW_PATH)" \
-	    "MAKE=$(GMAKE)" \
-	    "NEON_LIBS=-L$(ROOT)/usr/lib -lneon" \
-	    ./configure \
-	    --prefix=$(PREFIX) \
-	    --libdir=$(PREFIX)/lib/svn \
-	    --localstatedir=/var \
-	    --enable-shared \
-	    --disable-static \
-	    --disable-libtool-lock \
-	    --disable-neon-version-check \
-	    --disable-experimental-libtool \
-	    --with-apxs=$(ROOT)$(APACHE_USR_PREFIX)/bin/apxs \
-	    --with-ssl \
-	    --with-zlib=$(ROOT)/usr \
-	    --with-jdk=$(JAVA_ROOT) \
-	    --with-apr=$(ROOT)$(APR_USR_PREFIX) \
-	    --with-apr-util=$(ROOT)$(APR_UTIL_USR_PREFIX) \
-	    --enable-nls \
-	    --disable-mod-activation \
-	    --enable-javahl \
-	    --disable-static \
-	    --enable-shared \
-	    --with-swig \
-	    --with-neon=$(ROOT)/usr )
+	    --with-neon=/usr )
 
 $(VER)/configure: $(VER).tar.gz
 	gzip -dc $(VER).tar.gz | tar xopf -
@@ -310,19 +222,8 @@
 	chmod 0755 $(VER)
 	find $(VER) -type d -exec chmod 0755 {} \;
 
-$(VERPY26)/configure: $(VER).tar.gz
-	mkdir -p tmp
-	gzip -dc $(VER).tar.gz | ( cd tmp ; $(TAR) xopf - )
-	mv tmp/$(VER) $(VERPY26)
-	rm -rf tmp
-	( cd $(VERPY26) ; \
-	    gpatch -p0 <../$(VERPY26).patch )
-	chmod 0755 $(VERPY26)/configure
-	chmod 0755 $(VERPY26)
-	find $(VERPY26) -type d -exec chmod 0755 {} \;
-
 clean:
-	-rm -rf $(VER) $(VERPY26) $(DESTDIR)
+	-rm -rf $(VER) $(DESTDIR)
 
 include ../Makefile.targ
 
--- a/usr/src/cmd/subversion/install-sfw	Tue Jun 18 18:56:22 2013 +0100
+++ b/usr/src/cmd/subversion/install-sfw	Tue Jun 18 18:57:27 2013 +0100
@@ -20,10 +20,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)install-sfw	1.1	09/09/30 SMI"
+# ident	"@(#)install-sfw	1.2	11/03/22 SMI"
 
 VERS=subversion-1.6.5
 VERSPY26=subversion-1.6.5-py26
@@ -146,11 +145,10 @@
 
 _install N ${INSTDIR}/usr/lib/svn/svn-javahl/svn-javahl.jar ${JARLIBDIR}/svn-javahl.jar 0444
 
-PYTHON_VERSION=2.4
+PYTHON_VERSION=2.6
 PYTHONVENDORDIR=${PREFIX}/lib/python${PYTHON_VERSION}/vendor-packages
 
 for PYTHON_VERSION in \
-	"2.4" \
 	"2.6"
 do
 	PYTHONVENDORDIR=${PREFIX}/lib/python${PYTHON_VERSION}/vendor-packages
--- a/usr/src/cmd/subversion/subversion-1.6.5-py26.patch	Tue Jun 18 18:56:22 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
---- configure	2009-09-23 20:05:36.124131000 -0700
-+++ configure	2009-09-23 21:45:10.895445310 -0700
-@@ -5097,11 +5097,11 @@
-            test "$svn_allowed_neon" = "any"; then
-             svn_allowed_neon_on_system="yes"
-             if test "$NEON_PKG_CONFIG" = "yes"; then
--              SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'`
--              CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`"
-+              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
-+              CFLAGS="$CFLAGS"
-               old_CFLAGS="$CFLAGS"
-               old_LIBS="$LIBS"
--              NEON_LIBS=`$PKG_CONFIG neon --libs`
-+              NEON_LIBS="-L${ROOT}/lib -lneon"
-               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
-               LIBS="$LIBS $NEON_LIBS"
-               neon_test_code="
-@@ -5188,9 +5188,9 @@
-               CFLAGS="$old_CFLAGS"
-               LIBS="$old_LIBS"
-             else
--              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
--              CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
--              NEON_LIBS=`$neon_config --libs`
-+              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
-+              CFLAGS="$CFLAGS"
-+              NEON_LIBS="-L${ROOT}/lib -lneon"
-             fi
-             svn_lib_neon="yes"
-             break
-@@ -5578,11 +5578,11 @@
-            test "$svn_allowed_neon" = "any"; then
-             svn_allowed_neon_on_system="yes"
-             if test "$NEON_PKG_CONFIG" = "yes"; then
--              SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'`
--              CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`"
-+              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
-+              CFLAGS="$CFLAGS"
-               old_CFLAGS="$CFLAGS"
-               old_LIBS="$LIBS"
--              NEON_LIBS=`$PKG_CONFIG neon --libs`
-+              NEON_LIBS="-L${ROOT}/lib -lneon"
-               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
-               LIBS="$LIBS $NEON_LIBS"
-               neon_test_code="
-@@ -5669,9 +5669,9 @@
-               CFLAGS="$old_CFLAGS"
-               LIBS="$old_LIBS"
-             else
--              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
--              CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
--              NEON_LIBS=`$neon_config --libs`
-+              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
-+              CFLAGS="$CFLAGS"
-+              NEON_LIBS="-L${ROOT}/lib -lneon"
-             fi
-             svn_lib_neon="yes"
-             break
---- Makefile.in	2009-02-16 08:10:48.000000000 -0800
-+++ Makefile.in	2009-09-23 21:35:11.885785150 -0700
-@@ -76,8 +76,8 @@
- swig_rb_libdir = @libdir@
- 
- ### these possibly need further discussion
--swig_pydir = @libdir@/svn-python/libsvn
--swig_pydir_extra = @libdir@/svn-python/svn
-+swig_pydir = /usr/lib/python2.6/vendor-packages/libsvn
-+swig_pydir_extra = /usr/lib/python2.6/vendor-packages/svn
- swig_pldir = @libdir@/svn-perl
- swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
- contribdir = @bindir@/svn-contrib
--- a/usr/src/cmd/subversion/subversion-1.6.5.patch	Tue Jun 18 18:56:22 2013 +0100
+++ b/usr/src/cmd/subversion/subversion-1.6.5.patch	Tue Jun 18 18:57:27 2013 +0100
@@ -1,61 +1,3 @@
---- configure	2009-09-23 20:05:36.124131000 -0700
-+++ configure	2009-09-23 21:45:10.895445310 -0700
-@@ -5097,11 +5097,11 @@
-            test "$svn_allowed_neon" = "any"; then
-             svn_allowed_neon_on_system="yes"
-             if test "$NEON_PKG_CONFIG" = "yes"; then
--              SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'`
--              CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`"
-+              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
-+              CFLAGS="$CFLAGS"
-               old_CFLAGS="$CFLAGS"
-               old_LIBS="$LIBS"
--              NEON_LIBS=`$PKG_CONFIG neon --libs`
-+              NEON_LIBS="-L${ROOT}/lib -lneon"
-               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
-               LIBS="$LIBS $NEON_LIBS"
-               neon_test_code="
-@@ -5188,9 +5188,9 @@
-               CFLAGS="$old_CFLAGS"
-               LIBS="$old_LIBS"
-             else
--              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
--              CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
--              NEON_LIBS=`$neon_config --libs`
-+              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
-+              CFLAGS="$CFLAGS"
-+              NEON_LIBS="-L${ROOT}/lib -lneon"
-             fi
-             svn_lib_neon="yes"
-             break
-@@ -5578,11 +5578,11 @@
-            test "$svn_allowed_neon" = "any"; then
-             svn_allowed_neon_on_system="yes"
-             if test "$NEON_PKG_CONFIG" = "yes"; then
--              SVN_NEON_INCLUDES=`$PKG_CONFIG neon --cflags | sed -e 's/-D[^ ]*//g'`
--              CFLAGS="$CFLAGS `$PKG_CONFIG neon --cflags | sed -e 's/-I[^ ]*//g'`"
-+              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
-+              CFLAGS="$CFLAGS"
-               old_CFLAGS="$CFLAGS"
-               old_LIBS="$LIBS"
--              NEON_LIBS=`$PKG_CONFIG neon --libs`
-+              NEON_LIBS="-L${ROOT}/lib -lneon"
-               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
-               LIBS="$LIBS $NEON_LIBS"
-               neon_test_code="
-@@ -5669,9 +5669,9 @@
-               CFLAGS="$old_CFLAGS"
-               LIBS="$old_LIBS"
-             else
--              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
--              CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
--              NEON_LIBS=`$neon_config --libs`
-+              SVN_NEON_INCLUDES=-I${ROOT}/usr/include/neon
-+              CFLAGS="$CFLAGS"
-+              NEON_LIBS="-L${ROOT}/lib -lneon"
-             fi
-             svn_lib_neon="yes"
-             break
 --- Makefile.in	2009-02-16 08:10:48.000000000 -0800
 +++ Makefile.in	2009-09-23 21:35:11.885785150 -0700
 @@ -76,8 +76,8 @@
@@ -64,8 +6,8 @@
  ### these possibly need further discussion
 -swig_pydir = @libdir@/svn-python/libsvn
 -swig_pydir_extra = @libdir@/svn-python/svn
-+swig_pydir = /usr/lib/python2.4/vendor-packages/libsvn
-+swig_pydir_extra = /usr/lib/python2.4/vendor-packages/svn
++swig_pydir = /usr/lib/python2.6/vendor-packages/libsvn
++swig_pydir_extra = /usr/lib/python2.6/vendor-packages/svn
  swig_pldir = @libdir@/svn-perl
  swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
  contribdir = @bindir@/svn-contrib
--- a/usr/src/pkgdefs/SUNWsvn-python/depend	Tue Jun 18 18:56:22 2013 +0100
+++ b/usr/src/pkgdefs/SUNWsvn-python/depend	Tue Jun 18 18:57:27 2013 +0100
@@ -1,6 +1,3 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 # CDDL HEADER START
 #
@@ -21,8 +18,9 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)depend	1.6	09/10/28 SMI"
+#ident	"@(#)depend	1.7	11/03/22 SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -52,6 +50,5 @@
 P SUNWapr13lib	Apache Portable Runtime (APR) 1.3 Shared Libraries
 P SUNWapu13lib	Apache Portable Runtime Utility (APR-util) 1.3 Shared Libraries
 P SUNWsvn	Subversion
-P SUNWPython	The Python interpreter, libraries and utilities
 P SUNWPython26	The Python interpreter, libraries and utilities
 P SUNWsqlite3	SQLite3 
--- a/usr/src/pkgdefs/SUNWsvn-python/prototype_com	Tue Jun 18 18:56:22 2013 +0100
+++ b/usr/src/pkgdefs/SUNWsvn-python/prototype_com	Tue Jun 18 18:57:27 2013 +0100
@@ -19,10 +19,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)prototype_com	1.2	09/09/30 SMI"
+# ident	"@(#)prototype_com	1.3	11/03/22 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
@@ -44,59 +43,11 @@
 #
 d none usr 0755 root sys
 d none usr/lib 0755 root bin
-d none usr/lib/python2.4 0755 root bin
-d none usr/lib/python2.4/vendor-packages 0755 root bin
-d none usr/lib/python2.4/vendor-packages/libsvn 0755 root bin
-d none usr/lib/python2.4/vendor-packages/svn 0755 root bin
 d none usr/lib/python2.6 0755 root bin
 d none usr/lib/python2.6/vendor-packages 0755 root bin
 d none usr/lib/python2.6/vendor-packages/libsvn 0755 root bin
 d none usr/lib/python2.6/vendor-packages/svn 0755 root bin
 d none usr/lib/svn 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/_client.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/_core.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/_delta.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/_diff.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/_fs.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/_ra.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/_repos.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/_wc.so 0755 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/client.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/client.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/core.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/core.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/delta.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/delta.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/diff.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/diff.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/fs.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/fs.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/ra.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/ra.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/repos.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/repos.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/wc.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/wc.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/__init__.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/libsvn/__init__.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/client.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/client.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/core.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/core.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/delta.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/delta.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/diff.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/diff.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/fs.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/fs.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/ra.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/ra.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/repos.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/repos.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/wc.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/wc.pyc 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/__init__.py 0644 root bin
-f none usr/lib/python2.4/vendor-packages/svn/__init__.pyc 0644 root bin
 f none usr/lib/python2.6/vendor-packages/libsvn/_client.so 0755 root bin
 f none usr/lib/python2.6/vendor-packages/libsvn/_core.so 0755 root bin
 f none usr/lib/python2.6/vendor-packages/libsvn/_delta.so 0755 root bin