[124419] trunk/dports/lang/php/Portfile

[ryandesign at macports.org]

Revision: 124419
          https://trac.macports.org/changeset/124419
Author:   ryandesign at macports.org
Date:     2014-08-24 00:31:36 -0700 (Sun, 24 Aug 2014)
Log Message:
-----------
php: use require_active_variants instead of doing it manually

Modified Paths:
--------------
    trunk/dports/lang/php/Portfile

Modified: trunk/dports/lang/php/Portfile
===================================================================
--- trunk/dports/lang/php/Portfile	2014-08-24 07:30:00 UTC (rev 124418)
+++ trunk/dports/lang/php/Portfile	2014-08-24 07:31:36 UTC (rev 124419)
@@ -312,6 +312,8 @@
 ### Apache 2 handler SAPI ###
 
 subport ${php}-apache2handler {
+    PortGroup               active_variants 1.1
+    
     description             ${php} Apache 2 Handler SAPI
     
     long_description        ${description}
@@ -320,19 +322,12 @@
     
     depends_lib-append      port:apache2
     
+    require_active_variants apache2 preforkmpm
+    
     set apxs ${prefix}/apache2/bin/apxs
     set confdir ${prefix}/apache2/conf
     set moduledir ${prefix}/apache2/modules
     
-    pre-configure {
-        # Checking for mod_cgi.so is a convenient way to verify apache2 is using its
-        # +preforkmpm variant. (+eventmpm and +workermpm instead provide mod_cgid.so.)
-        if {![file exists ${moduledir}/mod_cgi.so]} {
-            ui_error "To use ${subport}, apache2 must be installed with the +preforkmpm variant."
-            return -code error "incompatible apache2 installation"
-        }
-    }
-    
     configure.args-append   --with-apxs2=${apxs}
     
     build.target            libs/libphp5.bundle
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140824/6ecd0454/attachment.html>