17230899 Enable Kerberos (GSSAPI) in Subversion
authorStefan Teleman <stefan.teleman@oracle.com>
Tue, 01 Oct 2013 12:41:40 -0700
changeset 1493 9fd269654883
parent 1492 96320191bc2e
child 1494 ff3fe8bac31d
17230899 Enable Kerberos (GSSAPI) in Subversion 16782034 library/perl-516/subversion-64 is misnamed
components/subversion/Makefile
components/subversion/patches/001-configure.patch
components/subversion/resolve.deps
components/subversion/subversion-java.p5m
components/subversion/subversion-perl-512.p5m
components/subversion/subversion-perl-516.p5m
components/subversion/subversion-perl-64.p5m
components/subversion/subversion-perl.p5m
components/subversion/subversion-python.p5m
components/subversion/subversion.p5m
--- a/components/subversion/Makefile	Mon Sep 30 23:01:23 2013 -0700
+++ b/components/subversion/Makefile	Tue Oct 01 12:41:40 2013 -0700
@@ -141,6 +141,7 @@
 CONFIGURE_OPTIONS += --with-apr=$(APR-CONFIG.$(BITS))
 CONFIGURE_OPTIONS += --with-apr-util=$(APU-CONFIG.$(BITS))
 CONFIGURE_OPTIONS += --with-apxs=$(APXS.$(BITS))
+CONFIGURE_OPTIONS += --with-gssapi=$(CONFIGURE_PREFIX)
 
 # Swig overwrites the 32-bit directory with 64-bit objects.
 # So we work around that.
@@ -157,6 +158,8 @@
 	    $(GNUCP) -rpd vendor-packages-32/svn vendor-packages/ ; \
 	fi ; )
 
+PKG_MACROS += PERL_ARCH_16="$(PERL_ARCH_16)"
+
 ASLR_MODE=$(ASLR_ENABLE)
 
 build:		$(BUILD_32_and_64)
--- a/components/subversion/patches/001-configure.patch	Mon Sep 30 23:01:23 2013 -0700
+++ b/components/subversion/patches/001-configure.patch	Tue Oct 01 12:41:40 2013 -0700
@@ -95,3 +95,16 @@
  
  
  if test "$svn_lib_neon" = "yes"; then
+--- configure	2013-07-29 12:50:28.716771506 -0700
++++ configure	2013-07-29 13:04:59.668934315 -0700
[email protected]@ -6098,8 +6098,8 @@
+       old_CFLAGS="$CFLAGS"
+       old_LIBS="$LIBS"
+       CFLAGS=""
+-      SVN_GSSAPI_INCLUDES="`$KRB5_CONFIG --cflags`"
+-      SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs gssapi`"
++      SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberosv5"
++      SVN_GSSAPI_LIBS="-lgss"
+       SVN_GSSAPI_LIBS="`
+   input_flags="$SVN_GSSAPI_LIBS"
+   output_flags=""
--- a/components/subversion/resolve.deps	Mon Sep 30 23:01:23 2013 -0700
+++ b/components/subversion/resolve.deps	Tue Oct 01 12:41:40 2013 -0700
@@ -7,3 +7,4 @@
 library/zlib
 system/library
 system/library/c++-runtime
+system/library/security/gss
--- a/components/subversion/subversion-java.p5m	Mon Sep 30 23:01:23 2013 -0700
+++ b/components/subversion/subversion-java.p5m	Tue Oct 01 12:41:40 2013 -0700
@@ -20,31 +20,33 @@
 #
 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/library/java/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/java/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Java bindings for the Subversion SCM"
-set name=com.oracle.info.description value="Java bindings for the Subversion SCM"
-set name=com.oracle.info.tpno value=9086
-set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2006/563
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 # This package name has known conflicts with other packages in the WOS
-set pkg.linted.pkglint.manifest004=true
+set name=pkg.linted.pkglint.manifest004 value=true
+set name=com.oracle.info.description \
+    value="Java bindings for the Subversion SCM"
+set name=com.oracle.info.tpno value=9086
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Source Code Management"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+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)
+link path=usr/lib/svn/$(MACH64)/libsvnjavahl-1.so target=libsvnjavahl-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvnjavahl-1.so.0 \
+    target=libsvnjavahl-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvnjavahl-1.so.0.0.0
+#
+link path=usr/lib/svn/libsvnjavahl-1.so target=libsvnjavahl-1.so.0.0.0
+link path=usr/lib/svn/libsvnjavahl-1.so.0 target=libsvnjavahl-1.so.0.0.0
 
 #
 #
 file path=usr/lib/svn/libsvnjavahl-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvnjavahl-1.so.0.0.0
