# HG changeset patch
# User Stacy Yeh <stacy.yeh@oracle.com>
# Date 1431624986 25200
# Node ID 8e6a71e8754b40f08b34a0b14a0bca815b0353b6
# Parent  17b5d565eb85b4bb632e6fd60cd93e2e5340c1d2
19810791 Numerous Userland components have an unwanted back slash

diff -r 17b5d565eb85 -r 8e6a71e8754b components/berkeleydb/berkeleydb.p5m
--- a/components/berkeleydb/berkeleydb.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/berkeleydb/berkeleydb.p5m	Thu May 14 10:36:26 2015 -0700
@@ -24,7 +24,7 @@
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
-<transform file path=usr/share/doc/bdb/(.*) -> set action.hash usr/docs/%<\1> >
+<transform file path=usr/share/doc/bdb/(.*) -> set action.hash usr/docs/%<1> >
 set name=pkg.fmri \
     value=pkg:/database/berkeleydb-5@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Oracle Berkeley DB"
diff -r 17b5d565eb85 -r 8e6a71e8754b components/bind/bind.p5m
--- a/components/bind/bind.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/bind/bind.p5m	Thu May 14 10:36:26 2015 -0700
@@ -22,7 +22,7 @@
 #
 
 <transform file path=usr/share/doc/bind/html/(.+)$ -> \
-    set action.hash doc/arm/%<\1> >
+    set action.hash doc/arm/%<1> >
 set name=pkg.fmri \
     value=pkg:/service/network/dns/bind@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="BIND DNS name server and configuration tools."
diff -r 17b5d565eb85 -r 8e6a71e8754b components/curl/curl.p5m
--- a/components/curl/curl.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/curl/curl.p5m	Thu May 14 10:36:26 2015 -0700
@@ -22,9 +22,9 @@
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/share/doc/curl/html/(.+)$ -> \
-    set action.hash curl-$(COMPONENT_VERSION)/docs/%<\1> >
+    set action.hash curl-$(COMPONENT_VERSION)/docs/%<1> >
 <transform file path=usr/share/doc/libcurl/html/(.+)$ -> \
-    set action.hash curl-$(COMPONENT_VERSION)/docs/libcurl/%<\1> >
+    set action.hash curl-$(COMPONENT_VERSION)/docs/libcurl/%<1> >
 set name=pkg.fmri value=pkg:/web/curl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The CURL Network Utility and Library"
 set name=pkg.description \
diff -r 17b5d565eb85 -r 8e6a71e8754b components/elinks/elinks.p5m
--- a/components/elinks/elinks.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/elinks/elinks.p5m	Thu May 14 10:36:26 2015 -0700
@@ -20,7 +20,7 @@
 #
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
-<transform file path=usr/share/doc/elinks/(.+$) -> set action.hash doc/%<\1> >
+<transform file path=usr/share/doc/elinks/(.+$) -> set action.hash doc/%<1> >
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/web/browser/elinks@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff -r 17b5d565eb85 -r 8e6a71e8754b components/fastcgi/fcgi-doc.p5m
--- a/components/fastcgi/fcgi-doc.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/fastcgi/fcgi-doc.p5m	Thu May 14 10:36:26 2015 -0700
@@ -22,7 +22,7 @@
 #
 
 # These are not installed, but can be found in the doc directory.
-<transform file path=usr/share/doc/fastcgi/(.+)$ -> set action.hash doc/%<\1> >
+<transform file path=usr/share/doc/fastcgi/(.+)$ -> set action.hash doc/%<1> >
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/fastcgi/documentation@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff -r 17b5d565eb85 -r 8e6a71e8754b components/gcc3/gcc-3.p5m
--- a/components/gcc3/gcc-3.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/gcc3/gcc-3.p5m	Thu May 14 10:36:26 2015 -0700
@@ -23,7 +23,7 @@
 
 <transform file path=usr/.*/man/.* -> default mangler.man.stability volatile >
 # they are installed in share/locale, but that is accessed through a link
-<transform file path=usr/gcc/3.4/lib/locale(.*)$ -> set action.hash /usr/gcc/3.4/share/locale/%<\1> >
+<transform file path=usr/gcc/3.4/lib/locale(.*)$ -> set action.hash /usr/gcc/3.4/share/locale/%<1> >
 
 # All files and hardlinks installed under /usr/gcc/3.4/bin should have
 # equivalent links under /usr/sfw/bin for backward compatibility.
