[42094] trunk/dports/www

ryandesign at macports.org ryandesign at macports.org
Fri Nov 14 20:39:38 PST 2008


Revision: 42094
          http://trac.macports.org/changeset/42094
Author:   ryandesign at macports.org
Date:     2008-11-14 20:39:38 -0800 (Fri, 14 Nov 2008)
Log Message:
-----------
php4, php5, php5-devel: whitespace changes to make these ports more consistent with one another

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-11-15 02:51:37 UTC (rev 42093)
+++ trunk/dports/www/php4/Portfile	2008-11-15 04:39:38 UTC (rev 42094)
@@ -1,21 +1,27 @@
 # $Id$
 
-PortSystem 1.0
+PortSystem              1.0
 
-name            php4
-version         4.4.9
+name                    php4
+version                 4.4.9
+categories              www php lang
+maintainers             jwa ryandesign
+homepage                http://www.php.net/
+distname                php-${version}
+use_bzip2               yes
+platforms               darwin freebsd
+use_parallel_build      yes
 
-categories      www php lang
-maintainers     jwa ryandesign
-homepage        http://www.php.net/
-description     PHP: Hypertext Preprocessor
-long_description 	PHP is a widely-used general-purpose scripting \
-    language that is especially suited for Web development \
+description \
+    PHP: Hypertext Preprocessor
+
+long_description \
+    PHP is a widely-used general-purpose scripting language \
+    that is especially suited for Web development \
     and can be embedded into HTML.
-platforms	darwin freebsd
-use_parallel_build      yes
 
-master_sites 	${homepage}distributions/ \
+master_sites \
+    ${homepage}distributions/ \
     http://it.php.net/distributions/ \
     http://fi.php.net/distributions/ \
     http://de.php.net/distributions/ \
@@ -24,17 +30,17 @@
     http://es.php.net/distributions/ \
     http://se.php.net/distributions/
 
-distname	php-${version}
-use_bzip2	yes
-checksums	md5 2e3b2a0e27f10cb84fd00e5ecd7a1880 \
-    sha1 ab3d2205d756ddf93452b57bd6ce6a2014b1c374 \
-    rmd160 0d77092efaccd8fe6efc16635be98c5d4ccfec66
+checksums \
+    md5     2e3b2a0e27f10cb84fd00e5ecd7a1880 \
+    sha1    ab3d2205d756ddf93452b57bd6ce6a2014b1c374 \
+    rmd160  0d77092efaccd8fe6efc16635be98c5d4ccfec66
 
 depends_build \
     port:pkgconfig
 
-depends_lib	port:libiconv \
-    port:expat  \
+depends_lib \
+    port:libiconv \
+    port:expat \
     port:gettext \
     port:zlib \
     port:openssl \
@@ -46,16 +52,29 @@
     port:libpng \
     port:freetype
 
-configure.args	--mandir=${prefix}/share/man --infodir=${prefix}/share/info \
+configure.args \
+    --mandir=${prefix}/share/man \
+    --infodir=${prefix}/share/info \
     --includedir=${prefix}/include/php4 \
     --libdir=${prefix}/lib/php4 \
     --sysconfdir=${prefix}/etc/php4 \
     --with-config-file-path=${prefix}/etc \
-    --with-pear=${prefix}/lib/php4 --program-suffix=4 \
-    --enable-mbstring --enable-dbx --enable-safe-mode --enable-dba \
-    --enable-calendar --enable-exif --enable-ftp --enable-wddx \
-    --enable-filepro --enable-bcmath --enable-trans-sid \
-    --enable-cli --with-xml --with-xmlrpc \
+    --with-pear=${prefix}/lib/php4 \
+    --program-suffix=4 \
+    --enable-mbstring \
+    --enable-dbx \
+    --enable-safe-mode \
+    --enable-dba \
+    --enable-calendar \
+    --enable-exif \
+    --enable-ftp \
+    --enable-wddx \
+    --enable-filepro \
+    --enable-bcmath \
+    --enable-trans-sid \
+    --enable-cli \
+    --with-xml \
+    --with-xmlrpc \
     --without-mysql \
     --with-iconv=${prefix} \
     --with-zlib=${prefix} \