-file usr/lib/svn/svn-javahl/svn-javahl.jar path=usr/share/lib/java/svn-javahl.jar
-#
-link path=usr/lib/svn/libsvnjavahl-1.so target=libsvnjavahl-1.so.0.0.0
-link path=usr/lib/svn/libsvnjavahl-1.so.0 target=libsvnjavahl-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvnjavahl-1.so \
-    target=libsvnjavahl-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvnjavahl-1.so.0 \
-    target=libsvnjavahl-1.so.0.0.0
+file usr/lib/svn/svn-javahl/svn-javahl.jar \
+    path=usr/share/lib/java/svn-javahl.jar
 #
 license subversion.license license="Apache v2.0"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/subversion/subversion-perl-512.p5m	Tue Oct 01 12:41:40 2013 -0700
@@ -0,0 +1,77 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+<transform file path=usr/perl5/$(PERL_VERSION)/man.+ -> default mangler.man.stability uncommitted>
+
+<transform file path=(usr/perl5/vendor_perl/$(PERL_VERSION)/)(SVN/.+) -> \
+    set action.hash %<\1>$(PERL_ARCH)/%<\2> >
+set name=pkg.fmri \
+    value=pkg:/library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Perl bindings for the Subversion SCM"
+set name=com.oracle.info.description \
+    value="Perl bindings for the Subversion SCM"
+set name=com.oracle.info.tpno value=9086
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Source Code Management"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+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)
+
+#
+link path=usr/lib/svn/libsvn_swig_perl-1.so target=libsvn_swig_perl-1.so.0.0.0
+link path=usr/lib/svn/libsvn_swig_perl-1.so.0 target=libsvn_swig_perl-1.so.0.0.0
+file path=usr/lib/svn/libsvn_swig_perl-1.so.0.0.0
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Base.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Client.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Core.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Delta.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Fs.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Ra.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Repos.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Wc.3
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Client/_Client.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Client/_Client.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Core/_Core.bs
+file \
+    path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Core/_Core.so \
+    pkg.depend.bypass-generate=.*
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Delta/_Delta.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Delta/_Delta.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Fs/_Fs.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Fs/_Fs.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Ra/_Ra.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Ra/_Ra.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Repos/_Repos.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Repos/_Repos.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Wc/_Wc.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Wc/_Wc.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Base.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Client.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Core.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Delta.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Fs.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Ra.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Repos.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Wc.pm
+#
+license subversion.license license="Apache v2.0"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/subversion/subversion-perl-516.p5m	Tue Oct 01 12:41:40 2013 -0700
@@ -0,0 +1,76 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+#
+<transform file path=usr/perl5/5.16/man.+ -> default mangler.man.stability uncommitted>
+
+<transform file path=(usr/perl5/vendor_perl/5.16/)(SVN/.+) -> \
+    set action.hash %<\1>$(PERL_ARCH_16)/%<\2> >
+set name=pkg.fmri \
+    value=pkg:/library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Perl bindings for the Subversion SCM"
+set name=com.oracle.info.description \
+    value="Perl bindings for the Subversion SCM"
+set name=com.oracle.info.tpno value=9086
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Source Code Management"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+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)
+link path=usr/lib/svn/$(MACH64)/libsvn_swig_perl-1.so \
+    target=libsvn_swig_perl-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_swig_perl-1.so.0 \
+    target=libsvn_swig_perl-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_swig_perl-1.so.0.0.0
+file path=usr/perl5/5.16/man/man3/SVN::Base.3
+file path=usr/perl5/5.16/man/man3/SVN::Client.3
+file path=usr/perl5/5.16/man/man3/SVN::Core.3
+file path=usr/perl5/5.16/man/man3/SVN::Delta.3
+file path=usr/perl5/5.16/man/man3/SVN::Fs.3
+file path=usr/perl5/5.16/man/man3/SVN::Ra.3
+file path=usr/perl5/5.16/man/man3/SVN::Repos.3
+file path=usr/perl5/5.16/man/man3/SVN::Wc.3
+file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Client/_Client.bs
+file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Client/_Client.so
+file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Core/_Core.bs
+file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Core/_Core.so \
+    pkg.depend.bypass-generate=.*
+file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Delta/_Delta.bs
+file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Delta/_Delta.so
+file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Fs/_Fs.bs
+file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Fs/_Fs.so
+file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Ra/_Ra.bs
+file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Ra/_Ra.so
+file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Repos/_Repos.bs
+file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Repos/_Repos.so
+file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Wc/_Wc.bs
+file path=usr/perl5/vendor_perl/5.16/$(PERL_ARCH_16)/auto/SVN/_Wc/_Wc.so
+file path=usr/perl5/vendor_perl/5.16/SVN/Base.pm
+file path=usr/perl5/vendor_perl/5.16/SVN/Client.pm
+file path=usr/perl5/vendor_perl/5.16/SVN/Core.pm
+file path=usr/perl5/vendor_perl/5.16/SVN/Delta.pm
+file path=usr/perl5/vendor_perl/5.16/SVN/Fs.pm
+file path=usr/perl5/vendor_perl/5.16/SVN/Ra.pm
+file path=usr/perl5/vendor_perl/5.16/SVN/Repos.pm
+file path=usr/perl5/vendor_perl/5.16/SVN/Wc.pm
+license subversion.license license="Apache v2.0"
+
--- a/components/subversion/subversion-perl-64.p5m	Mon Sep 30 23:01:23 2013 -0700
+++ b/components/subversion/subversion-perl-64.p5m	Tue Oct 01 12:41:40 2013 -0700
@@ -20,73 +20,9 @@
 #
 # Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
 #
