20649370 migrate library/python/subversion to Python 2.7
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 05 Mar 2015 07:33:27 -0800
changeset 3911 7afc7128c98a
parent 3906 780ff6c7fff6
child 3912 c5e09b550970
20649370 migrate library/python/subversion to Python 2.7
components/subversion/Makefile
components/subversion/patches/000-Makefile.in.patch
components/subversion/subversion-python.p5m
--- a/components/subversion/Makefile	Thu Mar 05 02:10:27 2015 -0800
+++ b/components/subversion/Makefile	Thu Mar 05 07:33:27 2015 -0800
@@ -51,6 +51,7 @@
 PERL_VERSION.64 = 5.16
 PERL_VERSION = $(PERL_VERSION.$(BITS))
 PERL = $(PERL.$(PERL_VERSION))
+PYTHON_VERSION = 2.7
 GNUCP = /usr/gnu/bin/cp
 
 # because we can't seem to get -norunpath to the java bindings build any
@@ -181,6 +182,7 @@
 	fi ; )
 
 PKG_MACROS += PERL_ARCH_16="$(PERL_ARCH_16)"
+PKG_MACROS += PYVER=$(PYTHON_VERSION)
 
 ASLR_MODE=$(ASLR_ENABLE)
 
--- a/components/subversion/patches/000-Makefile.in.patch	Thu Mar 05 02:10:27 2015 -0800
+++ b/components/subversion/patches/000-Makefile.in.patch	Thu Mar 05 07:33:27 2015 -0800
@@ -9,8 +9,8 @@
  ### these possibly need further discussion
 -swig_pydir = @[email protected]/svn-python/libsvn
 -swig_pydir_extra = @[email protected]/svn-python/svn
-+swig_pydir = /usr/lib/python2.6/vendor-packages/libsvn
-+swig_pydir_extra = /usr/lib/python2.6/vendor-packages/svn
++swig_pydir = /usr/lib/python2.7/vendor-packages/libsvn
++swig_pydir_extra = /usr/lib/python2.7/vendor-packages/svn
  swig_pldir = @[email protected]/svn-perl
  swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
  toolsdir = @[email protected]/svn-tools
--- a/components/subversion/subversion-python.p5m	Thu Mar 05 02:10:27 2015 -0800
+++ b/components/subversion/subversion-python.p5m	Thu Mar 05 07:33:27 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -35,60 +35,60 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2006/563
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/__init__.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_client.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_core.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_delta.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_diff.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_fs.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_ra.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_repos.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_wc.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/client.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/core.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/delta.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/diff.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/fs.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/ra.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/repos.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/wc.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/__init__.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/client.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/core.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/delta.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/diff.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/fs.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/ra.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/repos.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/wc.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_client.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_core.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_delta.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_diff.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_fs.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_ra.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_repos.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/_wc.so
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/delta.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/diff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/fs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/ra.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/repos.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/libsvn/wc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/delta.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/diff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/fs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/ra.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/repos.py
+file path=usr/lib/python$(PYVER)/vendor-packages/64/svn/wc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/__init__.py
 
 #
-file path=usr/lib/python2.6/vendor-packages/libsvn/_client.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/_core.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/_delta.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/_diff.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/_fs.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/_ra.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/_repos.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/_wc.so
-file path=usr/lib/python2.6/vendor-packages/libsvn/client.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/core.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/delta.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/diff.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/fs.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/ra.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/repos.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/wc.py
-file path=usr/lib/python2.6/vendor-packages/svn/__init__.py
-file path=usr/lib/python2.6/vendor-packages/svn/client.py
-file path=usr/lib/python2.6/vendor-packages/svn/core.py
-file path=usr/lib/python2.6/vendor-packages/svn/delta.py
-file path=usr/lib/python2.6/vendor-packages/svn/diff.py
-file path=usr/lib/python2.6/vendor-packages/svn/fs.py
-file path=usr/lib/python2.6/vendor-packages/svn/ra.py
-file path=usr/lib/python2.6/vendor-packages/svn/repos.py
-file path=usr/lib/python2.6/vendor-packages/svn/wc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_client.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_core.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_delta.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_diff.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_fs.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_ra.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_repos.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/_wc.so
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/delta.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/diff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/fs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/ra.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/repos.py
+file path=usr/lib/python$(PYVER)/vendor-packages/libsvn/wc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/core.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/delta.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/diff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/fs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/ra.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/repos.py
+file path=usr/lib/python$(PYVER)/vendor-packages/svn/wc.py
 link path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so \
     target=libsvn_swig_py-1.so.0.0.0
 link path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so.0 \