diff -r 17b5d565eb85 -r 8e6a71e8754b components/gnupg/gnupg.p5m
--- a/components/gnupg/gnupg.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/gnupg/gnupg.p5m	Thu May 14 10:36:26 2015 -0700
@@ -21,7 +21,7 @@
 # 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/share/gnupg/help\.([^/]+)(\..+){0,1}(/.+){0,1}\.txt$ -> default facet.locale.%<\1> true>
+<transform file path=usr/share/gnupg/help\.([^/]+)(\..+){0,1}(/.+){0,1}\.txt$ -> default facet.locale.%<1> true>
 set name=pkg.fmri \
     value=pkg:/crypto/gnupg@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU Privacy Guard"
diff -r 17b5d565eb85 -r 8e6a71e8754b components/gnuplot/gnuplot.p5m
--- a/components/gnuplot/gnuplot.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/gnuplot/gnuplot.p5m	Thu May 14 10:36:26 2015 -0700
@@ -20,7 +20,7 @@
 #
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
-<transform file path=usr/demo/gnuplot/(.+[.-].+)$ -> set action.hash demo/%<\1> >
+<transform file path=usr/demo/gnuplot/(.+[.-].+)$ -> set action.hash demo/%<1> >
 set name=pkg.fmri \
     value=pkg:/image/gnuplot@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="gnuplot - plotting utility"
diff -r 17b5d565eb85 -r 8e6a71e8754b components/jansson/jansson.p5m
--- a/components/jansson/jansson.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/jansson/jansson.p5m	Thu May 14 10:36:26 2015 -0700
@@ -18,11 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-<transform file path=usr/share/doc/jansson-$(COMPONENT_VERSION)/html/(.+)$ -> set action.hash doc/html/%<\1>>
+<transform file path=usr/share/doc/jansson-$(COMPONENT_VERSION)/html/(.+)$ -> set action.hash doc/html/%<1>>
 set name=pkg.fmri \
     value=pkg:/library/jansson@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Jansson - C library for working with JSON data"
diff -r 17b5d565eb85 -r 8e6a71e8754b components/junit/junit.p5m
--- a/components/junit/junit.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/junit/junit.p5m	Thu May 14 10:36:26 2015 -0700
@@ -22,11 +22,11 @@
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-<transform file path=usr/share/doc/junit/(.+)$ -> set action.hash %<\1> >
+<transform file path=usr/share/doc/junit/(.+)$ -> set action.hash %<1> >
 <transform file path=usr/share/doc/junit/samples/org/junit/samples/(.+)$ -> \
     set action.hash junit/samples/%<1> >
-<transform file path=usr/share/lib/java/(.+)$ -> set action.hash %<\1> >
-<transform file path=usr/share/lib/java/javadoc/junit/(.+)$ -> set action.hash %<\1> >
+<transform file path=usr/share/lib/java/(.+)$ -> set action.hash %<1> >
+<transform file path=usr/share/lib/java/javadoc/junit/(.+)$ -> set action.hash %<1> >
 set name=pkg.fmri \
     value=pkg:/developer/java/junit@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Junit - Java unit testing framework"
diff -r 17b5d565eb85 -r 8e6a71e8754b components/ksh93/developer-astdev93.p5m
--- a/components/ksh93/developer-astdev93.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/ksh93/developer-astdev93.p5m	Thu May 14 10:36:26 2015 -0700
@@ -25,7 +25,7 @@
 
 # The man pages are all at the top of a "files" directory; setting the hash to
 # # point to the files therein.
-<transform file path=usr/share/man/man.+/(.+)$ -> set action.hash %<\1> >
+<transform file path=usr/share/man/man.+/(.+)$ -> set action.hash %<1> >
 # Bypassing the mangler for these files because they are pre-Solarified.
 <transform file path=usr/share/man/.+$ -> add mangler.bypass true >
 set name=pkg.fmri \