@@ -70,29 +89,40 @@
     --with-freetype-dir=${prefix}
 
 platform darwin 6 {
-    depends_lib-append	port:dlcompat
-    configure.cppflags-append	"-no-cpp-precomp -DBIND_8_COMPAT"
-    configure.env-append	LIBS=-ldl
+    depends_lib-append \
+        port:dlcompat
+    configure.env-append \
+        LIBS=-ldl
+    configure.cppflags-append \
+        "-no-cpp-precomp -DBIND_8_COMPAT"
 }
 
 platform darwin 7 {
-    configure.cppflags-append	"-no-cpp-precomp"
-    configure.env-append	LIBS=-ldl
+    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
 }
 
 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
+        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
     }
 }
 
@@ -103,67 +133,87 @@
         }
     }
     destroot.violate_mtree yes
-    depends_lib-append	port:apache2
-    configure.args-append 	--with-apxs2=${prefix}/apache2/bin/apxs
+    depends_lib-append \
+        port:apache2
+    configure.args-append \
+        --with-apxs2=${prefix}/apache2/bin/apxs
 }
 
 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
+    depends_lib-append \
+        port:apache20
+    configure.args-append \
+        --with-apxs2=${prefix}/apache20/bin/apxs
 }
 
 variant crypt description {interface to mcrypt library} {
-    depends_lib-append	port:mhash port:libmcrypt
-    configure.args-append	--with-mhash=${prefix} --with-mcrypt=${prefix}
+    depends_lib-append \
+        port:mhash \
+        port:libmcrypt
+    configure.args-append \
+        --with-mhash=${prefix} \
+        --with-mcrypt=${prefix}
 }
 
 variant curl description {connect to servers using different protocols} {
-    depends_lib-append	port:curl
-    configure.args-append	--with-curl=${prefix}
+    depends_lib-append \
+        port:curl
+    configure.args-append \
+        --with-curl=${prefix}
 }
 
 variant mysql3 conflicts mysql4 mysql5 description {MySQL 3 functions} {
-    depends_lib-append	port:mysql3
-    configure.args-append	--with-mysql=${prefix}
+    depends_lib-append \
+        port:mysql3
+    configure.args-append \
+        --with-mysql=${prefix}
 }
 
 variant mysql4 conflicts mysql3 mysql5 description {MySQL 4 functions} {
-    depends_lib-append	port:mysql4
-    configure.args-append	--with-mysql=${prefix}
+    depends_lib-append \
+        port:mysql4
+    configure.args-append \
+        --with-mysql=${prefix}
 }
 
-
 variant mysql5 conflicts mysql3 mysql4 description {MySQL 5 functions} {
-    depends_lib-append      path:bin/mysql_config5:mysql5
-    configure.args-delete   --without-mysql
-    configure.args-append   --with-mysql=${workpath}/mysql5
+    depends_lib-append \
+        path:bin/mysql_config5:mysql5
+    configure.args-delete \
+        --without-mysql
+    configure.args-append \
+        --with-mysql=${workpath}/mysql5
     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"
     }
