Ticket #20743: apache2-2.2.13.diff

Portfile

@@ -3 +3 @@
 PortSystem       1.0
 
 name             apache2
-version          2.2.11
+version          2.2.13
 categories       www
 maintainers      imajes
 description      The extremely popular second version of the Apache http server 
@@ -21 +21 @@
 use_bzip2        yes
 use_parallel_build  yes
 
-checksums        md5     3e98bcb14a7122c274d62419566431bb \
-                 sha1    7af256d53b79342f82222bd7b86eedbd9ac21d9a \
-                 rmd160  b2012af716a459f666e0e41eb04808bd0f7fc28d
+checksums        md5     8d8d904e7342125825ec70f03c5745ef \
+                 sha1    44d85da1b8e6c579d4514cfefbea00b284717b69 \
+                 rmd160  4a6a2247cc118175a9a36f1e14344ee71da24627
 
 depends_lib      port:apr \
                  port:apr-util \
@@ -124 +124 @@
         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 description {Use MPM prefork} {
         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 MPM worker} {
         configure.args-append --with-mpm=worker
 }
 
-# This mpm is experimental
-variant eventmpm {
+variant eventmpm conflicts preforkmpm workermpm description {Use MPM event (experimental)} {
         configure.args-append --with-mpm=event
 }
 
-variant no_startupitem {
+if {![variant_isset preforkmpm] && ![variant_isset workermpm] && ![variant_isset eventmpm]} {
+        default_variants +preforkmpm
+        variant_set preforkmpm
+}
+
+variant no_startupitem description {Do not create a startup item} {
         startupitem.create      no
 }