[56515] trunk/dports/www/apache20

[ryandesign at macports.org]

Revision: 56515
          http://trac.macports.org/changeset/56515
Author:   ryandesign at macports.org
Date:     2009-08-29 02:23:53 -0700 (Sat, 29 Aug 2009)
Log Message:
-----------
apache20: merge r56514 from apache2: add variant descriptions, mark mpm variants as conflicting with one another, mark preforkmpm variant as the default (which it has always been); closes #20516 (maintainer timeout)

Revision Links:
--------------
    http://trac.macports.org/changeset/56514

Modified Paths:
--------------
    trunk/dports/www/apache20/Portfile

Property Changed:
----------------
    trunk/dports/www/apache20/


Property changes on: trunk/dports/www/apache20
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/www/apache2:56514

Modified: trunk/dports/www/apache20/Portfile
===================================================================
--- trunk/dports/www/apache20/Portfile	2009-08-29 09:18:58 UTC (rev 56514)
+++ trunk/dports/www/apache20/Portfile	2009-08-29 09:23:53 UTC (rev 56515)
@@ -141,22 +141,24 @@
 	build.env-append "LD_LIBRARY_PATH=${prefix}/lib"
 }
 
-variant openldap {
+variant openldap description {Enable LDAP support through OpenLDAP} {
 	configure.args-append --enable-ldap --enable-authnz-ldap
 	depends_lib-append port:openldap
 }
 
-# This ends up being the default mpm if no other is chosen
-variant preforkmpm {
+variant preforkmpm conflicts workermpm description {Use prefork MPM} {
 	configure.args-append --with-mpm=prefork
 }
 
-# This mpm is probably preferred (maybe we should make it a default variant?)
-variant workermpm {
+variant workermpm conflicts preforkmpm description {Use worker MPM} {
 	configure.args-append --with-mpm=worker
 }
 
-variant no_startupitem {
+if {![variant_isset workermpm] && ![variant_isset eventmpm]} {
+	default_variants +preforkmpm
+}
+
+variant no_startupitem description {Do not create a startup item} {
 	startupitem.create	no
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090829/ac89e09a/attachment.html>