diff -r 17b5d565eb85 -r 8e6a71e8754b components/ksh93/ksh93.p5m
--- a/components/ksh93/ksh93.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/ksh93/ksh93.p5m	Thu May 14 10:36:26 2015 -0700
@@ -23,7 +23,7 @@
 
 # The man pages are all at the top of a "files" directory; setting the hash to
 # point to the files therein.
-<transform file path=usr/share/man/man.+/(.+)$ -> set action.hash %<\1> >
+<transform file path=usr/share/man/man.+/(.+)$ -> set action.hash %<1> >
 # Bypassing the mangler for these files because they are pre-Solarified.
 <transform file path=usr/share/man/.+$ -> add mangler.bypass true >
 set name=pkg.fmri \
diff -r 17b5d565eb85 -r 8e6a71e8754b components/ksh93/source-demo-ksh93.p5m
--- a/components/ksh93/source-demo-ksh93.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/ksh93/source-demo-ksh93.p5m	Thu May 14 10:36:26 2015 -0700
@@ -25,7 +25,7 @@
 
 # The man pages are all at the top of a "files" directory; setting the hash to
 # point to the files therein.
-<transform file path=usr/share/man/man.+/(.+)$ -> set action.hash %<\1> >
+<transform file path=usr/share/man/man.+/(.+)$ -> set action.hash %<1> >
 # Bypassing the mangler for these files because they are pre-Solarified.
 <transform file path=usr/share/man/.+$ -> add mangler.bypass true >
 set name=pkg.fmri \
diff -r 17b5d565eb85 -r 8e6a71e8754b components/libarchive/libarchive.p5m
--- a/components/libarchive/libarchive.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/libarchive/libarchive.p5m	Thu May 14 10:36:26 2015 -0700
@@ -20,12 +20,12 @@
 #
 
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability Uncommitted>
 # All man pages are pulled from $(COMPONENT_SRC)/doc/man and have a .3 suffix
-<transform file path=usr.*/man/man.+/(.+[.]3).*$ -> set action.hash %<\1> >
+<transform file path=usr.*/man/man.+/(.+[.]3).*$ -> set action.hash %<1> >
 set name=pkg.fmri \
     value=pkg:/library/libarchive@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="multi-format archive and compression library"
diff -r 17b5d565eb85 -r 8e6a71e8754b components/libnet/libnet.p5m
--- a/components/libnet/libnet.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/libnet/libnet.p5m	Thu May 14 10:36:26 2015 -0700
@@ -22,7 +22,7 @@
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-<transform file path=usr/demo/libnet/(.+[.-].+)$ -> set action.hash $(MACH32)/sample/%<\1> >
+<transform file path=usr/demo/libnet/(.+[.-].+)$ -> set action.hash $(MACH32)/sample/%<1> >
 <transform dir file link hardlink path=usr/demo -> default facet.devel true>
 #
 set name=pkg.fmri \
diff -r 17b5d565eb85 -r 8e6a71e8754b components/libsigsegv/libsigsegv.p5m
--- a/components/libsigsegv/libsigsegv.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/libsigsegv/libsigsegv.p5m	Thu May 14 10:36:26 2015 -0700
@@ -22,7 +22,7 @@
 #
 
 # pull the manpages out of the component dir
-<transform file path=usr/share/man/(man3/.+$) -> set action.hash %<\1> >
+<transform file path=usr/share/man/(man3/.+$) -> set action.hash %<1> >
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
diff -r 17b5d565eb85 -r 8e6a71e8754b components/libtecla/libtecla.p5m
--- a/components/libtecla/libtecla.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/libtecla/libtecla.p5m	Thu May 14 10:36:26 2015 -0700
@@ -20,13 +20,13 @@
 #
 
 #
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 # The man pages are all at the top of a "files" directory; setting the hash to
 # point to the files therein.
 <transform file path=usr/share/man/man.+/(.+)$ -> \
-    set action.hash %<\1> >
+    set action.hash %<1> >
 # Bypassing the mangler for these files because they are pre-Solarified.
 <transform file path=usr/share/man/.+$ -> \
     add mangler.bypass true >
diff -r 17b5d565eb85 -r 8e6a71e8754b components/mailman/mailman.p5m
--- a/components/mailman/mailman.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/mailman/mailman.p5m	Thu May 14 10:36:26 2015 -0700
@@ -40,7 +40,7 @@
 <transform file path=usr/lib/mailman/.*\.py$ -> default pkg.tmp.pyversion 2.X>
 <transform file \
     path=usr/lib/mailman/(messages|templates)/([^/]+)(\..+){0,1}(/.+){0,1}/.* \