-
+    
     post-destroot {
-	reinplace "s;${workpath}/mysql5/lib;${prefix}/lib/mysql5;" ${destroot}${prefix}/bin/php-config4
+        reinplace "s;${workpath}/mysql5/lib;${prefix}/lib/mysql5;" ${destroot}${prefix}/bin/php-config4
     }
 }
 
 variant postgresql8 description {add support for PostgreSQL databases} {
     pre-configure {
-	file mkdir ${workpath}/pgsql8
-	system "cd ${workpath}/pgsql8 && \
-			ln -sf ${prefix}/include/postgresql82 include && \
-			ln -sf ${prefix}/lib/postgresql82 lib && \
-			ln -sf ${prefix}/lib/postgresql82/bin bin"
+        file mkdir ${workpath}/pgsql8
+        system "cd ${workpath}/pgsql8 && \
+            ln -sf ${prefix}/include/postgresql82 include && \
+            ln -sf ${prefix}/lib/postgresql82 lib && \
+            ln -sf ${prefix}/lib/postgresql82/bin bin"
     }
-    depends_lib-append	port:postgresql82
-    configure.args-append	--with-pgsql=${workpath}/pgsql8
+    depends_lib-append \
+        port:postgresql82
+    configure.args-append \
+        --with-pgsql=${workpath}/pgsql8
 }
 
 variant ldap description {enable LDAP support} {
-    depends_lib-append	port:openldap
-    configure.args-append --with-ldap=${prefix}
+    depends_lib-append \
+        port:openldap
+    configure.args-append \
+        --with-ldap=${prefix}
 }
 
 variant gmp description {Add GNU MP functions} {
@@ -179,9 +229,13 @@
 }
 
 variant imap description {enable operatin with IMAP protocol} {
-    depends_lib-append		port:cclient
-    configure.cppflags-append	-I${prefix}/include/c-client
-    configure.args-append 	--with-imap=${prefix} --with-imap-ssl=/usr
+    depends_lib-append \
+        port:cclient
+    configure.cppflags-append \
+        -I${prefix}/include/c-client
+    configure.args-append \
+        --with-imap=${prefix} \
+        --with-imap-ssl=/usr
 }
 
 variant pspell description {Add pspell spell-checking functions} {
@@ -192,8 +246,12 @@
 }
 
 variant xslt description {a processor independent API to XSLT transformations} {
-    depends_lib-append	port:sablotron
-    configure.args-append	--enable-xslt --with-xslt-sablot=${prefix} --with-iconv-dir=${prefix}
+    depends_lib-append \
+        port:sablotron
+    configure.args-append \
+        --enable-xslt \
+        --with-xslt-sablot=${prefix} \
+        --with-iconv-dir=${prefix}
 }
 
 if {![variant_isset apache] && ![variant_isset apache2] && ![variant_isset apache20] && ![variant_isset no_web]} {
@@ -214,46 +272,49 @@
         --with-t1lib=${prefix} \
 }
 
-destroot.args	INSTALL_ROOT=${destroot} PHP_PEAR_INSTALL_DIR=${prefix}/lib/php
-destroot.target	install-cli install-pear install-build install-headers install-programs
+destroot.args \
+    INSTALL_ROOT=${destroot} PHP_PEAR_INSTALL_DIR=${prefix}/lib/php
 
-post-destroot	{
+destroot.target \
+    install-cli install-pear install-build install-headers install-programs
+
+post-destroot {
     #copy module
     if { [variant_isset apache] } {
-	xinstall -m 755 -d ${destroot}${prefix}/libexec/apache \
-	    ${destroot}${prefix}/etc/apache/extras-conf
-	xinstall -m 755 ${worksrcpath}/libs/libphp4.so ${destroot}${prefix}/libexec/apache/
-	xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}$prefix/etc/apache/extras-conf/mod_php.conf.sample
+        xinstall -m 755 -d ${destroot}${prefix}/libexec/apache \
+            ${destroot}${prefix}/etc/apache/extras-conf
+        xinstall -m 755 ${worksrcpath}/libs/libphp4.so ${destroot}${prefix}/libexec/apache/
+        xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}$prefix/etc/apache/extras-conf/mod_php.conf.sample
     }
-
+    
     if { [variant_isset apache2] } {
-	xinstall -m 755 -d ${destroot}${prefix}/apache2/modules \
-	    ${destroot}${prefix}/apache2/conf/extras-conf
-	xinstall -m 755 ${worksrcpath}/libs/libphp4.so ${destroot}${prefix}/apache2/modules/
-	xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache2/conf/extras-conf/mod_php.conf.sample
+        xinstall -m 755 -d ${destroot}${prefix}/apache2/modules \
+            ${destroot}${prefix}/apache2/conf/extras-conf
+        xinstall -m 755 ${worksrcpath}/libs/libphp4.so ${destroot}${prefix}/apache2/modules/
+        xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache2/conf/extras-conf/mod_php.conf.sample
     }
