[35500] trunk/dports/www/php5

ryandesign at macports.org ryandesign at macports.org
Sat Mar 29 04:08:20 PDT 2008


Revision: 35500
          http://trac.macosforge.org/projects/macports/changeset/35500
Author:   ryandesign at macports.org
Date:     2008-03-29 04:08:19 -0700 (Sat, 29 Mar 2008)

Log Message:
-----------
php5 and php5-devel: make whitespace consistent between these two ports

Modified Paths:
--------------
    trunk/dports/www/php5/Portfile
    trunk/dports/www/php5-devel/Portfile

Modified: trunk/dports/www/php5/Portfile
===================================================================
--- trunk/dports/www/php5/Portfile	2008-03-29 11:02:40 UTC (rev 35499)
+++ trunk/dports/www/php5/Portfile	2008-03-29 11:08:19 UTC (rev 35500)
@@ -1,159 +1,159 @@
 # $Id$
 
-PortSystem          1.0
+PortSystem              1.0
 
-name                php5
-version             5.2.5
-revision            2
-categories          www lang php
-maintainers         ryandesign jwa
-homepage            http://www.php.net/
-distfiles           php-${version}.tar.bz2:release
-use_bzip2           yes
-worksrcdir          php-${version}
-platforms           darwin freebsd
+name                    php5
+version                 5.2.5
+revision                2
+categories              www lang php
+maintainers             ryandesign jwa
+homepage                http://www.php.net/
+distfiles               php-${version}.tar.bz2:release
+use_bzip2               yes
+worksrcdir              php-${version}
+platforms               darwin freebsd
 
 description \
-	PHP: Hypertext Preprocessor
+    PHP: Hypertext Preprocessor
 
 long_description \
-	PHP is a widely-used general-purpose scripting language \
-	that is especially suited for developing web sites, but can also \
-	be used for command-line scripting.
+    PHP is a widely-used general-purpose scripting language \
+    that is especially suited for developing web sites, but can also \
+    be used for command-line scripting.
 
 master_sites \
-	${homepage}distributions/:release \
-	http://it.php.net/distributions/:release \
-	http://fi.php.net/distributions/:release \
-	http://de.php.net/distributions/:release \
-	http://gr.php.net/distributions/:release \
-	http://fr.php.net/distributions/:release \
-	http://es.php.net/distributions/:release \
-	http://se.php.net/distributions/:release \
-	http://downloads.php.net/ilia/:rc \
-	http://downloads.php.net/jani/:rc
+    ${homepage}distributions/:release \
+    http://it.php.net/distributions/:release \
+    http://fi.php.net/distributions/:release \
+    http://de.php.net/distributions/:release \
+    http://gr.php.net/distributions/:release \
+    http://fr.php.net/distributions/:release \
+    http://es.php.net/distributions/:release \
+    http://se.php.net/distributions/:release \
+    http://downloads.php.net/ilia/:rc \
+    http://downloads.php.net/jani/:rc
 
 checksums \
-	md5 1fe14ca892460b09f06729941a1bb605 \
-	sha1 6b46fd095891183b328163b70cdb5acd30a24b7a \
-	rmd160 2d5755f2ae8884e80f0a5c70e8fdfdb6deed46bc
+    md5 1fe14ca892460b09f06729941a1bb605 \
+    sha1 6b46fd095891183b328163b70cdb5acd30a24b7a \
+    rmd160 2d5755f2ae8884e80f0a5c70e8fdfdb6deed46bc
 
 depends_lib \
-	port:libxml2 \
-	port:libxslt \
-	port:openssl \
-	port:zlib \
-	port:bzip2 \
-	port:libiconv \
-	port:expat \
-	port:gettext \
-	port:tiff \
-	port:mhash \
-	port:libmcrypt \
-	port:curl \
-	port:pcre \
-	port:jpeg \
-	port:libpng \
-	port:freetype
+    port:libxml2 \
+    port:libxslt \
+    port:openssl \
+    port:zlib \
+    port:bzip2 \
+    port:libiconv \
+    port:expat \
+    port:gettext \
+    port:tiff \
+    port:mhash \
+    port:libmcrypt \
+    port:curl \
+    port:pcre \
+    port:jpeg \
+    port:libpng \
+    port:freetype
 
 configure.args \
