[58576] trunk/dports/www

[ryandesign at macports.org]

Revision: 58576
          http://trac.macports.org/changeset/58576
Author:   ryandesign at macports.org
Date:     2009-10-01 01:36:23 -0700 (Thu, 01 Oct 2009)
Log Message:
-----------
apache and apache2 conflict with one another

Modified Paths:
--------------
    trunk/dports/www/apache/Portfile
    trunk/dports/www/apache2/Portfile

Modified: trunk/dports/www/apache/Portfile
===================================================================
--- trunk/dports/www/apache/Portfile	2009-10-01 08:33:34 UTC (rev 58575)
+++ trunk/dports/www/apache/Portfile	2009-10-01 08:36:23 UTC (rev 58576)
@@ -24,6 +24,9 @@
                     sha1    3bbd4c4bc648e6ad5b696bb83420533f4d23daf8 \
                     rmd160  74786c65c143af123f1d13e9d93dd5ff07e9a201
 
+# Both apache and apache2 want to install dbmmanage.1 and other manpages.
+conflicts           apache2
+
 platform darwin {
 	if { ![variant_isset apache_layout] } {
 		configure.args-append	--with-layout=FreeBSD  --logfiledir=${prefix}/var/log/httpd --runtimedir=${prefix}/var/run

Modified: trunk/dports/www/apache2/Portfile
===================================================================
--- trunk/dports/www/apache2/Portfile	2009-10-01 08:33:34 UTC (rev 58575)
+++ trunk/dports/www/apache2/Portfile	2009-10-01 08:36:23 UTC (rev 58576)
@@ -32,6 +32,9 @@
                  port:openssl \
                  port:pcre
 
+# Both apache and apache2 want to install dbmmanage.1 and other manpages.
+conflicts        apache
+
 post-patch {
     reinplace -E "s/(User|Group) daemon/\\1 www/" ${worksrcpath}/docs/conf/httpd.conf.in
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091001/ae021157/attachment.html>