-<transform file path=usr/perl5/5.16/man.+ -> default mangler.man.stability uncommitted>
-
-<transform file path=(usr/perl5/vendor_perl/5.16/)(SVN/.+) -> \
-	set action.hash %<\1>i86pc-solaris-64/%<\2> >
-
-<transform file path=(usr/perl5/vendor_perl/5.16/)(SVN/.+) -> \
-	set action.hash %<\1>sun4-solaris-64/%<\2> >
-
-set name=pkg.fmri value=pkg:/library/perl-516/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Perl 64-bit bindings for the Subversion SCM"
-set name=com.oracle.info.description value="the Perl 64-bit bindings for the Subversion SCM"
-set name=com.oracle.info.tpno value=9086
-set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2006/563
+set name=pkg.fmri \
+    value=pkg:/library/perl-516/[email protected]
+set name=pkg.renamed value=true
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-# This package name has known conflicts with other packages in the WOS
-set pkg.linted.pkglint.manifest004=true
-
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64/auto/SVN/_Client/_Client.bs variant.arch=i386
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64/auto/SVN/_Client/_Client.so variant.arch=i386
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64/auto/SVN/_Core/_Core.bs variant.arch=i386
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64/auto/SVN/_Core/_Core.so pkg.depend.bypass-generate=.* variant.arch=i386
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64/auto/SVN/_Delta/_Delta.bs variant.arch=i386
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64/auto/SVN/_Delta/_Delta.so variant.arch=i386
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64/auto/SVN/_Fs/_Fs.bs variant.arch=i386
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64/auto/SVN/_Fs/_Fs.so variant.arch=i386
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64/auto/SVN/_Ra/_Ra.bs variant.arch=i386
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64/auto/SVN/_Ra/_Ra.so variant.arch=i386
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64/auto/SVN/_Repos/_Repos.bs variant.arch=i386
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64/auto/SVN/_Repos/_Repos.so variant.arch=i386
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64/auto/SVN/_Wc/_Wc.bs variant.arch=i386
-file path=usr/perl5/vendor_perl/5.16/i86pc-solaris-64/auto/SVN/_Wc/_Wc.so variant.arch=i386
-
-file path=usr/perl5/vendor_perl/5.16/sun4-solaris-64/auto/SVN/_Client/_Client.bs variant.arch=sparc
-file path=usr/perl5/vendor_perl/5.16/sun4-solaris-64/auto/SVN/_Client/_Client.so variant.arch=sparc
-file path=usr/perl5/vendor_perl/5.16/sun4-solaris-64/auto/SVN/_Core/_Core.bs variant.arch=sparc
-file path=usr/perl5/vendor_perl/5.16/sun4-solaris-64/auto/SVN/_Core/_Core.so pkg.depend.bypass-generate=.* variant.arch=sparc
-file path=usr/perl5/vendor_perl/5.16/sun4-solaris-64/auto/SVN/_Delta/_Delta.bs variant.arch=sparc
-file path=usr/perl5/vendor_perl/5.16/sun4-solaris-64/auto/SVN/_Delta/_Delta.so variant.arch=sparc
-file path=usr/perl5/vendor_perl/5.16/sun4-solaris-64/auto/SVN/_Fs/_Fs.bs variant.arch=sparc
-file path=usr/perl5/vendor_perl/5.16/sun4-solaris-64/auto/SVN/_Fs/_Fs.so variant.arch=sparc
-file path=usr/perl5/vendor_perl/5.16/sun4-solaris-64/auto/SVN/_Ra/_Ra.bs variant.arch=sparc
-file path=usr/perl5/vendor_perl/5.16/sun4-solaris-64/auto/SVN/_Ra/_Ra.so variant.arch=sparc
-file path=usr/perl5/vendor_perl/5.16/sun4-solaris-64/auto/SVN/_Repos/_Repos.bs variant.arch=sparc
-file path=usr/perl5/vendor_perl/5.16/sun4-solaris-64/auto/SVN/_Repos/_Repos.so variant.arch=sparc
-file path=usr/perl5/vendor_perl/5.16/sun4-solaris-64/auto/SVN/_Wc/_Wc.bs variant.arch=sparc
-file path=usr/perl5/vendor_perl/5.16/sun4-solaris-64/auto/SVN/_Wc/_Wc.so variant.arch=sparc
-
-file path=usr/perl5/5.16/man/man3/SVN::Base.3
-file path=usr/perl5/5.16/man/man3/SVN::Client.3
-file path=usr/perl5/5.16/man/man3/SVN::Core.3
-file path=usr/perl5/5.16/man/man3/SVN::Delta.3
-file path=usr/perl5/5.16/man/man3/SVN::Fs.3
-file path=usr/perl5/5.16/man/man3/SVN::Ra.3
-file path=usr/perl5/5.16/man/man3/SVN::Repos.3
-file path=usr/perl5/5.16/man/man3/SVN::Wc.3
-
-file path=usr/lib/svn/$(MACH64)/libsvn_swig_perl-1.so.0.0.0
-
-link path=usr/lib/svn/$(MACH64)/libsvn_swig_perl-1.so \
-	  target=libsvn_swig_perl-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_swig_perl-1.so.0 \
-	  target=libsvn_swig_perl-1.so.0.0.0
-
-license subversion.license license="Apache v2.0"
-
+depend type=require \
+    fmri=library/perl-5/[email protected],5.12-5.12.0.0.0.29.0
--- a/components/subversion/subversion-perl.p5m	Mon Sep 30 23:01:23 2013 -0700
+++ b/components/subversion/subversion-perl.p5m	Tue Oct 01 12:41:40 2013 -0700
@@ -20,59 +20,21 @@
 #
 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