-	--mandir=${prefix}/share/man \
-	--infodir=${prefix}/share/info \
-	--with-config-file-path=${prefix}/etc \
-	--enable-calendar \
-	--with-iconv=${prefix} \
-	--enable-exif \
-	--enable-ftp \
-	--enable-wddx\
-	--with-zlib=${prefix} \
-	--with-bz2=${prefix} \
-	--without-mysql \
-	--without-sqlite \
-	--without-pdo-sqlite \
-	--with-libxml-dir=${prefix} \
-	--with-gettext=${prefix} \
-	--with-xml \
-	--with-expat-dir=${prefix} \
-	--with-xmlrpc \
-	--enable-soap \
-	--enable-filepro \
-	--enable-bcmath \
-	--enable-trans-sid \
-	--enable-mbstring \
-	--enable-dbx \
-	--enable-dba \
-	--enable-zip \
-	--with-openssl=${prefix} \
-	--with-mhash=${prefix} \
-	--with-mcrypt=${prefix} \
-	--with-xsl=${prefix} \
-	--with-curl=${prefix} \
-	--with-pcre-regex=${prefix} \
-	--with-gd \
-	--with-jpeg-dir=${prefix} \
-	--with-png-dir=${prefix} \
-	--enable-gd-native-ttf \
-	--without-pear \
-	--with-freetype-dir=${prefix}
+    --mandir=${prefix}/share/man \
+    --infodir=${prefix}/share/info \
+    --with-config-file-path=${prefix}/etc \
+    --enable-calendar \
+    --with-iconv=${prefix} \
+    --enable-exif \
+    --enable-ftp \
+    --enable-wddx\
+    --with-zlib=${prefix} \
+    --with-bz2=${prefix} \
+    --without-mysql \
+    --without-sqlite \
+    --without-pdo-sqlite \
+    --with-libxml-dir=${prefix} \
+    --with-gettext=${prefix} \
+    --with-xml \
+    --with-expat-dir=${prefix} \
+    --with-xmlrpc \
+    --enable-soap \
+    --enable-filepro \
+    --enable-bcmath \
+    --enable-trans-sid \
+    --enable-mbstring \
+    --enable-dbx \
+    --enable-dba \
+    --enable-zip \
+    --with-openssl=${prefix} \
+    --with-mhash=${prefix} \
+    --with-mcrypt=${prefix} \
+    --with-xsl=${prefix} \
+    --with-curl=${prefix} \
+    --with-pcre-regex=${prefix} \
+    --with-gd \
+    --with-jpeg-dir=${prefix} \
+    --with-png-dir=${prefix} \
+    --enable-gd-native-ttf \
+    --without-pear \
+    --with-freetype-dir=${prefix}
 
 platform darwin 6 {
-	depends_lib-append \
-		lib:libdl:dlcompat
-	configure.env-append \
-		LIBS=-ldl
-	configure.cppflags-append \
-		"-no-cpp-precomp -DBIND_8_COMPAT"
+    depends_lib-append \
+        lib:libdl:dlcompat
+    configure.env-append \
+        LIBS=-ldl
+    configure.cppflags-append \
+        "-no-cpp-precomp -DBIND_8_COMPAT"
 }
 
 platform darwin 7 {
-	configure.env-append \
-		LIBS=-ldl
-	configure.cppflags-append \
-		"-no-cpp-precomp"
+    configure.env-append \
+        LIBS=-ldl
+    configure.cppflags-append \
+        "-no-cpp-precomp"
 }
 
 platform macosx {
-	configure.args-append \
-		--with-ldap=/usr \
-		--with-kerberos=/usr \
-		--with-iodbc=/usr
+    configure.args-append \
+        --with-ldap=/usr \
+        --with-kerberos=/usr \
+        --with-iodbc=/usr
 }
 
 # 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} {
-	if { ! [variant_isset macosx] } {
-		depends_lib-append \
-			path:${prefix}/sbin/apxs:apache
-		configure.args-append \
-			--with-apxs=${prefix}/sbin/apxs
-	} else {
-		destroot.violate_mtree yes
-		configure.args-append \
-			--with-apxs=/usr/sbin/apxs
-	}
+    if { ! [variant_isset macosx] } {
+        depends_lib-append \
+            path:${prefix}/sbin/apxs:apache
+        configure.args-append \
+            --with-apxs=${prefix}/sbin/apxs
+    } else {
+        destroot.violate_mtree yes
+        configure.args-append \
+            --with-apxs=/usr/sbin/apxs
+    }
 }
 
 # Build an Apache 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} {
-	destroot.violate_mtree yes
-	depends_lib-append \
-		path:${prefix}/apache2/bin/apxs:apache2
-	configure.args-append \
-		--with-apxs2=${prefix}/apache2/bin/apxs
+    destroot.violate_mtree yes
+    depends_lib-append \
+        path:${prefix}/apache2/bin/apxs:apache2
+    configure.args-append \
+        --with-apxs2=${prefix}/apache2/bin/apxs
 }
 
 # 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} {