-
+    
     if { [variant_isset apache20] } {
-	xinstall -m 755 -d ${destroot}${prefix}/apache20/modules \
-	    ${destroot}${prefix}/apache20/conf/extras-conf
-	xinstall -m 755 ${worksrcpath}/libs/libphp4.so ${destroot}${prefix}/apache20/modules/
-	xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache20/conf/extras-conf/mod_php.conf.sample
+        xinstall -m 755 -d ${destroot}${prefix}/apache20/modules \
+            ${destroot}${prefix}/apache20/conf/extras-conf
+        xinstall -m 755 ${worksrcpath}/libs/libphp4.so ${destroot}${prefix}/apache20/modules/
+        xinstall -m 755 -c ${filespath}/mod_php.conf ${destroot}${prefix}/apache20/conf/extras-conf/mod_php.conf.sample
     }
-
+    
     file rename ${destroot}${prefix}/etc/php4/pear.conf ${destroot}${prefix}/etc/php4/pear.conf.sample
-
+    
     #copy php.ini
     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
-
+    
     # rename files
     file rename ${destroot}${prefix}/bin/pear ${destroot}${prefix}/bin/pear4
     reinplace "s|${prefix}/bin/php|${prefix}/bin/php4|g" ${destroot}${prefix}/bin/pear4
-
+    
     #nuke pear-stuff in ${destroot}
     system "cd ${destroot} && rm -rf .channels .depdb .depdblock .filemap .lock"
-
+    
     system "if \[ -f ${prefix}/lib/php4/.depdblock \]; then rm -f ${destroot}${prefix}/lib/php4/.depdblock; fi"
     system "if \[ -f ${prefix}/lib/php4/.depdb \]; then rm -f ${destroot}${prefix}/lib/php4/.depdb; fi"
     system "if \[ -f ${prefix}/lib/php4/.filemap \]; then rm -f ${destroot}${prefix}/lib/php4/.filemap; fi"
@@ -263,30 +324,30 @@
 
 post-install {
     ui_msg "\nIf this is your first install, you might want"
-
+    
     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 \"php4\" libphp4.so\n"
-	ui_msg "* copy  ${prefix}/etc/php.ini-dist to  ${prefix}/etc/php.ini"
+        ui_msg " * enable php in apache :\n"
+        
+        ui_msg "cd ${prefix}/libexec/apache"
+        ui_msg "${prefix}/apache/bin/apxs -a -e -n \"php4\" libphp4.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 \"php4\" libphp4.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 \"php4\" libphp4.so\n"
+        ui_msg "* copy  ${prefix}/etc/php.ini-dist to  ${prefix}/etc/php.ini"
     }
-
+    
     if { [variant_isset apache20] } {
-	ui_msg "cd ${prefix}/apache20/modules"
-	ui_msg "${prefix}/apache20/bin/apxs -a -e -n \"php4\" libphp4.so\n"
-	ui_msg "* copy  ${prefix}/etc/php.ini-dist to  ${prefix}/etc/php.ini"
+        ui_msg "cd ${prefix}/apache20/modules"
+        ui_msg "${prefix}/apache20/bin/apxs -a -e -n \"php4\" libphp4.so\n"
+        ui_msg "* copy  ${prefix}/etc/php.ini-dist to  ${prefix}/etc/php.ini"
     }
-
+    
     ui_msg "* copy  ${prefix}/etc/php4/pear.conf.sample to  ${prefix}/etc/php4/pear.conf"
 }
 
-livecheck.check     regex
-livecheck.url       ${homepage}downloads.php
-livecheck.regex     get/php-(4\.\[0-9\.\]+)\.tar
+livecheck.check         regex
+livecheck.url           ${homepage}downloads.php
+livecheck.regex         get/php-(4\.\[0-9\.\]+)\.tar

Modified: trunk/dports/www/php5/Portfile
===================================================================
--- trunk/dports/www/php5/Portfile	2008-11-15 02:51:37 UTC (rev 42093)
+++ trunk/dports/www/php5/Portfile	2008-11-15 04:39:38 UTC (rev 42094)
@@ -32,9 +32,9 @@
     http://se.php.net/distributions/
 
 checksums \