-<transform file path=usr/perl5/$(PERL_VERSION)/man.+ -> default mangler.man.stability uncommitted>
-
-<transform file path=(usr/perl5/vendor_perl/$(PERL_VERSION)/)(SVN/.+) -> \
-	set action.hash %<\1>$(PERL_ARCH)/%<\2> >
-
-set name=pkg.fmri value=pkg:/library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Perl bindings for the Subversion SCM"
-set name=com.oracle.info.description value="Perl bindings for the Subversion SCM"
-set name=com.oracle.info.tpno value=9086
-set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2006/563
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-#
-# This package name has known conflicts with other packages in the WOS
-set pkg.linted.pkglint.manifest004=true
 
-#
-file path=usr/lib/svn/libsvn_swig_perl-1.so.0.0.0
-file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Base.3
-file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Client.3
-file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Core.3
-file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Delta.3
-file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Fs.3
-file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Ra.3
-file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Repos.3
-file path=usr/perl5/$(PERL_VERSION)/man/man3/SVN::Wc.3
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Client/_Client.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Client/_Client.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Core/_Core.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Core/_Core.so pkg.depend.bypass-generate=.*
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Delta/_Delta.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Delta/_Delta.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Fs/_Fs.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Fs/_Fs.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Ra/_Ra.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Ra/_Ra.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Repos/_Repos.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Repos/_Repos.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Wc/_Wc.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SVN/_Wc/_Wc.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Base.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Client.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Core.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Delta.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Fs.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Ra.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Repos.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/SVN/Wc.pm
-#
-link path=usr/lib/svn/libsvn_swig_perl-1.so target=libsvn_swig_perl-1.so.0.0.0
-link path=usr/lib/svn/libsvn_swig_perl-1.so.0 target=libsvn_swig_perl-1.so.0.0.0
-#
-license subversion.license license="Apache v2.0"
+set name=pkg.fmri \
+    value=pkg:/library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Perl bindings for the Subversion SCM"
+set name=com.oracle.info.description \
+    value="Perl bindings for the Subversion SCM"
+set name=com.oracle.info.tpno value=9086
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Source Code Management"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+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)
+depend type=conditional fmri=library/perl-5/subversion-512 \
+    predicate=runtime/perl-512
+depend type=conditional fmri=library/perl-5/subversion-516 \
+    predicate=runtime/perl-516
+
--- a/components/subversion/subversion-python.p5m	Mon Sep 30 23:01:23 2013 -0700
+++ b/components/subversion/subversion-python.p5m	Tue Oct 01 12:41:40 2013 -0700
@@ -20,19 +20,48 @@
 #
 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python bindings for the Subversion SCM"