-	if { ![variant_isset apache] && ![variant_isset apache2] } {
-		configure.args-append \
-			--enable-fastcgi \
-			--enable-force-cgi-redirect \
-			--enable-memory-limit
-	}
+    if { ![variant_isset apache] && ![variant_isset apache2] } {
+        configure.args-append \
+            --enable-fastcgi \
+            --enable-force-cgi-redirect \
+            --enable-memory-limit
+    }
 }
 
 variant gmp description {Add GNU MP functions} {
@@ -166,157 +166,157 @@
 # Add IMAP support. See:
 # http://www.php.net/imap
 variant imap description {enable operation with IMAP protocol} {
-	depends_lib-append \
-		port:cclient
-	configure.args-append \
-		--with-imap=${prefix} \
-		--with-imap-ssl=${prefix}
+    depends_lib-append \
+        port:cclient
+    configure.args-append \
+        --with-imap=${prefix} \
+        --with-imap-ssl=${prefix}
 }
 
 # Add Tidy support. See:
 # http://www.php.net/tidy
 variant tidy description {add Tidy support} {
-	depends_lib-append \
-		port:tidy
-	configure.args-append \
-		--with-tidy=${prefix}
+    depends_lib-append \
+        port:tidy
+    configure.args-append \
+        --with-tidy=${prefix}
 }
 
 variant mssql description {add support for MS-SQL server} {
-	depends_lib-append \
-		port:freetds
-	configure.args-append \
-		--with-mssql=${prefix}
+    depends_lib-append \
+        port:freetds
+    configure.args-append \
+        --with-mssql=${prefix}
 }
 
 variant snmp conflicts macports_snmp description {use Apple snmp} {
-# This compiles PHP5 with SNMP linked against Apple's included NET-SNMP.
-	configure.args-append \
-		--with-snmp=/usr
+    # This compiles PHP5 with SNMP linked against Apple's included NET-SNMP.
+    configure.args-append \
+        --with-snmp=/usr
 }
 
 variant macports_snmp conflicts snmp description {use MacPorts snmp} {
-# This compiles PHP with SNMP linked against MacPorts' NET-SNMP.
-	depends_lib-append \
-		port:net-snmp
-	configure.args-append \
-		--with-snmp=${prefix}
+    # This compiles PHP with SNMP linked against MacPorts' NET-SNMP.
+    depends_lib-append \
+        port:net-snmp
+    configure.args-append \
+        --with-snmp=${prefix}
 }
 
 variant mysql3 conflicts mysql4 mysql5 description {build MySQL 3 support} {
-	depends_lib-append \
-		port:mysql3
-	configure.args-delete \
-		--without-mysql
-	configure.args-append \
-		--with-mysql=${prefix} \
-		--with-pdo-mysql=${prefix}
+    depends_lib-append \
+        port:mysql3
+    configure.args-delete \
+        --without-mysql
+    configure.args-append \
+        --with-mysql=${prefix} \
+        --with-pdo-mysql=${prefix}
 }
 
 variant mysql4 conflicts mysql3 mysql5 description {build MySQL 4 support} {
-	depends_lib-append \
-		port:mysql4
-	configure.args-delete \
-		--without-mysql
-	configure.args-append \
-		--with-mysql=${prefix} \
-		--with-pdo-mysql=${prefix}
+    depends_lib-append \
+        port:mysql4
+    configure.args-delete \
+        --without-mysql
+    configure.args-append \
+        --with-mysql=${prefix} \
+        --with-pdo-mysql=${prefix}
 }
 
 variant mysql5 conflicts mysql3 mysql4 description {build MySQL 5 support} {
-	depends_lib-append \
-		path:${prefix}/bin/mysql_config5:mysql5
-	configure.args-delete \
-		--without-mysql
-	configure.args-append \
-		--with-mysql=${workpath}/mysql5 \
-		--with-pdo-mysql=${prefix}/bin/mysql_config5 \
-		--with-mysql-sock=${prefix}/var/run/mysql5/mysqld.sock \
-		--with-mysqli=${prefix}/bin/mysql_config5
-	post-extract {
-		file mkdir "${workpath}/mysql5"
-		file link -symbolic "${workpath}/mysql5/lib" "${prefix}/lib/mysql5"
-		file link -symbolic "${workpath}/mysql5/include" "${prefix}/include/mysql5"
-	}
+    depends_lib-append \
+        path:${prefix}/bin/mysql_config5:mysql5
+    configure.args-delete \
+        --without-mysql
+    configure.args-append \
+        --with-mysql=${workpath}/mysql5 \
+        --with-pdo-mysql=${prefix}/bin/mysql_config5 \
+        --with-mysql-sock=${prefix}/var/run/mysql5/mysqld.sock \
+        --with-mysqli=${prefix}/bin/mysql_config5
+    post-extract {
+        file mkdir "${workpath}/mysql5"
+        file link -symbolic "${workpath}/mysql5/lib" "${prefix}/lib/mysql5"
+        file link -symbolic "${workpath}/mysql5/include" "${prefix}/include/mysql5"
+    }
 }
 
 variant oracle description {Add Oracle oci8 database functions with the Oracle Instant Client} {
-	depends_lib-append \
-		port:oracle-instantclient
-	configure.args-append \
-		--with-oci8=instantclient,${prefix}/lib/oracle
+    depends_lib-append \
+        port:oracle-instantclient
+    configure.args-append \
+        --with-oci8=instantclient,${prefix}/lib/oracle
 }
 
 variant postgresql description {provide postgresql support} {
-	depends_lib-append \
-		port:postgresql82
-	configure.args-append \
-		--with-pgsql=${prefix}/lib/postgresql82/bin \
-		--with-pdo-pgsql=${prefix}/lib/postgresql82/bin
+    depends_lib-append \
+        port:postgresql82
+    configure.args-append \
+        --with-pgsql=${prefix}/lib/postgresql82/bin \
+        --with-pdo-pgsql=${prefix}/lib/postgresql82/bin
 }
 
 # add sqlite support
 # note that standard sqlite support uses the built-in sqlite2 libraries
 # while pdo sqlite support uses the sqlite3 libraries from the sqlite3 port
 variant sqlite description {build sqlite support} {
-	depends_lib-append \
-		port:sqlite3
-	configure.args-delete \
-		--without-sqlite \
-		--without-pdo-sqlite
-	configure.args-append \
-		--with-sqlite \
-		--with-pdo-sqlite=${prefix} \
-		--enable-sqlite-utf8
+    depends_lib-append \
+        port:sqlite3
+    configure.args-delete \
+        --without-sqlite \
+        --without-pdo-sqlite
+    configure.args-append \
+        --with-sqlite \
+        --with-pdo-sqlite=${prefix} \
+        --enable-sqlite-utf8
 }
 
 # add semaphore, shared memory and IPC functions; see http://www.php.net/sem
 variant ipc description {build IPC support} {
-	configure.args-append \
-		--enable-shmop \
-		--enable-sysvsem \
-		--enable-sysvshm \
-		--enable-sysvmsg
+    configure.args-append \
+        --enable-shmop \
+        --enable-sysvsem \
+        --enable-sysvshm \
+        --enable-sysvmsg
 }
 
 # add process control functions; see http://www.php.net/pcntl
 variant pcntl description {provide process control} {
-	configure.args-append \
-		--enable-pcntl
+    configure.args-append \
+        --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 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
+    }
 }
 
 variant pear description {add pear stuff} {
-	configure.args-delete \
-		--without-pear
-	configure.args-append \
-		--with-pear=${prefix}/lib/php
-	destroot.target-append \
-		install-pear
-	destroot.args-append \
-		PHP_PEAR_INSTALL_DIR=${prefix}/lib/php
-	post-destroot {
-		#nuke pear-stuff in ${destroot}
-		system "cd ${destroot} && rm -rf .channels .depdb .depdblock .filemap .lock"
+    configure.args-delete \
+        --without-pear
+    configure.args-append \
+        --with-pear=${prefix}/lib/php
+    destroot.target-append \
+        install-pear
+    destroot.args-append \
+        PHP_PEAR_INSTALL_DIR=${prefix}/lib/php
+    post-destroot {
+        #nuke pear-stuff in ${destroot}
+        system "cd ${destroot} && rm -rf .channels .depdb .depdblock .filemap .lock"
 
-		system "if \[ -f ${prefix}/lib/php/.depdblock \]; then rm -f ${destroot}${prefix}/lib/php/.depdblock; fi"
-		system "if \[ -f ${prefix}/lib/php/.depdb \]; then rm -f ${destroot}${prefix}/lib/php/.depdb; fi"
-		system "if \[ -f ${prefix}/lib/php/.filemap \]; then rm -f ${destroot}${prefix}/lib/php/.filemap; fi"
-		system "if \[ -f ${prefix}/lib/php/.lock \]; then rm -f ${destroot}${prefix}/lib/php/.lock; fi"
-		system "if \[ -d ${prefix}/lib/php/.channels \]; then rm -rf ${destroot}${prefix}/lib/php/.channels; fi"
-	}
+        system "if \[ -f ${prefix}/lib/php/.depdblock \]; then rm -f ${destroot}${prefix}/lib/php/.depdblock; fi"
+        system "if \[ -f ${prefix}/lib/php/.depdb \]; then rm -f ${destroot}${prefix}/lib/php/.depdb; fi"
+        system "if \[ -f ${prefix}/lib/php/.filemap \]; then rm -f ${destroot}${prefix}/lib/php/.filemap; fi"
+        system "if \[ -f ${prefix}/lib/php/.lock \]; then rm -f ${destroot}${prefix}/lib/php/.lock; fi"
+        system "if \[ -d ${prefix}/lib/php/.channels \]; then rm -rf ${destroot}${prefix}/lib/php/.channels; fi"
+    }
 }
 
 variant readline description {Add GNU readline functions} {
@@ -327,103 +327,103 @@
 }
 
 variant sockets description {Add socket communication functions} {
-	# Note: This extension will be moved to the PECL repository and will no longer be bundled with PHP as of PHP 5.3.0.
-	# This variant should be removed when the port is upgraded to PHP 5.3.0.
-	configure.args-append \
-		--enable-sockets
+    # Note: This extension will be moved to the PECL repository and will no longer be bundled with PHP as of PHP 5.3.0.
+    # This variant should be removed when the port is upgraded to PHP 5.3.0.
+    configure.args-append \
+        --enable-sockets
 }
 
 destroot.args \