-    -> default facet.locale.%<\2> true>
+    -> default facet.locale.%<2> true>
 <transform file path=usr/share/doc/mailman/mailman-member-es.* -> \
     default facet.locale.es true>
 <transform file path=usr/share/doc/mailman/(.+) -> set action.hash doc/%<1>>
diff -r 17b5d565eb85 -r 8e6a71e8754b components/mercurial/mercurial-GENFRAG.p5m
--- a/components/mercurial/mercurial-GENFRAG.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/mercurial/mercurial-GENFRAG.p5m	Thu May 14 10:36:26 2015 -0700
@@ -26,7 +26,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
 
 # These are not installed, but can be found in the source contrib directory.
-<transform file path=usr/demo/mercurial/(.+)$ -> set action.hash %<\1> >
+<transform file path=usr/demo/mercurial/(.+)$ -> set action.hash %<1> >
 
 # We also ignore all dependencies implied by the demos.
 <transform file path=usr/demo/mercurial/.+ -> set pkg.depend.bypass-generate .*>
diff -r 17b5d565eb85 -r 8e6a71e8754b components/nmap/nmap.p5m
--- a/components/nmap/nmap.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/nmap/nmap.p5m	Thu May 14 10:36:26 2015 -0700
@@ -25,7 +25,7 @@
 # Pull vendor-packages files from site-packages because nmap build installs
 # them there and doesn't offer an overide.
 <transform file path=(usr/lib/python.*)/vendor-packages/(.+) -> \
-    set action.hash %<\1>/site-packages/%<\2> >
+    set action.hash %<1>/site-packages/%<2> >
 set name=pkg.fmri \
     value=pkg:/diagnostic/nmap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
diff -r 17b5d565eb85 -r 8e6a71e8754b components/ntp/ntp.p5m
--- a/components/ntp/ntp.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/ntp/ntp.p5m	Thu May 14 10:36:26 2015 -0700
@@ -21,7 +21,7 @@
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file path=usr/share/doc/ntp/(.+$) -> set action.hash html/%<\1> >
+<transform file path=usr/share/doc/ntp/(.+$) -> set action.hash html/%<1> >
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/service/network/ntp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff -r 17b5d565eb85 -r 8e6a71e8754b components/ocaml/ocaml.p5m
--- a/components/ocaml/ocaml.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/ocaml/ocaml.p5m	Thu May 14 10:36:26 2015 -0700
@@ -20,7 +20,7 @@
 #
 # Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
-<transform file path=(.+)/man/man3/(.+).3o$ -> set action.hash %<\1>/man/man3/%<\2>.3o >
+<transform file path=(.+)/man/man3/(.+).3o$ -> set action.hash %<1>/man/man3/%<2>.3o >
 <transform file -> edit path man/man3 man/man3o >
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
diff -r 17b5d565eb85 -r 8e6a71e8754b components/openexr/openexr.p5m
--- a/components/openexr/openexr.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/openexr/openexr.p5m	Thu May 14 10:36:26 2015 -0700
@@ -21,7 +21,7 @@
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file path=usr/share/man/man./(.+$) -> set action.hash Solaris/%<\1> >
+<transform file path=usr/share/man/man./(.+$) -> set action.hash Solaris/%<1> >
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/openexr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
diff -r 17b5d565eb85 -r 8e6a71e8754b components/openldap/openldap.p5m
--- a/components/openldap/openldap.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/openldap/openldap.p5m	Thu May 14 10:36:26 2015 -0700
@@ -20,18 +20,18 @@
 #
 
 #
-# 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 committed>
 <transform file path=(.+)/man/man1oldap/(.+).1oldap$ -> \
-    set action.hash %<\1>/man/man1/%<\2>.1>
+    set action.hash %<1>/man/man1/%<2>.1>
 <transform file path=(.+)/man/man3oldap/(.+).3oldap$ -> \
-    set action.hash %<\1>/man/man3/%<\2>.3>
+    set action.hash %<1>/man/man3/%<2>.3>
 <transform file path=(.+)/man/man5oldap/(.+).5oldap$ -> \