-set name=com.oracle.info.description value="Python bindings for the Subversion SCM"
-set name=com.oracle.info.tpno value=9086
-set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2006/563
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 # This package name has known conflicts with other packages in the WOS
-set pkg.linted.pkglint.manifest004=true
+set name=pkg.linted.pkglint.manifest004 value=true
+set name=com.oracle.info.description \
+    value="Python bindings for the Subversion SCM"
+set name=com.oracle.info.tpno value=9086
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Source Code Management"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+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/python2.6/vendor-packages/libsvn/_client.so
@@ -51,7 +80,7 @@
 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/libsvn/__init__.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
@@ -60,44 +89,15 @@
 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/python2.6/vendor-packages/svn/__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/libsvn/__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/64/svn/__init__.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 \
+    target=libsvn_swig_py-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so.0.0.0
+link path=usr/lib/svn/libsvn_swig_py-1.so target=libsvn_swig_py-1.so.0.0.0
+#
+link path=usr/lib/svn/libsvn_swig_py-1.so.0 target=libsvn_swig_py-1.so.0.0.0
 #
 file path=usr/lib/svn/libsvn_swig_py-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so.0.0.0
-#
-link path=usr/lib/svn/libsvn_swig_py-1.so.0 target=libsvn_swig_py-1.so.0.0.0
-link path=usr/lib/svn/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 \
-    target=libsvn_swig_py-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so \
-    target=libsvn_swig_py-1.so.0.0.0
 #
 license subversion.license license="Apache v2.0"
--- a/components/subversion/subversion.p5m	Mon Sep 30 23:01:23 2013 -0700
+++ b/components/subversion/subversion.p5m	Tue Oct 01 12:41:40 2013 -0700
@@ -22,41 +22,40 @@
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file  path=usr/include/svn/(.+)$ -> \
-	set action.hash usr/include/subversion-1/%<\1> >
-
-set name=pkg.fmri value=pkg:/developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+    set action.hash usr/include/subversion-1/%<\1> >
+set name=pkg.fmri \
+    value=pkg:/developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Subversion source code management system"
-set name=pkg.description value="A full-featured version control and source code management system designed to be a better CVS"
-set name=com.oracle.info.description value="the Subversion source code management system"
-set name=com.oracle.info.tpno value=9086
-set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2006/563
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=pkg.description \
+    value="A full-featured version control and source code management system designed to be a better CVS"
 #
 # This package name has known conflicts with other packages in the WOS
-set pkg.linted.pkglint.manifest004=true
+set name=pkg.linted.pkglint.manifest004 value=true
+set name=com.oracle.info.description \
+    value="the Subversion source code management system"
+set name=com.oracle.info.tpno value=9086
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Source Code Management"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+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/apache2/2.2/libexec/$(MACH64)/mod_authz_svn.so
+file path=usr/apache2/2.2/libexec/$(MACH64)/mod_dav_svn.so
+file path=usr/apache2/2.2/libexec/$(MACH64)/mod_dontdothat.so
 
 #
 file path=usr/apache2/2.2/libexec/mod_authz_svn.so
 file path=usr/apache2/2.2/libexec/mod_dav_svn.so
 file path=usr/apache2/2.2/libexec/mod_dontdothat.so