-	INSTALL_ROOT=${destroot}
+    INSTALL_ROOT=${destroot}
 
 destroot.target \
-	install-cli install-build install-headers install-programs
+    install-cli install-build install-headers install-programs
 
 post-destroot {
-	# Copy the Apache 1 module.
-	if { [variant_isset apache] } {
-		xinstall -m 755 -d ${destroot}${prefix}/libexec/apache \
-			${destroot}${prefix}/etc/apache/extras-conf
-		xinstall -m 755 ${worksrcpath}/libs/libphp5.so ${destroot}${prefix}/libexec/apache/
-		xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}$prefix/etc/apache/extras-conf
-	}
+    # Copy the Apache 1 module.
+    if { [variant_isset apache] } {
+        xinstall -m 755 -d ${destroot}${prefix}/libexec/apache \
+            ${destroot}${prefix}/etc/apache/extras-conf
+        xinstall -m 755 ${worksrcpath}/libs/libphp5.so ${destroot}${prefix}/libexec/apache/
+        xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}$prefix/etc/apache/extras-conf
+    }
 
-	# Copy the Apache 2 module.
-	if { [variant_isset apache2] } {
-		xinstall -m 755 -d ${destroot}${prefix}/apache2/modules \
-			${destroot}${prefix}/apache2/conf/extras-conf
-		xinstall -m 755 ${worksrcpath}/libs/libphp5.so ${destroot}${prefix}/apache2/modules/
-		xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache2/conf/extras-conf
-	}
+    # Copy the Apache 2 module.
+    if { [variant_isset apache2] } {
+        xinstall -m 755 -d ${destroot}${prefix}/apache2/modules \
+            ${destroot}${prefix}/apache2/conf/extras-conf
+        xinstall -m 755 ${worksrcpath}/libs/libphp5.so ${destroot}${prefix}/apache2/modules/
+        xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache2/conf/extras-conf
+    }
 
-	if { [variant_isset fastcgi] } {
-		# If we've built an Apache module (any version) then the FastCGI binary
-		# will not have been built, so we need to run through the whole process
-		# again and build just the FastCGI binary. Keep the options here in sync
-		# with the options specified in the apache and apache2 variants.
-		if { [variant_isset apache] } {
-			if { ![variant_isset macosx] } {
-				configure.args-delete \
-					--with-apxs=${prefix}/sbin/apxs
-			} else {
-				configure.args-delete \
-					--with-apxs=/usr/sbin/apxs
-			}
-		}
-		if { [variant_isset apache2] } {
-			configure.args-delete \
-				--with-apxs2=${prefix}/apache2/bin/apxs
-		}
+    if { [variant_isset fastcgi] } {
+        # If we've built an Apache module (any version) then the FastCGI binary
+        # will not have been built, so we need to run through the whole process
+        # again and build just the FastCGI binary. Keep the options here in sync
+        # with the options specified in the apache and apache2 variants.
+        if { [variant_isset apache] } {
+            if { ![variant_isset macosx] } {
+                configure.args-delete \
+                    --with-apxs=${prefix}/sbin/apxs
+            } else {
+                configure.args-delete \
+                    --with-apxs=/usr/sbin/apxs
+            }
+        }
+        if { [variant_isset apache2] } {
+            configure.args-delete \
+                --with-apxs2=${prefix}/apache2/bin/apxs
+        }
 
-		# Run the build again to get the FastCGI binary. Keep the options here
-		# in sync with those in the fastcgi variant.
-		if { [variant_isset apache] || [variant_isset apache2] } {
-			configure.args-append \
-				--enable-fastcgi \
-				--enable-force-cgi-redirect \
-				--enable-memory-limit
-			ui_msg "$UI_PREFIX Configuring ${name} again for fastcgi"
-			command_exec configure
-			ui_msg "$UI_PREFIX Building ${name} again for fastcgi"
-			command_exec build
-			ui_msg "$UI_PREFIX Staging ${name} fastcgi into destroot"
-		}
+        # Run the build again to get the FastCGI binary. Keep the options here
+        # in sync with those in the fastcgi variant.
+        if { [variant_isset apache] || [variant_isset apache2] } {
+            configure.args-append \
+                --enable-fastcgi \
+                --enable-force-cgi-redirect \
+                --enable-memory-limit
+            ui_msg "$UI_PREFIX Configuring ${name} again for fastcgi"
+            command_exec configure
+            ui_msg "$UI_PREFIX Building ${name} again for fastcgi"
+            command_exec build
+            ui_msg "$UI_PREFIX Staging ${name} fastcgi into destroot"
+        }
 
-		# Copy the FastCGI binary to the bin dir under a new name so it doesn't
-		# conflict with the cli version.
-		xinstall -m 755 ${worksrcpath}/sapi/cgi/php-cgi ${destroot}${prefix}/bin
-	}
+        # Copy the FastCGI binary to the bin dir under a new name so it doesn't
+        # conflict with the cli version.
+        xinstall -m 755 ${worksrcpath}/sapi/cgi/php-cgi ${destroot}${prefix}/bin
+    }
 