-    md5 7380ffecebd95c6edb317ef861229ebd \
-    sha1 2a2b1afa657a7739a23784c869d57c3e0a7ad6b4 \
-    rmd160 27f730d4b1ceb1c42ff03618dbfa0dc87a00990b
+    md5     7380ffecebd95c6edb317ef861229ebd \
+    sha1    2a2b1afa657a7739a23784c869d57c3e0a7ad6b4 \
+    rmd160  27f730d4b1ceb1c42ff03618dbfa0dc87a00990b
 
 depends_build \
     port:pkgconfig \
@@ -286,18 +286,18 @@
 
 variant postgresql82 conflicts postgresql83 description {provide postgresql82 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
 }
 
 variant postgresql83 conflicts postgresql82 description {provide postgresql83 support} {
     depends_lib-append \
-	port:postgresql83
+        port:postgresql83
     configure.args-append \
-	--with-pgsql=${prefix}/lib/postgresql83/bin \
-	--with-pdo-pgsql=${prefix}/lib/postgresql83/bin
+        --with-pgsql=${prefix}/lib/postgresql83/bin \
+        --with-pdo-pgsql=${prefix}/lib/postgresql83/bin
 }
 
 # add sqlite support
@@ -346,7 +346,7 @@
     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"
@@ -390,7 +390,7 @@
         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.2 module.
     if { [variant_isset apache2] } {
         xinstall -m 755 -d ${destroot}${prefix}/apache2/modules \
@@ -398,7 +398,7 @@
         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
@@ -417,7 +417,7 @@
             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] } {
@@ -431,14 +431,14 @@
             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
     }
-
+    
     #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
@@ -447,21 +447,21 @@
 
 post-install {
     ui_msg "\nIf this is your first install, you might want"
-
+    
     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"
     }
-
+    
     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"
 }
 

Modified: trunk/dports/www/php5-devel/Portfile
===================================================================
--- trunk/dports/www/php5-devel/Portfile	2008-11-15 02:51:37 UTC (rev 42093)
+++ trunk/dports/www/php5-devel/Portfile	2008-11-15 04:39:38 UTC (rev 42094)
@@ -27,9 +27,9 @@
     http://downloads.php.net/johannes/
 
 checksums \
-    md5 8e22907201809c06ba6b6177df925b29 \
-    sha1 4f9ec2637f2bce84775605658ecccde5cf1be8a2 \
-    rmd160 27ea92dae3490c495803fd55786c3dfd4535010b
+    md5     8e22907201809c06ba6b6177df925b29 \
+    sha1    4f9ec2637f2bce84775605658ecccde5cf1be8a2 \
+    rmd160  27ea92dae3490c495803fd55786c3dfd4535010b
 
 depends_build \
     port:pkgconfig \
@@ -292,18 +292,18 @@
 
 variant postgresql82 conflicts postgresql83 description {provide postgresql82 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
 }
 
 variant postgresql83 conflicts postgresql82 description {provide postgresql83 support} {
     depends_lib-append \
-	port:postgresql83
+        port:postgresql83
     configure.args-append \
-	--with-pgsql=${prefix}/lib/postgresql83/bin \
-	--with-pdo-pgsql=${prefix}/lib/postgresql83/bin
+        --with-pgsql=${prefix}/lib/postgresql83/bin \
+        --with-pdo-pgsql=${prefix}/lib/postgresql83/bin
 }
 
 # add sqlite support
@@ -352,7 +352,7 @@
     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"
@@ -396,7 +396,7 @@
         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.2 module.
     if { [variant_isset apache2] } {
         xinstall -m 755 -d ${destroot}${prefix}/apache2/modules \
@@ -404,7 +404,7 @@
         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
@@ -423,7 +423,7 @@
             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] } {
@@ -437,14 +437,14 @@
             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
     }
-
+    
     #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
@@ -453,21 +453,21 @@
 
 post-install {
     ui_msg "\nIf this is your first install, you might want"
-
+    
     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"
     }
-
+    
     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"
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081114/3bb1d41b/attachment-0001.html>


More information about the macports-changes mailing list