-
-file path=usr/apache2/2.2/libexec/$(MACH64)/mod_authz_svn.so
-file path=usr/apache2/2.2/libexec/$(MACH64)/mod_dav_svn.so
-file path=usr/apache2/2.2/libexec/$(MACH64)/mod_dontdothat.so
-
-file usr/bin/$(MACH64)/svn              path=usr/bin/svn
-file usr/bin/$(MACH64)/svnadmin         path=usr/bin/svnadmin
-file usr/bin/$(MACH64)/svndumpfilter    path=usr/bin/svndumpfilter
-file usr/bin/$(MACH64)/svnlook          path=usr/bin/svnlook
-file usr/bin/$(MACH64)/svnrdump         path=usr/bin/svnrdump
-file usr/bin/$(MACH64)/svnserve         path=usr/bin/svnserve
-file usr/bin/$(MACH64)/svnsync          path=usr/bin/svnsync
-file usr/bin/$(MACH64)/svnversion       path=usr/bin/svnversion
-
+file usr/bin/$(MACH64)/svn path=usr/bin/svn
+file usr/bin/$(MACH64)/svnadmin path=usr/bin/svnadmin
+file usr/bin/$(MACH64)/svndumpfilter path=usr/bin/svndumpfilter
+file usr/bin/$(MACH64)/svnlook path=usr/bin/svnlook
+file usr/bin/$(MACH64)/svnrdump path=usr/bin/svnrdump
+file usr/bin/$(MACH64)/svnserve path=usr/bin/svnserve
+file usr/bin/$(MACH64)/svnsync path=usr/bin/svnsync
+file usr/bin/$(MACH64)/svnversion path=usr/bin/svnversion
 file path=usr/include/svn/mod_authz_svn.h
 file path=usr/include/svn/mod_dav_svn.h
 file path=usr/include/svn/svn_auth.h
@@ -99,35 +98,98 @@
 file path=usr/include/svn/svn_version.h
 file path=usr/include/svn/svn_wc.h
 file path=usr/include/svn/svn_xml.h
-
+link path=usr/lib/svn/$(MACH64)/libsvn_client-1.so \
+    target=libsvn_client-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_client-1.so.0 \
+    target=libsvn_client-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_client-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_delta-1.so target=libsvn_delta-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_delta-1.so.0 \
+    target=libsvn_delta-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_delta-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_diff-1.so target=libsvn_diff-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_diff-1.so.0 target=libsvn_diff-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_diff-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_fs-1.so target=libsvn_fs-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_fs-1.so.0 target=libsvn_fs-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_fs-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_fs_fs-1.so target=libsvn_fs_fs-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_fs_fs-1.so.0 \
+    target=libsvn_fs_fs-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_fs_fs-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_fs_util-1.so \
+    target=libsvn_fs_util-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_fs_util-1.so.0 \
+    target=libsvn_fs_util-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_fs_util-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_ra-1.so target=libsvn_ra-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_ra-1.so.0 target=libsvn_ra-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_ra-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_ra_local-1.so \
+    target=libsvn_ra_local-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_ra_local-1.so.0 \
+    target=libsvn_ra_local-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_ra_local-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_ra_neon-1.so \
+    target=libsvn_ra_neon-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_ra_neon-1.so.0 \
+    target=libsvn_ra_neon-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_ra_neon-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_ra_svn-1.so \
+    target=libsvn_ra_svn-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_ra_svn-1.so.0 \
+    target=libsvn_ra_svn-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_ra_svn-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_repos-1.so target=libsvn_repos-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_repos-1.so.0 \
+    target=libsvn_repos-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_repos-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_subr-1.so target=libsvn_subr-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_subr-1.so.0 target=libsvn_subr-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_subr-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_wc-1.so target=libsvn_wc-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_wc-1.so.0 target=libsvn_wc-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_wc-1.so.0.0.0
+link path=usr/lib/svn/libsvn_client-1.so target=libsvn_client-1.so.0.0.0
+#
+link path=usr/lib/svn/libsvn_client-1.so.0 target=libsvn_client-1.so.0.0.0
 file path=usr/lib/svn/libsvn_client-1.so.0.0.0
+link path=usr/lib/svn/libsvn_delta-1.so target=libsvn_delta-1.so.0.0.0
+link path=usr/lib/svn/libsvn_delta-1.so.0 target=libsvn_delta-1.so.0.0.0
 file path=usr/lib/svn/libsvn_delta-1.so.0.0.0
+link path=usr/lib/svn/libsvn_diff-1.so target=libsvn_diff-1.so.0.0.0
+link path=usr/lib/svn/libsvn_diff-1.so.0 target=libsvn_diff-1.so.0.0.0
 file path=usr/lib/svn/libsvn_diff-1.so.0.0.0