-#	file rename ${destroot}${prefix}/etc/pear.conf ${destroot}${prefix}/etc/pear.conf.sample
+    #file rename ${destroot}${prefix}/etc/pear.conf ${destroot}${prefix}/etc/pear.conf.sample
 
-	# Copy the default php.ini files.
-	xinstall -m 755 -d ${destroot}${prefix}/etc
-	xinstall -m 755 ${workpath}/${worksrcdir}/php.ini-dist ${destroot}${prefix}/etc/php.ini-dist
-	xinstall -m 755 ${workpath}/${worksrcdir}/php.ini-recommended ${destroot}${prefix}/etc/php.ini-recommended
+    # Copy the default php.ini files.
+    xinstall -m 755 -d ${destroot}${prefix}/etc
+    xinstall -m 755 ${workpath}/${worksrcdir}/php.ini-dist ${destroot}${prefix}/etc/php.ini-dist
+    xinstall -m 755 ${workpath}/${worksrcdir}/php.ini-recommended ${destroot}${prefix}/etc/php.ini-recommended
 }
 
 post-install {
-	ui_msg "\nIf this is your first install, you might want"
+    ui_msg "\nIf this is your first install, you might want"
 
-	if { [variant_isset apache] } {
-		ui_msg " * enable php in apache :\n"
+    if { [variant_isset apache] } {
+        ui_msg " * enable php in apache :\n"
 
-		ui_msg "cd ${prefix}/libexec/apache"
-		ui_msg "${prefix}/apache/bin/apxs -a -e -n \"php5\" libphp5.so\n"
-		ui_msg "* copy  ${prefix}/etc/php.ini-dist to  ${prefix}/etc/php.ini"
-	}
+        ui_msg "cd ${prefix}/libexec/apache"
+        ui_msg "${prefix}/apache/bin/apxs -a -e -n \"php5\" libphp5.so\n"
+        ui_msg "* copy  ${prefix}/etc/php.ini-dist to  ${prefix}/etc/php.ini"
+    }
 
-	if { [variant_isset apache2] } {
-		ui_msg "cd ${prefix}/apache2/modules"
-		ui_msg "${prefix}/apache2/bin/apxs -a -e -n \"php5\" libphp5.so\n"
-		ui_msg "* copy  ${prefix}/etc/php.ini-dist to  ${prefix}/etc/php.ini"
-	}
+    if { [variant_isset apache2] } {
+        ui_msg "cd ${prefix}/apache2/modules"
+        ui_msg "${prefix}/apache2/bin/apxs -a -e -n \"php5\" libphp5.so\n"
+        ui_msg "* copy  ${prefix}/etc/php.ini-dist to  ${prefix}/etc/php.ini"
+    }
 
-#	ui_msg "* copy  ${prefix}/etc/pear.conf.sample to  ${prefix}/etc/pear.conf"
+    #ui_msg "* copy  ${prefix}/etc/pear.conf.sample to  ${prefix}/etc/pear.conf"
 }
 
-test.run            yes
+test.run                yes
 
-livecheck.check     regex
-livecheck.url       ${homepage}downloads.php
-livecheck.regex     get/php-(5\\.\[0-9.\]+)\\.tar
+livecheck.check         regex
+livecheck.url           ${homepage}downloads.php
+livecheck.regex         get/php-(5\\.\[0-9.\]+)\\.tar

Modified: trunk/dports/www/php5-devel/Portfile
===================================================================
--- trunk/dports/www/php5-devel/Portfile	2008-03-29 11:02:40 UTC (rev 35499)
+++ trunk/dports/www/php5-devel/Portfile	2008-03-29 11:08:19 UTC (rev 35500)
@@ -1,18 +1,18 @@
 # $Id$
 
-PortSystem      1.0
+PortSystem              1.0
 
-name            php5-devel
-version         5.2.6RC3
-revision        1
-categories      www lang php
-maintainers     ryandesign jwa
-homepage	http://qa.php.net/
-distfiles	php-${version}.tar.bz2
-use_bzip2	yes
-worksrcdir	php-${version}
-platforms	darwin freebsd
-dist_subdir     php5
+name                    php5-devel
+version                 5.2.6RC3
+revision                1
+categories              www lang php
+maintainers             ryandesign jwa
+homepage                http://qa.php.net/
+distfiles               php-${version}.tar.bz2
+use_bzip2               yes
+worksrcdir              php-${version}
+platforms               darwin freebsd
+dist_subdir             php5
 
 description \
     PHP: Hypertext Preprocessor
@@ -90,25 +90,25 @@
 
 platform darwin 6 {
     depends_lib-append \
-	lib:libdl:dlcompat
+        lib:libdl:dlcompat
     configure.env-append \
-	LIBS=-ldl
+        LIBS=-ldl
     configure.cppflags-append \
-	"-no-cpp-precomp -DBIND_8_COMPAT"
+        "-no-cpp-precomp -DBIND_8_COMPAT"
 }
 
 platform darwin 7 {
     configure.env-append \
-	LIBS=-ldl
+        LIBS=-ldl
     configure.cppflags-append \
-	"-no-cpp-precomp"
+        "-no-cpp-precomp"
 }
 
 platform macosx {
     configure.args-append \
-	--with-ldap=/usr \
-	--with-kerberos=/usr \
-	--with-iodbc=/usr
+        --with-ldap=/usr \
+        --with-kerberos=/usr \
+        --with-iodbc=/usr
 }
 
 # Build an Apache 1 module. On Mac OS X, it uses Apple's provided Apache 1 server.
