upstream/oracle/userland-gate: changeset 607:c54bec5a82a3

author	Rich Burridge <rich.burridge@oracle.com>
	Fri, 02 Dec 2011 08:58:14 -0800
changeset 607	c54bec5a82a3
parent 606	c0d139b44cad
child 608	bef78732195b

7116962 Two packages cannot be installed together, server/apache-22 and server/apache-22/module/apache-perl 7117301 apache-perl should probably depend on apache-22

--- a/components/apache2-modules/mod_perl/apache-perl.p5m	Fri Dec 02 06:24:16 2011 -0800
+++ b/components/apache2-modules/mod_perl/apache-perl.p5m	Fri Dec 02 08:58:14 2011 -0800
@@ -490,7 +490,4 @@
 file path=usr/apache2/2.2/man/man3/mod_perl2.3
 link path=usr/bin/mp2bug target=../apache2/2.2/bin/mp2bug
 
-
-legacy	pkg=SUNWapch22u \
-	name="Apache Web Server (usr)" \
-	desc="The Apache HTTP Server Version (usr components)"
+depend fmri=__TBD pkg.debug.depend.file=usr/apache2/2.2/bin/httpd type=require