+link path=usr/lib/svn/libsvn_fs-1.so target=libsvn_fs-1.so.0.0.0
+link path=usr/lib/svn/libsvn_fs-1.so.0 target=libsvn_fs-1.so.0.0.0
 file path=usr/lib/svn/libsvn_fs-1.so.0.0.0
+link path=usr/lib/svn/libsvn_fs_fs-1.so target=libsvn_fs_fs-1.so.0.0.0
+link path=usr/lib/svn/libsvn_fs_fs-1.so.0 target=libsvn_fs_fs-1.so.0.0.0
 file path=usr/lib/svn/libsvn_fs_fs-1.so.0.0.0
+link path=usr/lib/svn/libsvn_fs_util-1.so target=libsvn_fs_util-1.so.0.0.0
+link path=usr/lib/svn/libsvn_fs_util-1.so.0 target=libsvn_fs_util-1.so.0.0.0
 file path=usr/lib/svn/libsvn_fs_util-1.so.0.0.0
+link path=usr/lib/svn/libsvn_ra-1.so target=libsvn_ra-1.so.0.0.0
+link path=usr/lib/svn/libsvn_ra-1.so.0 target=libsvn_ra-1.so.0.0.0
 file path=usr/lib/svn/libsvn_ra-1.so.0.0.0
+link path=usr/lib/svn/libsvn_ra_local-1.so target=libsvn_ra_local-1.so.0.0.0
+link path=usr/lib/svn/libsvn_ra_local-1.so.0 target=libsvn_ra_local-1.so.0.0.0
 file path=usr/lib/svn/libsvn_ra_local-1.so.0.0.0
+link path=usr/lib/svn/libsvn_ra_neon-1.so target=libsvn_ra_neon-1.so.0.0.0
+link path=usr/lib/svn/libsvn_ra_neon-1.so.0 target=libsvn_ra_neon-1.so.0.0.0
 file path=usr/lib/svn/libsvn_ra_neon-1.so.0.0.0
+link path=usr/lib/svn/libsvn_ra_svn-1.so target=libsvn_ra_svn-1.so.0.0.0
+link path=usr/lib/svn/libsvn_ra_svn-1.so.0 target=libsvn_ra_svn-1.so.0.0.0
 file path=usr/lib/svn/libsvn_ra_svn-1.so.0.0.0
+link path=usr/lib/svn/libsvn_repos-1.so target=libsvn_repos-1.so.0.0.0
+link path=usr/lib/svn/libsvn_repos-1.so.0 target=libsvn_repos-1.so.0.0.0
 file path=usr/lib/svn/libsvn_repos-1.so.0.0.0
+link path=usr/lib/svn/libsvn_subr-1.so target=libsvn_subr-1.so.0.0.0
+link path=usr/lib/svn/libsvn_subr-1.so.0 target=libsvn_subr-1.so.0.0.0
 file path=usr/lib/svn/libsvn_subr-1.so.0.0.0
+link path=usr/lib/svn/libsvn_wc-1.so target=libsvn_wc-1.so.0.0.0
+link path=usr/lib/svn/libsvn_wc-1.so.0 target=libsvn_wc-1.so.0.0.0
 file path=usr/lib/svn/libsvn_wc-1.so.0.0.0
-
-file path=usr/lib/svn/$(MACH64)/libsvn_client-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_delta-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_diff-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_fs-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_fs_fs-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_fs_util-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_ra-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_ra_local-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_ra_neon-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_ra_svn-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_repos-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_subr-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_wc-1.so.0.0.0
-
 file path=usr/share/locale/de/LC_MESSAGES/subversion.mo
 file path=usr/share/locale/es/LC_MESSAGES/subversion.mo
 file path=usr/share/locale/fr/LC_MESSAGES/subversion.mo
@@ -150,84 +212,4 @@
 file path=usr/share/man/man5/svnserve.conf.5
 file path=usr/share/man/man8/svnserve.8
 #