@@ -116,14 +116,14 @@
 # in sync with those in the relevant part of the post-destroot phase.
 variant apache conflicts apache2 description {for Apple Apache} {
     if { ! [variant_isset macosx] } {
-	depends_lib-append \
-	    port:apache
-	configure.args-append \
-	    --with-apxs=${prefix}/sbin/apxs
+        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
+        destroot.violate_mtree yes
+        configure.args-append \
+            --with-apxs=/usr/sbin/apxs
     }
 }
 
@@ -132,19 +132,19 @@
 variant apache2 conflicts apache description {for current Apache} {
     destroot.violate_mtree yes
     depends_lib-append \
-	port:apache2
+        port:apache2
     configure.args-append \
-	--with-apxs2=${prefix}/apache2/bin/apxs
+        --with-apxs2=${prefix}/apache2/bin/apxs
 }
 
 # 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} {
     if { ![variant_isset apache] && ![variant_isset apache2] } {
-	configure.args-append \
-	    --enable-fastcgi \
-	    --enable-force-cgi-redirect \
-	    --enable-memory-limit
+        configure.args-append \
+            --enable-fastcgi \
+            --enable-force-cgi-redirect \
+            --enable-memory-limit
     }
 }
 
@@ -159,95 +159,94 @@
 # http://www.php.net/imap
 variant imap description {enable operation with IMAP protocol} {
     depends_lib-append \
-	port:cclient
+        port:cclient
     configure.cppflags-append \
-	-I${prefix}/include/c-client
+        -I${prefix}/include/c-client
     configure.args-append \
-	--with-imap=${prefix} \
-	--with-imap-ssl=${prefix}
+        --with-imap=${prefix} \
+        --with-imap-ssl=${prefix}
 }
 
 # Add Tidy support. See:
 # http://www.php.net/tidy
 variant tidy description {add Tidy support} {
     depends_lib-append \
-	port:tidy
+        port:tidy
     configure.args-append \
-	--with-tidy=${prefix}
+        --with-tidy=${prefix}
 }
 
 variant mssql description {add support for MS-SQL server} {
     depends_lib-append \
-	port:freetds
+        port:freetds
     configure.args-append \
-	--with-mssql=${prefix}
+        --with-mssql=${prefix}
 }
 
 variant snmp conflicts macports_snmp description {use Apple snmp} {
     # This compiles PHP5 with SNMP linked against Apple's included NET-SNMP.
     configure.args-append \
-	--with-snmp=/usr
+        --with-snmp=/usr
 }
 
 variant macports_snmp conflicts snmp description {use MacPorts snmp} {
     # This compiles PHP with SNMP linked against MacPorts' NET-SNMP.
     depends_lib-append \
-	port:net-snmp
+        port:net-snmp
     configure.args-append \
-	--with-snmp=${prefix}
+        --with-snmp=${prefix}
 }
 
 variant mysql3 conflicts mysql4 mysql5 description {build MySQL 3 support} {
     depends_lib-append \
-	port:mysql3
+        port:mysql3
     configure.args-delete \
-	--without-mysql
+        --without-mysql
     configure.args-append \
-	--with-mysql=${prefix} \
-	--with-pdo-mysql=${prefix}
+        --with-mysql=${prefix} \
+        --with-pdo-mysql=${prefix}
 }
 
 variant mysql4 conflicts mysql3 mysql5 description {build MySQL 4 support} {
     depends_lib-append \
-	port:mysql4
+        port:mysql4
     configure.args-delete \
-	--without-mysql
+        --without-mysql
     configure.args-append \
-	--with-mysql=${prefix} \
-	--with-pdo-mysql=${prefix}
+        --with-mysql=${prefix} \
+        --with-pdo-mysql=${prefix}
 }
 
 variant mysql5 conflicts mysql3 mysql4 description {build MySQL 5 support} {
     depends_lib-append \
-	path:${prefix}/bin/mysql_config5:mysql5
+        path:${prefix}/bin/mysql_config5:mysql5
     configure.args-delete \
-	--without-mysql
+        --without-mysql
     configure.args-append \
-	--with-mysql=${workpath}/mysql5 \
-	--with-pdo-mysql=${prefix}/bin/mysql_config5 \
-	--with-mysql-sock=${prefix}/var/run/mysql5/mysqld.sock \
-	--with-mysqli=${prefix}/bin/mysql_config5
+        --with-mysql=${workpath}/mysql5 \
+        --with-pdo-mysql=${prefix}/bin/mysql_config5 \
+        --with-mysql-sock=${prefix}/var/run/mysql5/mysqld.sock \
+        --with-mysqli=${prefix}/bin/mysql_config5
     post-extract {
-	file mkdir "${workpath}/mysql5"
-	file link -symbolic "${workpath}/mysql5/lib" "${prefix}/lib/mysql5"
-	file link -symbolic "${workpath}/mysql5/include" "${prefix}/include/mysql5"
+        file mkdir "${workpath}/mysql5"
+        file link -symbolic "${workpath}/mysql5/lib" "${prefix}/lib/mysql5"
+        file link -symbolic "${workpath}/mysql5/include" "${prefix}/include/mysql5"
     }
 }
 
-
 variant oracle description {Add Oracle oci8 database functions with the Oracle Instant Client} {
-	depends_lib-append \
-		port:oracle-instantclient
-	configure.args-append \
-		--with-oci8=instantclient,${prefix}/lib/oracle
+    depends_lib-append \
+        port:oracle-instantclient
+    configure.args-append \
+        --with-oci8=instantclient,${prefix}/lib/oracle
 }
 
 variant postgresql description {provide postgresql support} {
     depends_lib-append \
-	port:postgresql82
+        port:postgresql82
     configure.args-append \
-	--with-pgsql=${prefix}/lib/postgresql82/bin \
-	--with-pdo-pgsql=${prefix}/lib/postgresql82/bin
+        --with-pgsql=${prefix}/lib/postgresql82/bin \
+        --with-pdo-pgsql=${prefix}/lib/postgresql82/bin
 }
 
 # add sqlite support
