--- a/components/subversion/subversion.p5m Thu Feb 26 06:52:41 2015 -0800
+++ b/components/subversion/subversion.p5m Thu Feb 26 10:02:54 2015 -0800
@@ -18,17 +18,21 @@
#
# 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.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
<transform file path=usr/include/svn/(.+)$ -> \
set action.hash usr/include/subversion-1/%<\1> >
+
+# prevents "64bit file in 32bit path" errors
+<transform file path=usr/apache2/2.4/libexec/.*\.so -> \
+ add pkg.linted.userland.action001.2 true>
set name=pkg.fmri \
value=pkg:/developer/versioning/subversion@$(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"
-#
+
# This package name has known conflicts with other packages in the WOS
set name=pkg.linted.pkglint.manifest004 value=true
set name=com.oracle.info.description \
@@ -40,14 +44,12 @@
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.4/libexec/mod_authz_svn.so
+file path=usr/apache2/2.4/libexec/mod_dav_svn.so
+file path=usr/apache2/2.4/libexec/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
@@ -56,48 +58,52 @@
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
-file path=usr/include/svn/svn_base64.h
-file path=usr/include/svn/svn_checksum.h
-file path=usr/include/svn/svn_client.h
-file path=usr/include/svn/svn_cmdline.h
-file path=usr/include/svn/svn_compat.h
-file path=usr/include/svn/svn_config.h
-file path=usr/include/svn/svn_ctype.h
-file path=usr/include/svn/svn_dav.h
-file path=usr/include/svn/svn_delta.h
-file path=usr/include/svn/svn_diff.h
-file path=usr/include/svn/svn_dirent_uri.h
-file path=usr/include/svn/svn_dso.h
-file path=usr/include/svn/svn_error.h
-file path=usr/include/svn/svn_error_codes.h
-file path=usr/include/svn/svn_fs.h
-file path=usr/include/svn/svn_hash.h
-file path=usr/include/svn/svn_io.h
-file path=usr/include/svn/svn_iter.h
-file path=usr/include/svn/svn_md5.h
-file path=usr/include/svn/svn_mergeinfo.h
-file path=usr/include/svn/svn_nls.h
-file path=usr/include/svn/svn_opt.h
-file path=usr/include/svn/svn_path.h
-file path=usr/include/svn/svn_pools.h
-file path=usr/include/svn/svn_props.h
-file path=usr/include/svn/svn_quoprint.h
-file path=usr/include/svn/svn_ra.h
-file path=usr/include/svn/svn_ra_svn.h
-file path=usr/include/svn/svn_repos.h
-file path=usr/include/svn/svn_sorts.h
-file path=usr/include/svn/svn_string.h
-file path=usr/include/svn/svn_subst.h
-file path=usr/include/svn/svn_time.h
-file path=usr/include/svn/svn_types.h
-file path=usr/include/svn/svn_user.h
-file path=usr/include/svn/svn_utf.h
-file path=usr/include/svn/svn_version.h
-file path=usr/include/svn/svn_wc.h
-file path=usr/include/svn/svn_xml.h
+file usr/include/subversion-1/mod_dav_svn.h path=usr/include/svn/mod_dav_svn.h
+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 \
+ path=usr/include/svn/svn_cache_config.h
+file usr/include/subversion-1/svn_checksum.h path=usr/include/svn/svn_checksum.h
+file usr/include/subversion-1/svn_client.h path=usr/include/svn/svn_client.h
+file usr/include/subversion-1/svn_cmdline.h path=usr/include/svn/svn_cmdline.h
+file usr/include/subversion-1/svn_compat.h path=usr/include/svn/svn_compat.h
+file usr/include/subversion-1/svn_config.h path=usr/include/svn/svn_config.h
+file usr/include/subversion-1/svn_ctype.h path=usr/include/svn/svn_ctype.h
+file usr/include/subversion-1/svn_dav.h path=usr/include/svn/svn_dav.h
+file usr/include/subversion-1/svn_delta.h path=usr/include/svn/svn_delta.h
+file usr/include/subversion-1/svn_diff.h path=usr/include/svn/svn_diff.h
+file usr/include/subversion-1/svn_dirent_uri.h \
+ path=usr/include/svn/svn_dirent_uri.h
+file usr/include/subversion-1/svn_dso.h path=usr/include/svn/svn_dso.h
+file usr/include/subversion-1/svn_error.h path=usr/include/svn/svn_error.h
+file usr/include/subversion-1/svn_error_codes.h \
+ path=usr/include/svn/svn_error_codes.h
+file usr/include/subversion-1/svn_fs.h path=usr/include/svn/svn_fs.h
+file usr/include/subversion-1/svn_hash.h path=usr/include/svn/svn_hash.h
+file usr/include/subversion-1/svn_io.h path=usr/include/svn/svn_io.h
+file usr/include/subversion-1/svn_iter.h path=usr/include/svn/svn_iter.h
+file usr/include/subversion-1/svn_md5.h path=usr/include/svn/svn_md5.h
+file usr/include/subversion-1/svn_mergeinfo.h \
+ path=usr/include/svn/svn_mergeinfo.h
+file usr/include/subversion-1/svn_nls.h path=usr/include/svn/svn_nls.h
+file usr/include/subversion-1/svn_opt.h path=usr/include/svn/svn_opt.h
+file usr/include/subversion-1/svn_path.h path=usr/include/svn/svn_path.h
+file usr/include/subversion-1/svn_pools.h path=usr/include/svn/svn_pools.h
+file usr/include/subversion-1/svn_props.h path=usr/include/svn/svn_props.h
+file usr/include/subversion-1/svn_quoprint.h path=usr/include/svn/svn_quoprint.h
+file usr/include/subversion-1/svn_ra.h path=usr/include/svn/svn_ra.h
+file usr/include/subversion-1/svn_ra_svn.h path=usr/include/svn/svn_ra_svn.h
+file usr/include/subversion-1/svn_repos.h path=usr/include/svn/svn_repos.h
+file usr/include/subversion-1/svn_sorts.h path=usr/include/svn/svn_sorts.h
+file usr/include/subversion-1/svn_string.h path=usr/include/svn/svn_string.h
+file usr/include/subversion-1/svn_subst.h path=usr/include/svn/svn_subst.h
+file usr/include/subversion-1/svn_time.h path=usr/include/svn/svn_time.h
+file usr/include/subversion-1/svn_types.h path=usr/include/svn/svn_types.h
+file usr/include/subversion-1/svn_user.h path=usr/include/svn/svn_user.h
+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_xml.h 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 \
@@ -211,5 +217,5 @@
file path=usr/share/man/man1/svnversion.1
file path=usr/share/man/man5/svnserve.conf.5
file path=usr/share/man/man8/svnserve.8
-#
license subversion.license license="Apache v2.0"
+