[27786] trunk/dports/www/php4/Portfile

[source_changes at macosforge.org]

Revision: 27786
          http://trac.macosforge.org/projects/macports/changeset/27786
Author:   jwa at macports.org
Date:     2007-08-14 02:12:28 -0700 (Tue, 14 Aug 2007)

Log Message:
-----------
added mtree violation allowances, cleaned for default configure cppflags,
added variant conflicts, dropped explicit mention of freebsd platform that
should be ok with default flagging

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

Modified: trunk/dports/www/php4/Portfile
===================================================================
--- trunk/dports/www/php4/Portfile	2007-08-14 08:19:50 UTC (rev 27785)
+++ trunk/dports/www/php4/Portfile	2007-08-14 09:12:28 UTC (rev 27786)
@@ -55,48 +55,45 @@
     --with-expat-dir=${prefix} \
     --with-dom=${prefix} \
     --with-openssl=${prefix}
-configure.env
 
 platform darwin 6 {
     depends_lib-append	port:dlcompat
-    configure.env-append	LDFLAGS=-L${prefix}/lib LIBS=-ldl \
-	CPPFLAGS="-I${prefix}/include -no-cpp-precomp -DBIND_8_COMPAT"
+    configure.cppflags-append	"-no-cpp-precomp -DBIND_8_COMPAT"
+    configure.env-append	LIBS=-ldl
 }
 
 platform darwin 7 {
-    configure.env-append	LDFLAGS="-L${prefix}/lib" LIBS=-ldl \
-	CPPFLAGS="-I${prefix}/include -no-cpp-precomp"
+    configure.cppflags-append	"-no-cpp-precomp"
+    configure.env-append	LIBS=-ldl
 }
 
 platform darwin 8 {
     configure.env-append	CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0
 }
 
-platform freebsd {
-    configure.env.append	LDFLAGS=-L${prefix}/lib \
-	CPPFLAGS="-I${prefix}/include
-}
-
 platform macosx {
     configure.args-append	--with-ldap=/usr --with-kerberos=/usr --with-iodbc=/usr
 }
 
-variant apache {
+variant apache conflicts apache2 apache20 {
     if { ! [variant_isset macosx] } {
-	depends_lib-append	path:${prefix}/sbin/apxs:apache
+	depends_lib-append	port:apache
 	configure.args-append 	--with-apxs=${prefix}/sbin/apxs
     } else {
+	destroot.violate_mtree yes
 	configure.args-append	--with-apxs=/usr/sbin/apxs
     }
 }
 
-variant apache2 {
-    depends_lib-append	path:${prefix}/apache2/bin/apxs:apache2
+variant apache2 conflicts apache apache20 {
+    destroot.violate_mtree yes
+    depends_lib-append	port:apache2
     configure.args-append 	--with-apxs2=${prefix}/apache2/bin/apxs
 }
 
-variant apache20 {
-    depends_lib-append	path:${prefix}/apache20/bin/apxs:apache2
+variant apache20 conflicts apache apache2 {
+    destroot.violate_mtree yes
+    depends_lib-append	port:apache20
     configure.args-append 	--with-apxs2=${prefix}/apache20/bin/apxs
 }
 
@@ -120,18 +117,18 @@
 	--with-freetype-dir=${prefix}
 }
 
-variant mysql3 {
+variant mysql3 conflicts mysql4 mysql5 {
     depends_lib-append	port:mysql3
     configure.args-append	--with-mysql=${prefix}
 }
 
-variant mysql4 {
+variant mysql4 conflicts mysql3 mysql5 {
     depends_lib-append	port:mysql4
     configure.args-append	--with-mysql=${prefix}
 }
 
 
-variant mysql5 {
+variant mysql5 conflicts mysql3 mysql4 {
     depends_lib-append      port:mysql5
     configure.args-delete   --without-mysql
     configure.args-append   --with-mysql=${workpath}/mysql5
@@ -165,7 +162,7 @@
 
 variant imap {
     depends_lib-append		port:cclient
-    configure.env-append	 CFLAGS=-I${prefix}/include/c-client
+    configure.cppflags-append	-I${prefix}/include/c-client
     configure.args-append 	--with-imap=${prefix} --with-imap-ssl=/usr
 }
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070814/356e7e84/attachment.html