@@ -255,62 +254,62 @@
 # while pdo sqlite support uses the sqlite3 libraries from the sqlite3 port
 variant sqlite description {build sqlite support} {
     depends_lib-append \
-	port:sqlite3
+        port:sqlite3
     configure.args-delete \
-	--without-sqlite \
-	--without-pdo-sqlite
+        --without-sqlite \
+        --without-pdo-sqlite
     configure.args-append \
-	--with-sqlite \
-	--with-pdo-sqlite=${prefix} \
-	--enable-sqlite-utf8
+        --with-sqlite \
+        --with-pdo-sqlite=${prefix} \
+        --enable-sqlite-utf8
 }
 
 # add semaphore, shared memory and IPC functions; see http://www.php.net/sem
 variant ipc description {build IPC support} {
     configure.args-append \
-	--enable-shmop \
-	--enable-sysvsem \
-	--enable-sysvshm \
-	--enable-sysvmsg
+        --enable-shmop \
+        --enable-sysvsem \
+        --enable-sysvshm \
+        --enable-sysvmsg
 }
 
 # add process control functions; see http://www.php.net/pcntl
 variant pcntl description {provide process control} {
     configure.args-append \
-	--enable-pcntl
+        --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
+        depends_lib-append \
+            port:apache
+        configure.args-append \
+            --with-apxs=${prefix}/sbin/apxs
     } else {
-	configure.args-append \
-	    --with-apxs=/usr/sbin/apxs
+        configure.args-append \
+            --with-apxs=/usr/sbin/apxs
     }
 }
 
 variant pear description {add pear stuff} {
     configure.args-delete \
-	--without-pear
+        --without-pear
     configure.args-append \
-	--with-pear=${prefix}/lib/php
+        --with-pear=${prefix}/lib/php
     destroot.target-append \
-	install-pear
+        install-pear
     destroot.args-append \
-	PHP_PEAR_INSTALL_DIR=${prefix}/lib/php
+        PHP_PEAR_INSTALL_DIR=${prefix}/lib/php
     post-destroot {
-	#nuke pear-stuff in ${destroot}
-	system "cd ${destroot} && rm -rf .channels .depdb .depdblock .filemap .lock"
+        #nuke pear-stuff in ${destroot}
+        system "cd ${destroot} && rm -rf .channels .depdb .depdblock .filemap .lock"
 
-	system "if \[ -f ${prefix}/lib/php/.depdblock \]; then rm -f ${destroot}${prefix}/lib/php/.depdblock; fi"
-	system "if \[ -f ${prefix}/lib/php/.depdb \]; then rm -f ${destroot}${prefix}/lib/php/.depdb; fi"
-	system "if \[ -f ${prefix}/lib/php/.filemap \]; then rm -f ${destroot}${prefix}/lib/php/.filemap; fi"
-	system "if \[ -f ${prefix}/lib/php/.lock \]; then rm -f ${destroot}${prefix}/lib/php/.lock; fi"
-	system "if \[ -d ${prefix}/lib/php/.channels \]; then rm -rf ${destroot}${prefix}/lib/php/.channels; fi"
+        system "if \[ -f ${prefix}/lib/php/.depdblock \]; then rm -f ${destroot}${prefix}/lib/php/.depdblock; fi"
+        system "if \[ -f ${prefix}/lib/php/.depdb \]; then rm -f ${destroot}${prefix}/lib/php/.depdb; fi"
+        system "if \[ -f ${prefix}/lib/php/.filemap \]; then rm -f ${destroot}${prefix}/lib/php/.filemap; fi"
+        system "if \[ -f ${prefix}/lib/php/.lock \]; then rm -f ${destroot}${prefix}/lib/php/.lock; fi"
+        system "if \[ -d ${prefix}/lib/php/.channels \]; then rm -rf ${destroot}${prefix}/lib/php/.channels; fi"
     }
 }
 
@@ -322,10 +321,10 @@
 }
 
 variant sockets description {Add socket communication functions} {
-	# Note: This extension will be moved to the PECL repository and will no longer be bundled with PHP as of PHP 5.3.0.
-	# This variant should be removed when the port is upgraded to PHP 5.3.0.
-	configure.args-append \
-		--enable-sockets
+    # Note: This extension will be moved to the PECL repository and will no longer be bundled with PHP as of PHP 5.3.0.
+    # This variant should be removed when the port is upgraded to PHP 5.3.0.
+    configure.args-append \
+        --enable-sockets
 }
 
 destroot.args \
@@ -334,62 +333,62 @@
 destroot.target \
     install-cli install-build install-headers install-programs
 