-    set action.hash %<\1>/man/man5/%<\2>.5>
+    set action.hash %<1>/man/man5/%<2>.5>
 <transform file path=(.+)/man/man8oldap/(.+).8oldap$ -> \
-    set action.hash %<\1>/man/man8/%<\2>.8>
+    set action.hash %<1>/man/man8/%<2>.8>
 <transform file path=usr/share/doc/openldap/images/(.+)$ -> \ 
     set action.hash $(MACH32)/doc/guide/admin/%<1> >
 <transform file path=usr/share/doc/openldap/admin24/(.+)$ -> \
diff -r 17b5d565eb85 -r 8e6a71e8754b components/quagga/quagga.p5m
--- a/components/quagga/quagga.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/quagga/quagga.p5m	Thu May 14 10:36:26 2015 -0700
@@ -21,7 +21,7 @@
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file path=(.+)/man/man1m/(.+).1m$ -> set action.hash %<\1>/man/man8/%<\2>.8 >
+<transform file path=(.+)/man/man1m/(.+).1m$ -> set action.hash %<1>/man/man8/%<2>.8 >
 <transform file -> edit path man/man8 man/man1m >
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
diff -r 17b5d565eb85 -r 8e6a71e8754b components/sendmail/sendmail.p5m
--- a/components/sendmail/sendmail.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/sendmail/sendmail.p5m	Thu May 14 10:36:26 2015 -0700
@@ -25,9 +25,9 @@
 
 # The man pages are all at the top of a "files" directory; set the hash to
 # point to the files therein.
-<transform file path=usr/share/man/man.+/(.+)$ -> set action.hash %<\1> >
+<transform file path=usr/share/man/man.+/(.+)$ -> set action.hash %<1> >
 # Set the hash for the cf/ hierarchy similarly.
-<transform file path=etc/mail/(cf/.+)$ -> set action.hash %<\1> >
+<transform file path=etc/mail/(cf/.+)$ -> set action.hash %<1> >
 # Bypass the mangler for these files because they are pre-Solarified.
 <transform file path=usr/share/man/.+$ -> add mangler.bypass true >
 <transform file path=etc/mail/cf/.* -> default group mail>
diff -r 17b5d565eb85 -r 8e6a71e8754b components/subversion/subversion-perl-512.p5m
--- a/components/subversion/subversion-perl-512.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/subversion/subversion-perl-512.p5m	Thu May 14 10:36:26 2015 -0700
@@ -18,12 +18,12 @@
 #
 # 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/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> >
+<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/subversion-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Perl bindings for the Subversion SCM"
diff -r 17b5d565eb85 -r 8e6a71e8754b components/subversion/subversion-perl-516.p5m
--- a/components/subversion/subversion-perl-516.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/subversion/subversion-perl-516.p5m	Thu May 14 10:36:26 2015 -0700
@@ -18,12 +18,12 @@
 #
 # 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/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> >
+<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/subversion-516@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Perl bindings for the Subversion SCM"
diff -r 17b5d565eb85 -r 8e6a71e8754b components/subversion/subversion.p5m
--- a/components/subversion/subversion.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/subversion/subversion.p5m	Thu May 14 10:36:26 2015 -0700
@@ -22,7 +22,7 @@
 #
 <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 action.hash usr/include/subversion-1/%<1> >
 
 # prevents "64bit file in 32bit path" errors
 <transform file path=usr/apache2/2.4/libexec/.*\.so -> \
diff -r 17b5d565eb85 -r 8e6a71e8754b components/tidy/tidy.p5m
--- a/components/tidy/tidy.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/tidy/tidy.p5m	Thu May 14 10:36:26 2015 -0700
@@ -22,7 +22,7 @@
 #
 
 <transform file path=usr/share/doc/tidy/html/api/(.+)$ -> \
-    set action.hash usr/share/doc/tidy/api/%<\1> >
+    set action.hash usr/share/doc/tidy/api/%<1> >
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri value=pkg:/text/tidy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The HTML Tidy Library."
diff -r 17b5d565eb85 -r 8e6a71e8754b components/tomcat-8/tomcat-admin.p5m
--- a/components/tomcat-8/tomcat-admin.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/tomcat-8/tomcat-admin.p5m	Thu May 14 10:36:26 2015 -0700
@@ -24,11 +24,11 @@
 #
 
 <transform file path=usr/tomcat8/(.+)$ -> \
