[39862] trunk/dports/www
ryandesign at macports.org
ryandesign at macports.org
Mon Sep 8 22:22:01 PDT 2008
Revision: 39862
http://trac.macports.org/changeset/39862
Author: ryandesign at macports.org
Date: 2008-09-08 22:22:01 -0700 (Mon, 08 Sep 2008)
Log Message:
-----------
php4, php5, php5-devel: finally get rid of the behavior that support for Apple's Apache 1 is built if you do not select any variants. Now all web server functionality is properly handled in variants. +apache2 is now the default, since that's the most popular and also the only one that works with Leopard right now, and there's also a new variant +no_web if you don't want any web server support at all. Closes #16478.
Modified Paths:
--------------
trunk/dports/www/php4/Portfile
trunk/dports/www/php5/Portfile
trunk/dports/www/php5-devel/Portfile
Modified: trunk/dports/www/php4/Portfile
===================================================================
--- trunk/dports/www/php4/Portfile 2008-09-09 02:11:15 UTC (rev 39861)
+++ trunk/dports/www/php4/Portfile 2008-09-09 05:22:01 UTC (rev 39862)
@@ -81,7 +81,9 @@
configure.args-append --with-ldap=/usr --with-kerberos=/usr --with-iodbc=/usr
}
-variant apache conflicts apache2 apache20 description {for Apple Apache} {
+variant no_web conflicts apache apache2 apache20 description {Don't include any web server support} {}
+
+variant apache conflicts apache2 apache20 no_web description {Add Apache 1 web server module} {
if { ! [variant_isset macosx] } {
depends_lib-append port:apache
configure.args-append --with-apxs=${prefix}/sbin/apxs
@@ -91,13 +93,13 @@
}
}
-variant apache2 conflicts apache apache20 description {for current Apache} {
+variant apache2 conflicts apache apache20 no_web description {Add Apache 2.2 web server module (default)} {
destroot.violate_mtree yes
depends_lib-append port:apache2
configure.args-append --with-apxs2=${prefix}/apache2/bin/apxs
}
-variant apache20 conflicts apache apache2 description {for Apache 2.0.59} {
+variant apache20 conflicts apache apache2 no_web description {Add Apache 2.0 web server module} {
destroot.violate_mtree yes
depends_lib-append port:apache20
configure.args-append --with-apxs2=${prefix}/apache20/bin/apxs
@@ -186,17 +188,8 @@
configure.args-append --enable-xslt --with-xslt-sablot=${prefix} --with-iconv-dir=${prefix}
}
-# If no apache/apache2/apache20 variant is set, we set it (waiting a
-# better default variant management).
-if { ![variant_isset apache] &&
- ![variant_isset apache2] &&
- ![variant_isset apache20] } {
- if { ! [variant_isset macosx] } {
- depends_lib-append path:${prefix}/sbin/apxs:apache
- configure.args-append --with-apxs=${prefix}/sbin/apxs
- } else {
- configure.args-append --with-apxs=/usr/sbin/apxs
- }
+if {![variant_isset apache] && ![variant_isset apache2] && ![variant_isset apache20] && ![variant_isset no_web]} {
+ default_variants +apache2
}
variant readline description {Add GNU readline functions} {
Modified: trunk/dports/www/php5/Portfile
===================================================================
--- trunk/dports/www/php5/Portfile 2008-09-09 02:11:15 UTC (rev 39861)
+++ trunk/dports/www/php5/Portfile 2008-09-09 05:22:01 UTC (rev 39862)
@@ -119,10 +119,12 @@
--with-iodbc=/usr
}
+variant no_web conflicts apache apache2 fastcgi description {Don't include any web server support} {}
+
# Build an Apache 1 module. On Mac OS X, it uses Apple's provided Apache 1 server.
# On other platforms, the MacPorts apache port is used. Keep the options here
# in sync with those in the relevant part of the post-destroot phase.
-variant apache conflicts apache2 description {for Apple Apache} {
+variant apache conflicts apache2 no_web description {Add Apache 1 web server module} {
if { ! [variant_isset macosx] } {
depends_lib-append \
path:${prefix}/sbin/apxs:apache
@@ -135,9 +137,9 @@
}
}
-# Build an Apache 2 module. Keep the options here in sync with those in the
+# Build an Apache 2.2 module. Keep the options here in sync with those in the
# relevant part of the post-destroot phase.
-variant apache2 conflicts apache description {for current Apache} {
+variant apache2 conflicts apache no_web description {Add Apache 2.2 web server module (default)} {
destroot.violate_mtree yes
depends_lib-append \
path:${prefix}/apache2/bin/apxs:apache2
@@ -147,7 +149,7 @@
# Build a FastCGI binary. Keep the options here in sync with those in the
# relevant part of the post-destroot phase.
-variant fastcgi description {add fastcgi binary} {
+variant fastcgi conflicts no_web description {Add FastCGI web server binary} {
if { ![variant_isset apache] && ![variant_isset apache2] } {
configure.args-append \
--enable-fastcgi \
@@ -312,17 +314,8 @@
--enable-pcntl
}
-# if no apache/apache2/fastcgi variant is set, we set it (need better default variant management)
-if { ![variant_isset apache] && ![variant_isset apache2] && ![variant_isset fastcgi] } {
- if { ! [variant_isset macosx] } {
- depends_lib-append \
- path:${prefix}/sbin/apxs:apache
- configure.args-append \
- --with-apxs=${prefix}/sbin/apxs
- } else {
- configure.args-append \
- --with-apxs=/usr/sbin/apxs
- }
+if {![variant_isset apache] && ![variant_isset apache2] && ![variant_isset fastcgi] && ![variant_isset no_web]} {
+ default_variants +apache2
}
variant pear description {add pear stuff} {
@@ -382,7 +375,7 @@
xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}$prefix/etc/apache/extras-conf
}
- # Copy the Apache 2 module.
+ # Copy the Apache 2.2 module.
if { [variant_isset apache2] } {
xinstall -m 755 -d ${destroot}${prefix}/apache2/modules \
${destroot}${prefix}/apache2/conf/extras-conf
Modified: trunk/dports/www/php5-devel/Portfile
===================================================================
--- trunk/dports/www/php5-devel/Portfile 2008-09-09 02:11:15 UTC (rev 39861)
+++ trunk/dports/www/php5-devel/Portfile 2008-09-09 05:22:01 UTC (rev 39862)
@@ -113,10 +113,12 @@
--with-iodbc=/usr
}
+variant no_web conflicts apache apache2 fastcgi description {Don't include any web server support} {}
+
# Build an Apache 1 module. On Mac OS X, it uses Apple's provided Apache 1 server.
# On other platforms, the MacPorts apache port is used. Keep the options here
# in sync with those in the relevant part of the post-destroot phase.
-variant apache conflicts apache2 description {for Apple Apache} {
+variant apache conflicts apache2 no_web description {Add Apache 1 web server module} {
if { ! [variant_isset macosx] } {
depends_lib-append \
port:apache
@@ -129,9 +131,9 @@
}
}
-# Build an Apache 2 module. Keep the options here in sync with those in the
+# Build an Apache 2.2 module. Keep the options here in sync with those in the
# relevant part of the post-destroot phase.
-variant apache2 conflicts apache description {for current Apache} {
+variant apache2 conflicts apache no_web description {Add Apache 2.2 web server module (default)} {
destroot.violate_mtree yes
depends_lib-append \
port:apache2
@@ -141,7 +143,7 @@
# Build a FastCGI binary. Keep the options here in sync with those in the
# relevant part of the post-destroot phase.
-variant fastcgi description {add fastcgi binary} {
+variant fastcgi conflicts no_web description {Add FastCGI web server binary} {
if { ![variant_isset apache] && ![variant_isset apache2] } {
configure.args-append \
--enable-fastcgi \
@@ -317,17 +319,8 @@
--enable-pcntl
}
-# if no apache/apache2/fastcgi variant is set, we set it (need better default variant management)
-if { ![variant_isset apache] && ![variant_isset apache2] && ![variant_isset fastcgi] } {
- if { ! [variant_isset macosx] } {
- depends_lib-append \
- port:apache
- configure.args-append \
- --with-apxs=${prefix}/sbin/apxs
- } else {
- configure.args-append \
- --with-apxs=/usr/sbin/apxs
- }
+if {![variant_isset apache] && ![variant_isset apache2] && ![variant_isset fastcgi] && ![variant_isset no_web]} {
+ default_variants +apache2
}
variant pear description {add pear stuff} {
@@ -387,7 +380,7 @@
xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}$prefix/etc/apache/extras-conf
}
- # Copy the Apache 2 module.
+ # Copy the Apache 2.2 module.
if { [variant_isset apache2] } {
xinstall -m 755 -d ${destroot}${prefix}/apache2/modules \
${destroot}${prefix}/apache2/conf/extras-conf
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080908/2f535714/attachment-0001.html
More information about the macports-changes
mailing list