-post-destroot	{
+post-destroot {
     # Copy the Apache 1 module.
     if { [variant_isset apache] } {
-	xinstall -m 755 -d ${destroot}${prefix}/libexec/apache \
-	    ${destroot}${prefix}/etc/apache/extras-conf
-	xinstall -m 755 ${worksrcpath}/libs/libphp5.so ${destroot}${prefix}/libexec/apache/
-	xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}$prefix/etc/apache/extras-conf
+        xinstall -m 755 -d ${destroot}${prefix}/libexec/apache \
+            ${destroot}${prefix}/etc/apache/extras-conf
+        xinstall -m 755 ${worksrcpath}/libs/libphp5.so ${destroot}${prefix}/libexec/apache/
+        xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}$prefix/etc/apache/extras-conf
     }
 
     # Copy the Apache 2 module.
     if { [variant_isset apache2] } {
-	xinstall -m 755 -d ${destroot}${prefix}/apache2/modules \
-	    ${destroot}${prefix}/apache2/conf/extras-conf
-	xinstall -m 755 ${worksrcpath}/libs/libphp5.so ${destroot}${prefix}/apache2/modules/
-	xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache2/conf/extras-conf
+        xinstall -m 755 -d ${destroot}${prefix}/apache2/modules \
+            ${destroot}${prefix}/apache2/conf/extras-conf
+        xinstall -m 755 ${worksrcpath}/libs/libphp5.so ${destroot}${prefix}/apache2/modules/
+        xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache2/conf/extras-conf
     }
 
     if { [variant_isset fastcgi] } {
-	# If we've built an Apache module (any version) then the FastCGI binary
-	# will not have been built, so we need to run through the whole process
-	# again and build just the FastCGI binary. Keep the options here in sync
-	# with the options specified in the apache and apache2 variants.
-	if { [variant_isset apache] } {
-	    if { ![variant_isset macosx] } {
-		configure.args-delete \
-		    --with-apxs=${prefix}/sbin/apxs
-	    } else {
-		configure.args-delete \
-		    --with-apxs=/usr/sbin/apxs
-	    }
-	}
-	if { [variant_isset apache2] } {
-	    configure.args-delete \
-		--with-apxs2=${prefix}/apache2/bin/apxs
-	}
+        # If we've built an Apache module (any version) then the FastCGI binary
+        # will not have been built, so we need to run through the whole process
+        # again and build just the FastCGI binary. Keep the options here in sync
+        # with the options specified in the apache and apache2 variants.
+        if { [variant_isset apache] } {
+            if { ![variant_isset macosx] } {
+                configure.args-delete \
+                    --with-apxs=${prefix}/sbin/apxs
+            } else {
+                configure.args-delete \
+                    --with-apxs=/usr/sbin/apxs
+            }
+        }
+        if { [variant_isset apache2] } {
+            configure.args-delete \
+                --with-apxs2=${prefix}/apache2/bin/apxs
+        }
 
-	# Run the build again to get the FastCGI binary. Keep the options here
-	# in sync with those in the fastcgi variant.
-	if { [variant_isset apache] || [variant_isset apache2] } {
-	    configure.args-append \
-		--enable-fastcgi \
-		--enable-force-cgi-redirect \
-		--enable-memory-limit
-	    ui_msg "$UI_PREFIX Configuring ${name} again for fastcgi"
-	    command_exec configure
-	    ui_msg "$UI_PREFIX Building ${name} again for fastcgi"
-	    command_exec build
-	    ui_msg "$UI_PREFIX Staging ${name} fastcgi into destroot"
-	}
+        # Run the build again to get the FastCGI binary. Keep the options here
+        # in sync with those in the fastcgi variant.
+        if { [variant_isset apache] || [variant_isset apache2] } {
+            configure.args-append \
+                --enable-fastcgi \
+                --enable-force-cgi-redirect \
+                --enable-memory-limit
+            ui_msg "$UI_PREFIX Configuring ${name} again for fastcgi"
+            command_exec configure
+            ui_msg "$UI_PREFIX Building ${name} again for fastcgi"
+            command_exec build
+            ui_msg "$UI_PREFIX Staging ${name} fastcgi into destroot"
+        }
 
-	# Copy the FastCGI binary to the bin dir under a new name so it doesn't
-	# conflict with the cli version.
-	xinstall -m 755 ${worksrcpath}/sapi/cgi/php-cgi ${destroot}${prefix}/bin
+        # Copy the FastCGI binary to the bin dir under a new name so it doesn't
+        # conflict with the cli version.
+        xinstall -m 755 ${worksrcpath}/sapi/cgi/php-cgi ${destroot}${prefix}/bin
     }
 
-    #	file rename ${destroot}${prefix}/etc/pear.conf ${destroot}${prefix}/etc/pear.conf.sample
+    #file rename ${destroot}${prefix}/etc/pear.conf ${destroot}${prefix}/etc/pear.conf.sample
 
     # Copy the default php.ini files.
     xinstall -m 755 -d ${destroot}${prefix}/etc
@@ -401,24 +400,24 @@
     ui_msg "\nIf this is your first install, you might want"
 
     if { [variant_isset apache] } {
-	ui_msg " * enable php in apache :\n"
+        ui_msg " * enable php in apache :\n"
 
-	ui_msg "cd ${prefix}/libexec/apache"
-	ui_msg "${prefix}/apache/bin/apxs -a -e -n \"php5\" libphp5.so\n"
-	ui_msg "* copy  ${prefix}/etc/php.ini-dist to  ${prefix}/etc/php.ini"
+        ui_msg "cd ${prefix}/libexec/apache"
+        ui_msg "${prefix}/apache/bin/apxs -a -e -n \"php5\" libphp5.so\n"
+        ui_msg "* copy  ${prefix}/etc/php.ini-dist to  ${prefix}/etc/php.ini"
     }
 
     if { [variant_isset apache2] } {
-	ui_msg "cd ${prefix}/apache2/modules"
-	ui_msg "${prefix}/apache2/bin/apxs -a -e -n \"php5\" libphp5.so\n"
-	ui_msg "* copy  ${prefix}/etc/php.ini-dist to  ${prefix}/etc/php.ini"
+        ui_msg "cd ${prefix}/apache2/modules"
+        ui_msg "${prefix}/apache2/bin/apxs -a -e -n \"php5\" libphp5.so\n"
+        ui_msg "* copy  ${prefix}/etc/php.ini-dist to  ${prefix}/etc/php.ini"
     }
 
-    #	ui_msg "* copy  ${prefix}/etc/pear.conf.sample to  ${prefix}/etc/pear.conf"
+    #ui_msg "* copy  ${prefix}/etc/pear.conf.sample to  ${prefix}/etc/pear.conf"
 }
 
-test.run            yes
+test.run                yes
 
-livecheck.check     regex
-livecheck.url       ${homepage}
-livecheck.regex     php-?(5\\.\[0-9.\]+(?:RC\\d+|-latest))\\.tar
+livecheck.check         regex
+livecheck.url           ${homepage}
+livecheck.regex         php-?(5\\.\[0-9.\]+(?:RC\\d+|-latest))\\.tar

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080329/d1365bb9/attachment-0001.html


More information about the macports-changes mailing list