-link path=usr/lib/svn/libsvn_client-1.so.0 target=libsvn_client-1.so.0.0.0
-link path=usr/lib/svn/libsvn_client-1.so target=libsvn_client-1.so.0.0.0
-link path=usr/lib/svn/libsvn_delta-1.so.0 target=libsvn_delta-1.so.0.0.0
-link path=usr/lib/svn/libsvn_delta-1.so target=libsvn_delta-1.so.0.0.0
-link path=usr/lib/svn/libsvn_diff-1.so.0 target=libsvn_diff-1.so.0.0.0
-link path=usr/lib/svn/libsvn_diff-1.so target=libsvn_diff-1.so.0.0.0
-link path=usr/lib/svn/libsvn_fs-1.so.0 target=libsvn_fs-1.so.0.0.0
-link path=usr/lib/svn/libsvn_fs-1.so target=libsvn_fs-1.so.0.0.0
-link path=usr/lib/svn/libsvn_fs_fs-1.so.0 target=libsvn_fs_fs-1.so.0.0.0
-link path=usr/lib/svn/libsvn_fs_fs-1.so target=libsvn_fs_fs-1.so.0.0.0
-link path=usr/lib/svn/libsvn_fs_util-1.so.0 target=libsvn_fs_util-1.so.0.0.0
-link path=usr/lib/svn/libsvn_fs_util-1.so target=libsvn_fs_util-1.so.0.0.0
-link path=usr/lib/svn/libsvn_ra-1.so.0 target=libsvn_ra-1.so.0.0.0
-link path=usr/lib/svn/libsvn_ra-1.so target=libsvn_ra-1.so.0.0.0
-link path=usr/lib/svn/libsvn_ra_local-1.so.0 target=libsvn_ra_local-1.so.0.0.0
-link path=usr/lib/svn/libsvn_ra_local-1.so target=libsvn_ra_local-1.so.0.0.0
-link path=usr/lib/svn/libsvn_ra_neon-1.so.0 target=libsvn_ra_neon-1.so.0.0.0
-link path=usr/lib/svn/libsvn_ra_neon-1.so target=libsvn_ra_neon-1.so.0.0.0
-link path=usr/lib/svn/libsvn_ra_svn-1.so.0 target=libsvn_ra_svn-1.so.0.0.0
-link path=usr/lib/svn/libsvn_ra_svn-1.so target=libsvn_ra_svn-1.so.0.0.0
-link path=usr/lib/svn/libsvn_repos-1.so.0 target=libsvn_repos-1.so.0.0.0
-link path=usr/lib/svn/libsvn_repos-1.so target=libsvn_repos-1.so.0.0.0
-link path=usr/lib/svn/libsvn_subr-1.so.0 target=libsvn_subr-1.so.0.0.0
-link path=usr/lib/svn/libsvn_subr-1.so target=libsvn_subr-1.so.0.0.0
-link path=usr/lib/svn/libsvn_wc-1.so.0 target=libsvn_wc-1.so.0.0.0
-link path=usr/lib/svn/libsvn_wc-1.so target=libsvn_wc-1.so.0.0.0
-
-link path=usr/lib/svn/$(MACH64)/libsvn_client-1.so.0 \
-  target=libsvn_client-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_client-1.so \
-  target=libsvn_client-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_delta-1.so.0 \
-  target=libsvn_delta-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_delta-1.so \
-  target=libsvn_delta-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_diff-1.so.0 \
-  target=libsvn_diff-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_diff-1.so \
-  target=libsvn_diff-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_fs-1.so.0 \
-  target=libsvn_fs-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_fs-1.so \
-  target=libsvn_fs-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_fs_fs-1.so.0 \
-  target=libsvn_fs_fs-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_fs_fs-1.so \
-  target=libsvn_fs_fs-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_fs_util-1.so.0 \
-  target=libsvn_fs_util-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_fs_util-1.so \
-  target=libsvn_fs_util-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_ra-1.so.0 \
-  target=libsvn_ra-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_ra-1.so \
-  target=libsvn_ra-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_ra_local-1.so.0 \
-  target=libsvn_ra_local-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_ra_local-1.so \
-  target=libsvn_ra_local-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_ra_neon-1.so.0 \
-  target=libsvn_ra_neon-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_ra_neon-1.so \
-  target=libsvn_ra_neon-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_ra_svn-1.so.0 \
-  target=libsvn_ra_svn-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_ra_svn-1.so \
-  target=libsvn_ra_svn-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_repos-1.so.0 \
-  target=libsvn_repos-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_repos-1.so \
-  target=libsvn_repos-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_subr-1.so.0 \
-  target=libsvn_subr-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_subr-1.so \
-  target=libsvn_subr-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_wc-1.so.0 \
-  target=libsvn_wc-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_wc-1.so \
-  target=libsvn_wc-1.so.0.0.0
-#
 license subversion.license license="Apache v2.0"