--- a/components/apache2/apache-22.p5m Wed Sep 10 08:57:54 2014 -0700
+++ b/components/apache2/apache-22.p5m Thu Sep 11 12:35:18 2014 -0700
@@ -334,7 +334,7 @@
file path=usr/apache2/2.2/man/man8/logresolve.8
file path=usr/apache2/2.2/man/man8/rotatelogs.8
file path=usr/apache2/2.2/man/man8/suexec.8
-file Solaris/apache2.1m.sunman path=usr/share/man/man1m/apache2.1m
+file Solaris/apache2.1m.sunman path=usr/share/man/man1m/apache22.1m
file path=var/apache2/2.2/cgi-bin/printenv mode=0444 pkg.depend.bypass-generate=.*
file path=var/apache2/2.2/cgi-bin/test-cgi mode=0444
file path=var/apache2/2.2/error/HTTP_BAD_GATEWAY.html.var
@@ -584,39 +584,93 @@
link path=usr/apache2/2.2/bin/64 target=$(MACH64)
link path=usr/apache2/2.2/build/64 target=$(MACH64)
link path=usr/apache2/2.2/libexec/64 target=$(MACH64)
-link path=usr/bin/$(MACH64)/ab target=../../apache2/2.2/bin/$(MACH64)/ab
-link path=usr/bin/$(MACH64)/apxs target=../../apache2/2.2/bin/$(MACH64)/apxs facet.devel=all
-link path=usr/bin/$(MACH64)/dbmmanage target=../../apache2/2.2/bin/$(MACH64)/dbmmanage
-link path=usr/bin/$(MACH64)/htcacheclean target=../../apache2/2.2/bin/$(MACH64)/htcacheclean
-link path=usr/bin/$(MACH64)/htdbm target=../../apache2/2.2/bin/$(MACH64)/htdbm
-link path=usr/bin/$(MACH64)/htdigest target=../../apache2/2.2/bin/$(MACH64)/htdigest
-link path=usr/bin/$(MACH64)/htpasswd target=../../apache2/2.2/bin/$(MACH64)/htpasswd
-link path=usr/bin/$(MACH64)/httxt2dbm target=../../apache2/2.2/bin/$(MACH64)/httxt2dbm
-link path=usr/bin/$(MACH64)/logresolve target=../../apache2/2.2/bin/$(MACH64)/logresolve
-link path=usr/bin/$(MACH64)/rotatelogs target=../../apache2/2.2/bin/$(MACH64)/rotatelogs
-link path=usr/bin/ab target=../apache2/2.2/bin/ab
-link path=usr/bin/apxs target=../apache2/2.2/bin/apxs
-link path=usr/bin/dbmmanage target=../apache2/2.2/bin/dbmmanage
-link path=usr/bin/htcacheclean target=../apache2/2.2/bin/htcacheclean
-link path=usr/bin/htdbm target=../apache2/2.2/bin/htdbm
-link path=usr/bin/htdigest target=../apache2/2.2/bin/htdigest
-link path=usr/bin/htpasswd target=../apache2/2.2/bin/htpasswd
-link path=usr/bin/httxt2dbm target=../apache2/2.2/bin/httxt2dbm
-link path=usr/bin/logresolve target=../apache2/2.2/bin/logresolve
-link path=usr/bin/rotatelogs target=../apache2/2.2/bin/rotatelogs
-link path=usr/share/man/man1/dbmmanage.1 target=../../../apache2/2.2/man/man1/dbmmanage.1
-link path=usr/share/man/man1/htdbm.1 target=../../../apache2/2.2/man/man1/htdbm.1
-link path=usr/share/man/man1/httxt2dbm.1 target=../../../apache2/2.2/man/man1/httxt2dbm.1
-link path=usr/share/man/man1/htdigest.1 target=../../../apache2/2.2/man/man1/htdigest.1
-link path=usr/share/man/man1/htpasswd.1 target=../../../apache2/2.2/man/man1/htpasswd.1
-link path=usr/share/man/man8/ab.8 target=../../../apache2/2.2/man/man8/ab.8
-link path=usr/share/man/man8/apxs.8 target=../../../apache2/2.2/man/man8/apxs.8
-link path=usr/share/man/man8/apachectl.8 target=../../../apache2/2.2/man/man8/apachectl.8
-link path=usr/share/man/man8/htcacheclean.8 target=../../../apache2/2.2/man/man8/htcacheclean.8
-link path=usr/share/man/man8/httpd.8 target=../../../apache2/2.2/man/man8/httpd.8
-link path=usr/share/man/man8/logresolve.8 target=../../../apache2/2.2/man/man8/logresolve.8
-link path=usr/share/man/man8/rotatelogs.8 target=../../../apache2/2.2/man/man8/rotatelogs.8
-link path=usr/share/man/man8/suexec.8 target=../../../apache2/2.2/man/man8/suexec.8
+link path=usr/bin/$(MACH64)/ab target=../../apache2/2.2/bin/$(MACH64)/ab \
+ mediator=apache mediator-version=2.2
+link path=usr/bin/$(MACH64)/apxs target=../../apache2/2.2/bin/$(MACH64)/apxs \
+ facet.devel=all mediator=apache mediator-version=2.2
+link path=usr/bin/$(MACH64)/dbmmanage \
+ target=../../apache2/2.2/bin/$(MACH64)/dbmmanage mediator=apache \
+ mediator-version=2.2
+link path=usr/bin/$(MACH64)/htcacheclean \
+ target=../../apache2/2.2/bin/$(MACH64)/htcacheclean mediator=apache \
+ mediator-version=2.2
+link path=usr/bin/$(MACH64)/htdbm target=../../apache2/2.2/bin/$(MACH64)/htdbm \
+ mediator=apache mediator-version=2.2
+link path=usr/bin/$(MACH64)/htdigest \
+ target=../../apache2/2.2/bin/$(MACH64)/htdigest mediator=apache \
+ mediator-version=2.2
+link path=usr/bin/$(MACH64)/htpasswd \
+ target=../../apache2/2.2/bin/$(MACH64)/htpasswd mediator=apache \
+ mediator-version=2.2
+link path=usr/bin/$(MACH64)/httxt2dbm \
+ target=../../apache2/2.2/bin/$(MACH64)/httxt2dbm mediator=apache \
+ mediator-version=2.2
+link path=usr/bin/$(MACH64)/logresolve \
+ target=../../apache2/2.2/bin/$(MACH64)/logresolve mediator=apache \
+ mediator-version=2.2
+link path=usr/bin/$(MACH64)/rotatelogs \
+ target=../../apache2/2.2/bin/$(MACH64)/rotatelogs mediator=apache \
+ mediator-version=2.2
+link path=usr/bin/ab target=../apache2/2.2/bin/ab mediator=apache \
+ mediator-version=2.2
+link path=usr/bin/apxs target=../apache2/2.2/bin/apxs mediator=apache \
+ mediator-version=2.2
+link path=usr/bin/dbmmanage target=../apache2/2.2/bin/dbmmanage \
+ mediator=apache mediator-version=2.2
+link path=usr/bin/htcacheclean target=../apache2/2.2/bin/htcacheclean \
+ mediator=apache mediator-version=2.2
+link path=usr/bin/htdbm target=../apache2/2.2/bin/htdbm mediator=apache \
+ mediator-version=2.2
+link path=usr/bin/htdigest target=../apache2/2.2/bin/htdigest mediator=apache \
+ mediator-version=2.2
+link path=usr/bin/htpasswd target=../apache2/2.2/bin/htpasswd mediator=apache \
+ mediator-version=2.2
+link path=usr/bin/httxt2dbm target=../apache2/2.2/bin/httxt2dbm \
+ mediator=apache mediator-version=2.2
+link path=usr/bin/logresolve target=../apache2/2.2/bin/logresolve \
+ mediator=apache mediator-version=2.2
+link path=usr/bin/rotatelogs target=../apache2/2.2/bin/rotatelogs \
+ mediator=apache mediator-version=2.2
+link path=usr/share/man/man1/dbmmanage.1 \
+ target=../../../apache2/2.2/man/man1/dbmmanage.1 mediator=apache \
+ mediator-version=2.2
+link path=usr/share/man/man1/htdbm.1 \
+ target=../../../apache2/2.2/man/man1/htdbm.1 mediator=apache \
+ mediator-version=2.2
+link path=usr/share/man/man1/httxt2dbm.1 \
+ target=../../../apache2/2.2/man/man1/httxt2dbm.1 mediator=apache \
+ mediator-version=2.2
+link path=usr/share/man/man1/htdigest.1 \
+ target=../../../apache2/2.2/man/man1/htdigest.1 mediator=apache \
+ mediator-version=2.2
+link path=usr/share/man/man1/htpasswd.1 \
+ target=../../../apache2/2.2/man/man1/htpasswd.1 mediator=apache \
+ mediator-version=2.2
+link path=usr/share/man/man8/ab.8 target=../../../apache2/2.2/man/man8/ab.8 \
+ mediator=apache mediator-version=2.2
+link path=usr/share/man/man8/apxs.8 \
+ target=../../../apache2/2.2/man/man8/apxs.8 mediator=apache \
+ mediator-version=2.2
+link path=usr/share/man/man8/apachectl.8 \
+ target=../../../apache2/2.2/man/man8/apachectl.8 mediator=apache \
+ mediator-version=2.2
+link path=usr/share/man/man8/htcacheclean.8 \
+ target=../../../apache2/2.2/man/man8/htcacheclean.8 mediator=apache \
+ mediator-version=2.2
+link path=usr/share/man/man8/httpd.8 \
+ target=../../../apache2/2.2/man/man8/httpd.8 mediator=apache \
+ mediator-version=2.2
+link path=usr/share/man/man8/logresolve.8 \
+ target=../../../apache2/2.2/man/man8/logresolve.8 mediator=apache \
+ mediator-version=2.2
+link path=usr/share/man/man8/rotatelogs.8 \
+ target=../../../apache2/2.2/man/man8/rotatelogs.8 mediator=apache \
+ mediator-version=2.2
+link path=usr/share/man/man8/suexec.8 \
+ target=../../../apache2/2.2/man/man8/suexec.8 mediator=apache \
+ mediator-version=2.2
+link path=usr/share/man/man1m/apache2.1m target=apache22.1m mediator=apache \
+ mediator-version=2.2
link path=var/apache2/2.2/libexec/64 target=$(MACH64)
depend fmri=__TBD \