-    set action.hash %<\1> >
+    set action.hash %<1> >
 <transform file path=usr/tomcat8/docs/(.+)$ -> \
-    set action.hash webapps/docs/%<\1> >
+    set action.hash webapps/docs/%<1> >
 <transform file path=var/tomcat8/(.+)$ -> \
-    set action.hash %<\1> >
+    set action.hash %<1> >
 <transform file path=var/tomcat8/webapps/ROOT/index.jsp -> \
     set action.hash Solaris/index.jsp >
 set name=pkg.fmri \
diff -r 17b5d565eb85 -r 8e6a71e8754b components/tomcat-8/tomcat-examples.p5m
--- a/components/tomcat-8/tomcat-examples.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/tomcat-8/tomcat-examples.p5m	Thu May 14 10:36:26 2015 -0700
@@ -24,9 +24,9 @@
 #
 
 <transform file path=var/tomcat8/(.+)$ -> \
-    set action.hash %<\1> >
+    set action.hash %<1> >
 <transform file path=var/tomcat8/webapps/ROOT.example/(.+)$ -> \
-    set action.hash webapps/ROOT/%<\1> >
+    set action.hash webapps/ROOT/%<1> >
 <transform file path=var/tomcat8/webapps/ROOT/index.htm -> \
     set action.hash Solaris/index.htm >
 set name=pkg.fmri \
diff -r 17b5d565eb85 -r 8e6a71e8754b components/tomcat-8/tomcat.p5m
--- a/components/tomcat-8/tomcat.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/tomcat-8/tomcat.p5m	Thu May 14 10:36:26 2015 -0700
@@ -24,11 +24,11 @@
 #
 
 <transform file path=usr/tomcat8/(.+)$ -> \
-    set action.hash %<\1> >
+    set action.hash %<1> >
 <transform file path=usr/tomcat8/docs/(.+)$ -> \
-    set action.hash webapps/docs/%<\1> >
+    set action.hash webapps/docs/%<1> >
 <transform file path=var/tomcat8/(.+)$ -> \
-    set action.hash %<\1> >
+    set action.hash %<1> >
 <transform file path=var/tomcat8/webapps/ROOT/index.jsp -> \
     set action.hash Solaris/index.jsp >
 
diff -r 17b5d565eb85 -r 8e6a71e8754b components/tomcat/tomcat-examples.p5m
--- a/components/tomcat/tomcat-examples.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/tomcat/tomcat-examples.p5m	Thu May 14 10:36:26 2015 -0700
@@ -24,9 +24,9 @@
 #
 
 <transform file path=var/tomcat6/(.+)$ -> \
-    set action.hash %<\1> >
+    set action.hash %<1> >
 <transform file path=var/tomcat6/webapps/ROOT.example/(.+)$ -> \
-    set action.hash webapps/ROOT/%<\1> >
+    set action.hash webapps/ROOT/%<1> >
 <transform file path=var/tomcat6/webapps/ROOT/index.htm -> \
     set action.hash Solaris/index.htm >
 set name=pkg.fmri \
diff -r 17b5d565eb85 -r 8e6a71e8754b components/tomcat/tomcat.p5m
--- a/components/tomcat/tomcat.p5m	Thu May 14 23:23:23 2015 -0500
+++ b/components/tomcat/tomcat.p5m	Thu May 14 10:36:26 2015 -0700
@@ -24,11 +24,11 @@
 #
 
 <transform file path=usr/tomcat6/(.+)$ -> \
-    set action.hash %<\1> >
+    set action.hash %<1> >
 <transform file path=usr/tomcat6/docs/(.+)$ -> \
-    set action.hash webapps/docs/%<\1> >
+    set action.hash webapps/docs/%<1> >
 <transform file path=var/tomcat6/(.+)$ -> \
-    set action.hash %<\1> >
+    set action.hash %<1> >
 <transform file path=var/tomcat6/webapps/ROOT/index.jsp -> \
     set action.hash Solaris/index.jsp >