--- a/components/subversion/subversion.p5m Thu Apr 14 15:10:58 2016 -0700
+++ b/components/subversion/subversion.p5m Thu Apr 14 16:43:46 2016 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
<transform file path=usr/include/svn/(.+)$ -> \
@@ -46,20 +46,16 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
file path=usr/apache2/2.4/libexec/mod_authz_svn.so
file path=usr/apache2/2.4/libexec/mod_dav_svn.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/include/subversion-1/mod_authz_svn.h \
- path=usr/include/svn/mod_authz_svn.h
+file path=usr/apache2/2.4/libexec/mod_dontdothat.so
+file path=usr/bin/svn
+file path=usr/bin/svnadmin
+file path=usr/bin/svndumpfilter
+file path=usr/bin/svnlook
+file path=usr/bin/svnrdump
+file path=usr/bin/svnserve
+file path=usr/bin/svnsync
+file path=usr/bin/svnversion
file usr/include/subversion-1/mod_dav_svn.h path=usr/include/svn/mod_dav_svn.h
-file usr/include/subversion-1/svn-revision.txt \
- path=usr/include/svn/svn-revision.txt
file usr/include/subversion-1/svn_auth.h path=usr/include/svn/svn_auth.h
file usr/include/subversion-1/svn_base64.h path=usr/include/svn/svn_base64.h
file usr/include/subversion-1/svn_cache_config.h \
@@ -104,100 +100,7 @@
file usr/include/subversion-1/svn_utf.h path=usr/include/svn/svn_utf.h
file usr/include/subversion-1/svn_version.h path=usr/include/svn/svn_version.h
file usr/include/subversion-1/svn_wc.h path=usr/include/svn/svn_wc.h
-file usr/include/subversion-1/svn_x509.h path=usr/include/svn/svn_x509.h
file usr/include/subversion-1/svn_xml.h path=usr/include/svn/svn_xml.h
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_auth_gnome_keyring.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_auth_gnome_keyring.pc
-#
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_auth_gnome_keyring.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_auth_gnome_keyring.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_client.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_client.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_client.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_client.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_delta.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_delta.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_delta.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_delta.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_diff.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_diff.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_diff.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_diff.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs_fs.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs_fs.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs_fs.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs_fs.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs_util.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs_util.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs_util.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs_util.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs_x.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs_x.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_fs_x.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_fs_x.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra_local.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra_local.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra_local.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra_local.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra_serf.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra_serf.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra_serf.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra_serf.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra_svn.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra_svn.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_ra_svn.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_ra_svn.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_repos.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_repos.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_repos.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_repos.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_subr.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_subr.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_subr.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_subr.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_wc.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_wc.pc
-file usr/lib/svn/$(MACH64)/pkgconfig/libsvn_wc.pc \
- path=usr/lib/$(MACH64)/pkgconfig/libsvn_wc.pc
-#
-file usr/lib/svn/pkgconfig/libsvn_auth_gnome_keyring.pc \
- path=usr/lib/pkgconfig/libsvn_auth_gnome_keyring.pc
-file usr/lib/svn/pkgconfig/libsvn_client.pc \
- path=usr/lib/pkgconfig/libsvn_client.pc
-file usr/lib/svn/pkgconfig/libsvn_delta.pc \
- path=usr/lib/pkgconfig/libsvn_delta.pc
-file usr/lib/svn/pkgconfig/libsvn_diff.pc path=usr/lib/pkgconfig/libsvn_diff.pc
-file usr/lib/svn/pkgconfig/libsvn_fs.pc path=usr/lib/pkgconfig/libsvn_fs.pc
-file usr/lib/svn/pkgconfig/libsvn_fs_fs.pc \
- path=usr/lib/pkgconfig/libsvn_fs_fs.pc
-file usr/lib/svn/pkgconfig/libsvn_fs_util.pc \
- path=usr/lib/pkgconfig/libsvn_fs_util.pc
-file usr/lib/svn/pkgconfig/libsvn_fs_x.pc path=usr/lib/pkgconfig/libsvn_fs_x.pc
-file usr/lib/svn/pkgconfig/libsvn_ra.pc path=usr/lib/pkgconfig/libsvn_ra.pc
-file usr/lib/svn/pkgconfig/libsvn_ra_local.pc \
- path=usr/lib/pkgconfig/libsvn_ra_local.pc
-file usr/lib/svn/pkgconfig/libsvn_ra_serf.pc \
- path=usr/lib/pkgconfig/libsvn_ra_serf.pc
-file usr/lib/svn/pkgconfig/libsvn_ra_svn.pc \
- path=usr/lib/pkgconfig/libsvn_ra_svn.pc
-file usr/lib/svn/pkgconfig/libsvn_repos.pc \
- path=usr/lib/pkgconfig/libsvn_repos.pc
-file usr/lib/svn/pkgconfig/libsvn_subr.pc path=usr/lib/pkgconfig/libsvn_subr.pc
-file usr/lib/svn/pkgconfig/libsvn_wc.pc path=usr/lib/pkgconfig/libsvn_wc.pc
-#
-link path=usr/lib/svn/$(MACH64)/libsvn_auth_gnome_keyring-1.so \
- target=libsvn_auth_gnome_keyring-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_auth_gnome_keyring-1.so.0 \
- target=libsvn_auth_gnome_keyring-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_auth_gnome_keyring-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_client-1.so.0 \
@@ -222,9 +125,6 @@
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_fs_x-1.so target=libsvn_fs_x-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_fs_x-1.so.0 target=libsvn_fs_x-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_fs_x-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
@@ -233,11 +133,11 @@
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_serf-1.so \
- target=libsvn_ra_serf-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_ra_serf-1.so.0 \
- target=libsvn_ra_serf-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_ra_serf-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 \
@@ -253,13 +153,8 @@
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_auth_gnome_keyring-1.so \
- target=libsvn_auth_gnome_keyring-1.so.0.0.0
-link path=usr/lib/svn/libsvn_auth_gnome_keyring-1.so.0 \
- target=libsvn_auth_gnome_keyring-1.so.0.0.0
-file path=usr/lib/svn/libsvn_auth_gnome_keyring-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
@@ -277,18 +172,15 @@
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_fs_x-1.so target=libsvn_fs_x-1.so.0.0.0
-link path=usr/lib/svn/libsvn_fs_x-1.so.0 target=libsvn_fs_x-1.so.0.0.0
-file path=usr/lib/svn/libsvn_fs_x-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_serf-1.so target=libsvn_ra_serf-1.so.0.0.0
-link path=usr/lib/svn/libsvn_ra_serf-1.so.0 target=libsvn_ra_serf-1.so.0.0.0
-file path=usr/lib/svn/libsvn_ra_serf-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
@@ -301,8 +193,6 @@
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/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
@@ -315,7 +205,6 @@
file path=usr/share/locale/sv/LC_MESSAGES/subversion.mo
file path=usr/share/locale/zh_CN/LC_MESSAGES/subversion.mo
file path=usr/share/locale/zh_TW/LC_MESSAGES/subversion.mo
-#
file path=usr/share/man/man1/svn.1
file path=usr/share/man/man1/svnadmin.1
file path=usr/share/man/man1/svndumpfilter.1