[61490] trunk/dports

ryandesign at macports.org ryandesign at macports.org
Sat Dec 12 23:44:28 PST 2009


Revision: 61490
          http://trac.macports.org/changeset/61490
Author:   ryandesign at macports.org
Date:     2009-12-12 23:44:25 -0800 (Sat, 12 Dec 2009)
Log Message:
-----------
php5 update:

 * php5extension ports that have headers now install them, and php5 and php5-devel now install headers for the mysqlnd extension they install (#22660)
 * php5extension ports that install multiple extensions (the database extensions) now work with the php5 port's +debug variant; php5extension ports now have +debug variants and require the use or nonuse of this variant be matched with the php5 port (#22662)
 * php5extension ports for bundled extensions now mandate a matching version of php5 installed (#22808)
 * php5extension ports now note in their .ini files that they aren't to be modified by users (#22811)
 * update suhosin patch in php5 and php5-devel to 0.9.8/5.3.1 final (#22865)

Modified Paths:
--------------
    trunk/dports/lang/php5/Portfile
    trunk/dports/lang/php5-devel/Portfile
    trunk/dports/php/php5-apc/Portfile
    trunk/dports/php/php5-calendar/Portfile
    trunk/dports/php/php5-curl/Portfile
    trunk/dports/php/php5-dba/Portfile
    trunk/dports/php/php5-eaccelerator/Portfile
    trunk/dports/php/php5-exif/Portfile
    trunk/dports/php/php5-ftp/Portfile
    trunk/dports/php/php5-gd/Portfile
    trunk/dports/php/php5-gettext/Portfile
    trunk/dports/php/php5-gmp/Portfile
    trunk/dports/php/php5-http/Portfile
    trunk/dports/php/php5-iconv/Portfile
    trunk/dports/php/php5-imagick/Portfile
    trunk/dports/php/php5-imap/Portfile
    trunk/dports/php/php5-intl/Portfile
    trunk/dports/php/php5-mbstring/Portfile
    trunk/dports/php/php5-mcrypt/Portfile
    trunk/dports/php/php5-memcache/Portfile
    trunk/dports/php/php5-mongo/Portfile
    trunk/dports/php/php5-mssql/Portfile
    trunk/dports/php/php5-mysql/Portfile
    trunk/dports/php/php5-odbc/Portfile
    trunk/dports/php/php5-openssl/Portfile
    trunk/dports/php/php5-oracle/Portfile
    trunk/dports/php/php5-pcntl/Portfile
    trunk/dports/php/php5-posix/Portfile
    trunk/dports/php/php5-postgresql/Portfile
    trunk/dports/php/php5-pspell/Portfile
    trunk/dports/php/php5-rrdtool/Portfile
    trunk/dports/php/php5-snmp/Portfile
    trunk/dports/php/php5-soap/Portfile
    trunk/dports/php/php5-sockets/Portfile
    trunk/dports/php/php5-solr/Portfile
    trunk/dports/php/php5-sqlite/Portfile
    trunk/dports/php/php5-suhosin/Portfile
    trunk/dports/php/php5-svn/Portfile
    trunk/dports/php/php5-syck/Portfile
    trunk/dports/php/php5-tidy/Portfile
    trunk/dports/php/php5-uploadprogress/Portfile
    trunk/dports/php/php5-wddx/Portfile
    trunk/dports/php/php5-xdebug/Portfile
    trunk/dports/php/php5-xhprof/Portfile
    trunk/dports/php/php5-xmlrpc/Portfile
    trunk/dports/php/php5-xsl/Portfile
    trunk/dports/php/php5-yaz/Portfile
    trunk/dports/php/php5-zip/Portfile

Added Paths:
-----------
    trunk/dports/php/php5-odbc/files/
    trunk/dports/php/php5-odbc/files/patch-unixODBC.diff

Modified: trunk/dports/lang/php5/Portfile
===================================================================
--- trunk/dports/lang/php5/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/lang/php5/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -6,6 +6,7 @@
 conflicts               php5-devel php52
 epoch                   1
 version                 5.3.1
+revision                1
 set major               [lindex [split ${version} .] 0]
 set my_name             php${major}
 dist_subdir             ${my_name}
@@ -220,16 +221,15 @@
             return -code error "incompatible Mac OS X version"
         }
     }
-#    set suhosin_patch_version   ${version}-0.9.8
-    set suhosin_patch_version   5.3.1RC1-0.9.8
+    set suhosin_patch_version   ${version}-0.9.8
     set suhosin_patch           suhosin-patch-${suhosin_patch_version}.patch.gz
     patch_sites-append          http://download.suhosin.org/
     patchfiles-append           ${suhosin_patch}
     checksums-append \
         ${suhosin_patch} \
-            md5     c3ff0cb5fa728420d56f8ed139446647 \
-            sha1    d3e8f83f81311a5f382b545cbd745dcedd5f3c93 \
-            rmd160  cfb60da9b4142b0d3fd0f7e193fe2419ba9a5d31
+            md5     bf75fe3a9bda8c7a041d86197d6da09a \
+            sha1    05decd322a34c2c071bd5f633457e4280aba3d0d \
+            rmd160  e76c7b7452b74ce198cf768d6186ee18be72bf29
 }
 
 destroot.args \
@@ -301,6 +301,10 @@
         php.ini-development \
         php.ini-production \
         ${destroot}${phpinidir}
+    
+    # Copy mysqlnd headers.
+    xinstall -d ${destroot}${prefix}/include/php/ext/mysqlnd
+    eval xinstall -m 644 [glob ${worksrcpath}/ext/mysqlnd/*.h] ${destroot}${prefix}/include/php/ext/mysqlnd
 }
 
 pre-activate {

Modified: trunk/dports/lang/php5-devel/Portfile
===================================================================
--- trunk/dports/lang/php5-devel/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/lang/php5-devel/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -6,6 +6,7 @@
 conflicts               php5 php52
 epoch                   1
 version                 5.3.1RC4
+revision                1
 set major               [lindex [split ${version} .] 0]
 set my_name             php${major}
 dist_subdir             ${my_name}
@@ -224,15 +225,15 @@
         }
     }
 #    set suhosin_patch_version   ${version}-0.9.8
-    set suhosin_patch_version   5.3.1RC1-0.9.8
+    set suhosin_patch_version   5.3.1-0.9.8
     set suhosin_patch           suhosin-patch-${suhosin_patch_version}.patch.gz
     patch_sites-append          http://download.suhosin.org/
     patchfiles-append           ${suhosin_patch}
     checksums-append \
         ${suhosin_patch} \
-            md5     c3ff0cb5fa728420d56f8ed139446647 \
-            sha1    d3e8f83f81311a5f382b545cbd745dcedd5f3c93 \
-            rmd160  cfb60da9b4142b0d3fd0f7e193fe2419ba9a5d31
+            md5     bf75fe3a9bda8c7a041d86197d6da09a \
+            sha1    05decd322a34c2c071bd5f633457e4280aba3d0d \
+            rmd160  e76c7b7452b74ce198cf768d6186ee18be72bf29
 }
 
 destroot.args \
@@ -304,6 +305,10 @@
         php.ini-development \
         php.ini-production \
         ${destroot}${phpinidir}
+    
+    # Copy mysqlnd headers.
+    xinstall -d ${destroot}${prefix}/include/php/ext/mysqlnd
+    eval xinstall -m 644 [glob ${worksrcpath}/ext/mysqlnd/*.h] ${destroot}${prefix}/include/php/ext/mysqlnd
 }
 
 pre-activate {

Modified: trunk/dports/php/php5-apc/Portfile
===================================================================
--- trunk/dports/php/php5-apc/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-apc/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -5,7 +5,7 @@
 PortGroup       php5extension 1.0
 
 php5extension.setup apc 3.1.3p1 pecl
-
+revision        1
 categories      php devel
 platforms       darwin
 maintainers     nox openmaintainer

Modified: trunk/dports/php/php5-calendar/Portfile
===================================================================
--- trunk/dports/php/php5-calendar/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-calendar/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     calendar 5.3.1 bundled
+revision                1
 categories-append       devel
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-curl/Portfile
===================================================================
--- trunk/dports/php/php5-curl/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-curl/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     curl 5.3.1 bundled
+revision                1
 categories-append       net www
 platforms               darwin
 maintainers             ryandesign
@@ -19,4 +20,6 @@
 
 depends_lib-append      port:curl
 
+configure.args-append   --with-curl=${prefix}
+
 use_parallel_build      yes

Modified: trunk/dports/php/php5-dba/Portfile
===================================================================
--- trunk/dports/php/php5-dba/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-dba/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     dba 5.3.1 bundled
+revision                1
 categories-append       databases
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-eaccelerator/Portfile
===================================================================
--- trunk/dports/php/php5-eaccelerator/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-eaccelerator/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,8 +4,7 @@
 PortGroup         php5extension 1.0
 
 php5extension.setup eaccelerator 0.9.6-rc1
-revision          1
-
+revision          2
 categories        php www devel
 platforms         darwin freebsd openbsd
 maintainers       alakazam

Modified: trunk/dports/php/php5-exif/Portfile
===================================================================
--- trunk/dports/php/php5-exif/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-exif/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     exif 5.3.1 bundled
+revision                1
 categories-append       graphics
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-ftp/Portfile
===================================================================
--- trunk/dports/php/php5-ftp/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-ftp/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     ftp 5.3.1 bundled
+revision                1
 categories-append       net
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-gd/Portfile
===================================================================
--- trunk/dports/php/php5-gd/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-gd/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,7 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     gd 5.3.1 bundled
-revision                1
+revision                2
 categories-append       graphics
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-gettext/Portfile
===================================================================
--- trunk/dports/php/php5-gettext/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-gettext/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     gettext 5.3.1 bundled
+revision                1
 categories-append       devel
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-gmp/Portfile
===================================================================
--- trunk/dports/php/php5-gmp/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-gmp/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     gmp 5.3.1 bundled
+revision                1
 categories-append       devel math
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-http/Portfile
===================================================================
--- trunk/dports/php/php5-http/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-http/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -5,7 +5,8 @@
 PortGroup       php5extension 1.0
 
 php5extension.setup pecl_http 1.6.5 pecl
-
+php5extension.extensions http
+revision        1
 name            php5-http
 categories      php www
 platforms       darwin
@@ -35,5 +36,3 @@
                 --without-http-curl-libevent
 
 use_parallel_build  yes
-
-set php5extension.extension http

Modified: trunk/dports/php/php5-iconv/Portfile
===================================================================
--- trunk/dports/php/php5-iconv/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-iconv/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     iconv 5.3.1 bundled
+revision                1
 categories-append       textproc
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-imagick/Portfile
===================================================================
--- trunk/dports/php/php5-imagick/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-imagick/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     imagick 2.3.0 pecl
+revision                1
 categories-append       graphics
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-imap/Portfile
===================================================================
--- trunk/dports/php/php5-imap/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-imap/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     imap 5.3.1 bundled
+revision                1
 categories-append       mail
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-intl/Portfile
===================================================================
--- trunk/dports/php/php5-intl/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-intl/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -5,7 +5,7 @@
 PortGroup       php5extension 1.0
 
 php5extension.setup intl 5.3.1 bundled
-
+revision        1
 categories      php devel
 platforms       darwin
 maintainers     nox openmaintainer

Modified: trunk/dports/php/php5-mbstring/Portfile
===================================================================
--- trunk/dports/php/php5-mbstring/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-mbstring/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     mbstring 5.3.1 bundled
+revision                1
 categories-append       textproc
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-mcrypt/Portfile
===================================================================
--- trunk/dports/php/php5-mcrypt/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-mcrypt/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     mcrypt 5.3.1 bundled
+revision                1
 categories-append       security
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-memcache/Portfile
===================================================================
--- trunk/dports/php/php5-memcache/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-memcache/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,7 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     memcache 2.2.5 pecl
-revision                1
+revision                2
 categories-append       net devel
 platforms               darwin freebsd openbsd
 maintainers             gmail.com:emory.smith openmaintainer

Modified: trunk/dports/php/php5-mongo/Portfile
===================================================================
--- trunk/dports/php/php5-mongo/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-mongo/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,8 +4,7 @@
 PortGroup       php5extension 1.0
 
 php5extension.setup mongo 1.0.1 pecl
-revision        1
-
+revision        2
 categories      php devel
 platforms       darwin
 maintainers     nox openmaintainer

Modified: trunk/dports/php/php5-mssql/Portfile
===================================================================
--- trunk/dports/php/php5-mssql/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-mssql/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -3,8 +3,8 @@
 PortSystem                      1.0
 PortGroup                       php5extension 1.0
 
-php5extension.setup             mssql 5.3.1 bundled
-php5extension.use_phpize        no
+php5extension.setup             {mssql pdo_dblib} 5.3.1 bundled
+revision                        1
 categories-append               databases
 platforms                       darwin
 maintainers                     ryandesign
@@ -20,8 +20,7 @@
 
 depends_lib-append              port:freetds
 
-configure.args-append           --enable-pdo \
-                                --with-mssql=shared,${prefix} \
-                                --with-pdo-dblib=shared,${prefix}
+configure.args-append           --with-mssql=${prefix} \
+                                --with-pdo-dblib=${prefix}
 
 use_parallel_build              yes

Modified: trunk/dports/php/php5-mysql/Portfile
===================================================================
--- trunk/dports/php/php5-mysql/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-mysql/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -3,8 +3,8 @@
 PortSystem                      1.0
 PortGroup                       php5extension 1.0
 
-php5extension.setup             mysql 5.3.1 bundled
-php5extension.use_phpize        no
+php5extension.setup             {mysql mysqli pdo_mysql} 5.3.1 bundled
+revision                        1
 categories-append               databases
 platforms                       darwin
 maintainers                     ryandesign
@@ -20,15 +20,15 @@
 
 depends_lib-append              port:zlib
 
-configure.args-append           --with-zlib-dir=${prefix} \
-                                --enable-pdo
+configure.args-append           --with-zlib-dir=${prefix}
 
 use_parallel_build              yes
 
 variant mysqlnd conflicts mysql4 mysql5 description {Use MySQL Native Driver} {
-    configure.args-append       --with-mysql=shared,mysqlnd \
-                                --with-mysqli=shared,mysqlnd \
-                                --with-pdo-mysql=shared,mysqlnd
+    configure.args-append       --with-mysql=mysqlnd \
+                                --with-mysqli=mysqlnd \
+                                --with-pdo-mysql=mysqlnd
+    configure.cppflags-append   -I${worksrcpath}
     post-install {
         set phpini ${prefix}/etc/php5/php.ini
         if {1} {
@@ -41,15 +41,15 @@
 
 variant mysql4 conflicts mysql5 mysqlnd description {Use MySQL 4 libraries} {
     depends_lib-append          port:mysql4
-    configure.args-append       --with-mysql=shared,${prefix} \
-                                --with-pdo-mysql=shared,${prefix}
+    configure.args-append       --with-mysql=${prefix} \
+                                --with-pdo-mysql=${prefix}
 }
 
 variant mysql5 conflicts mysql4 mysqlnd description {Use MySQL 5 libraries} {
     depends_lib-append          path:bin/mysql_config5:mysql5
-    configure.args-append       --with-mysql=shared,${workpath}/mysql5 \
-                                --with-mysqli=shared,${prefix}/bin/mysql_config5 \
-                                --with-pdo-mysql=shared,${prefix}/bin/mysql_config5 \
+    configure.args-append       --with-mysql=${workpath}/mysql5 \
+                                --with-mysqli=${prefix}/bin/mysql_config5 \
+                                --with-pdo-mysql=${prefix}/bin/mysql_config5 \
                                 --with-mysql-sock=${prefix}/var/run/mysql5/mysqld.sock
     post-extract {
         file mkdir ${workpath}/mysql5

Modified: trunk/dports/php/php5-odbc/Portfile
===================================================================
--- trunk/dports/php/php5-odbc/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-odbc/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -3,8 +3,8 @@
 PortSystem                      1.0
 PortGroup                       php5extension 1.0
 
-php5extension.setup             odbc 5.3.1 bundled
-php5extension.use_phpize        no
+php5extension.setup             {odbc pdo_odbc} 5.3.1 bundled
+revision                        1
 categories-append               databases
 platforms                       darwin
 maintainers                     ryandesign
@@ -20,8 +20,9 @@
 
 depends_lib-append              port:unixodbc
 
-configure.args-append           --enable-pdo \
-                                --with-unixODBC=shared,${prefix} \
-                                --with-pdo-odbc=shared,unixODBC,${prefix}
+patchfiles-append               patch-unixODBC.diff
 
+configure.args-append           --with-unixODBC=${prefix} \
+                                --with-pdo-odbc=unixODBC,${prefix}
+
 use_parallel_build              yes

Added: trunk/dports/php/php5-odbc/files/patch-unixODBC.diff
===================================================================
--- trunk/dports/php/php5-odbc/files/patch-unixODBC.diff	                        (rev 0)
+++ trunk/dports/php/php5-odbc/files/patch-unixODBC.diff	2009-12-13 07:44:25 UTC (rev 61490)
@@ -0,0 +1,18 @@
+--- ext/odbc/config.m4.orig	2007-07-31 08:02:00.000000000 -0500
++++ ext/odbc/config.m4	2009-12-12 20:32:00.000000000 -0600
+@@ -99,6 +99,7 @@
+ dnl
+ dnl configure options
+ dnl
++:<<'MACPORTS_DISABLED'
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(adabas,,
+ [  --with-adabas[=DIR]     Include Adabas D support [/usr/local]])
+@@ -404,6 +405,7 @@
+     AC_MSG_RESULT([$ext_output])
+   fi
+ fi
++MACPORTS_DISABLED
+ 
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(unixODBC,,

Modified: trunk/dports/php/php5-openssl/Portfile
===================================================================
--- trunk/dports/php/php5-openssl/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-openssl/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     openssl 5.3.1 bundled
+revision                1
 categories-append       devel security
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-oracle/Portfile
===================================================================
--- trunk/dports/php/php5-oracle/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-oracle/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,7 +4,8 @@
 PortGroup                       php5extension 1.0
 
 php5extension.setup             oracle 5.3.1 bundled
-php5extension.use_phpize        no
+php5extension.extensions        oci8 pdo_oci
+revision                        1
 categories-append               databases
 platforms                       darwin
 maintainers                     ryandesign
@@ -18,17 +19,11 @@
                                 sha1    be08ca9337a4962cd4acf8709cd695e1e31c1149 \
                                 rmd160  01183a9f752ce5982a7b91dcd43721fd1b9cd88b
 
-depends_build-append            port:autoconf213
-
 depends_lib-append              port:oracle-instantclient
 
 patchfiles-append               patch-ext-pdo_oci-config.m4.diff
 
-use_autoconf                    yes
-autoconf.cmd                    ${prefix}/bin/autoconf213
+configure.args-append           --with-oci8=instantclient,${prefix}/lib/oracle \
+                                --with-pdo-oci=instantclient,${prefix}/lib/oracle,10.1
 
-configure.args-append           --enable-pdo \
-                                --with-oci8=shared,instantclient,${prefix}/lib/oracle \
-                                --with-pdo-oci=shared,instantclient,${prefix}/lib/oracle,10.1
-
 use_parallel_build              yes

Modified: trunk/dports/php/php5-pcntl/Portfile
===================================================================
--- trunk/dports/php/php5-pcntl/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-pcntl/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     pcntl 5.3.1 bundled
+revision                1
 categories-append       sysutils
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-posix/Portfile
===================================================================
--- trunk/dports/php/php5-posix/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-posix/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     posix 5.3.1 bundled
+revision                1
 categories-append       sysutils
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-postgresql/Portfile
===================================================================
--- trunk/dports/php/php5-postgresql/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-postgresql/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,7 +4,8 @@
 PortGroup                       php5extension 1.0
 
 php5extension.setup             postgresql 5.3.1 bundled
-php5extension.use_phpize        no
+revision                        1
+php5extension.extensions        pgsql pdo_pgsql
 categories-append               databases
 platforms                       darwin
 maintainers                     ryandesign
@@ -18,26 +19,24 @@
                                 sha1    be08ca9337a4962cd4acf8709cd695e1e31c1149 \
                                 rmd160  01183a9f752ce5982a7b91dcd43721fd1b9cd88b
 
-configure.args-append           --enable-pdo
-
 use_parallel_build              yes
 
 variant postgresql82 conflicts postgresql83 postgresql84 description {Use PostgreSQL 8.2 libraries} {
     depends_lib-append          port:postgresql82
-    configure.args-append       --with-pgsql=shared,${prefix}/lib/postgresql82/bin \
-                                --with-pdo-pgsql=shared,${prefix}/lib/postgresql82/bin
+    configure.args-append       --with-pgsql=${prefix}/lib/postgresql82/bin \
+                                --with-pdo-pgsql=${prefix}/lib/postgresql82/bin
 }
 
 variant postgresql83 conflicts postgresql82 postgresql84 description {Use PostgreSQL 8.3 libraries} {
     depends_lib-append          port:postgresql83
-    configure.args-append       --with-pgsql=shared,${prefix}/lib/postgresql83/bin \
-                                --with-pdo-pgsql=shared,${prefix}/lib/postgresql83/bin
+    configure.args-append       --with-pgsql=${prefix}/lib/postgresql83/bin \
+                                --with-pdo-pgsql=${prefix}/lib/postgresql83/bin
 }
 
 variant postgresql84 conflicts postgresql82 postgresql83 description {Use PostgreSQL 8.4 libraries} {
     depends_lib-append          port:postgresql84
-    configure.args-append       --with-pgsql=shared,${prefix}/lib/postgresql84/bin \
-                                --with-pdo-pgsql=shared,${prefix}/lib/postgresql84/bin
+    configure.args-append       --with-pgsql=${prefix}/lib/postgresql84/bin \
+                                --with-pdo-pgsql=${prefix}/lib/postgresql84/bin
 }
 
 if {![variant_isset postgresql82] && ![variant_isset postgresql83]} {

Modified: trunk/dports/php/php5-pspell/Portfile
===================================================================
--- trunk/dports/php/php5-pspell/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-pspell/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     pspell 5.3.1 bundled
+revision                1
 categories-append       textproc
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-rrdtool/Portfile
===================================================================
--- trunk/dports/php/php5-rrdtool/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-rrdtool/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,7 +4,7 @@
 PortGroup  php5extension 1.0
 
 php5extension.setup rrdtool 1.0
-revision          3
+revision          4
 categories-append net devel
 platforms         darwin
 maintainers       markd

Modified: trunk/dports/php/php5-snmp/Portfile
===================================================================
--- trunk/dports/php/php5-snmp/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-snmp/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     snmp 5.3.1 bundled
+revision                1
 categories-append       sysutils
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-soap/Portfile
===================================================================
--- trunk/dports/php/php5-soap/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-soap/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     soap 5.3.1 bundled
+revision                1
 categories-append       net
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-sockets/Portfile
===================================================================
--- trunk/dports/php/php5-sockets/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-sockets/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     sockets 5.3.1 bundled
+revision                1
 categories-append       net
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-solr/Portfile
===================================================================
--- trunk/dports/php/php5-solr/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-solr/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -5,7 +5,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     solr 0.9.7 pecl
-
+revision                1
 categories-append       devel
 platforms               darwin
 maintainers             ryandesign openmaintainer

Modified: trunk/dports/php/php5-sqlite/Portfile
===================================================================
--- trunk/dports/php/php5-sqlite/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-sqlite/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -3,8 +3,8 @@
 PortSystem                      1.0
 PortGroup                       php5extension 1.0
 
-php5extension.setup             sqlite 5.3.1 bundled
-php5extension.use_phpize        no
+php5extension.setup             {sqlite sqlite3 pdo_sqlite} 5.3.1 bundled
+revision                        1
 categories-append               databases
 platforms                       darwin
 maintainers                     ryandesign
@@ -23,10 +23,12 @@
 
 depends_lib-append              port:sqlite3
 
-configure.args-append           --enable-pdo \
-                                --with-sqlite=shared \
-                                --with-sqlite3=shared,${prefix} \
-                                --with-pdo-sqlite=shared,${prefix} \
+post-extract {
+    move ${worksrcpath}/ext/sqlite3/config0.m4 ${worksrcpath}/ext/sqlite3/config.m4
+}
+
+configure.args-append           --with-sqlite3=${prefix} \
+                                --with-pdo-sqlite=${prefix} \
                                 --enable-sqlite-utf8
 
 use_parallel_build              yes

Modified: trunk/dports/php/php5-suhosin/Portfile
===================================================================
--- trunk/dports/php/php5-suhosin/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-suhosin/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -5,7 +5,7 @@
 PortGroup           php5extension 1.0
 
 php5extension.setup suhosin 0.9.29
-
+revision            1
 categories-append   security www
 #license             PHPv3.01
 maintainers         snc openmaintainer

Modified: trunk/dports/php/php5-svn/Portfile
===================================================================
--- trunk/dports/php/php5-svn/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-svn/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     svn 0.5.1 pecl
+revision                1
 categories-append       devel
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-syck/Portfile
===================================================================
--- trunk/dports/php/php5-syck/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-syck/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -5,6 +5,7 @@
 
 epoch                   1
 php5extension.setup     syck 0.9.3 pecl
+revision                1
 categories-append       net devel
 platforms               darwin freebsd openbsd
 maintainers             gmail.com:emory.smith openmaintainer

Modified: trunk/dports/php/php5-tidy/Portfile
===================================================================
--- trunk/dports/php/php5-tidy/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-tidy/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     tidy 5.3.1 bundled
+revision                1
 categories-append       www
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-uploadprogress/Portfile
===================================================================
--- trunk/dports/php/php5-uploadprogress/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-uploadprogress/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -5,8 +5,7 @@
 PortGroup       php5extension 1.0
 
 php5extension.setup uploadprogress 1.0.1 pecl
-revision        1
-
+revision        2
 categories      php www devel
 platforms       darwin
 maintainers     nox openmaintainer

Modified: trunk/dports/php/php5-wddx/Portfile
===================================================================
--- trunk/dports/php/php5-wddx/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-wddx/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     wddx 5.3.1 bundled
+revision                1
 categories-append       textproc
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-xdebug/Portfile
===================================================================
--- trunk/dports/php/php5-xdebug/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-xdebug/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -5,6 +5,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     xdebug 2.0.5
+revision                1
 php5extension.type      zend
 categories-append       net devel
 platforms               darwin freebsd openbsd

Modified: trunk/dports/php/php5-xhprof/Portfile
===================================================================
--- trunk/dports/php/php5-xhprof/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-xhprof/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -5,7 +5,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     xhprof 0.9.2 pecl
-
+revision                1
 categories-append       devel
 platforms               darwin
 maintainers             nomaintainer

Modified: trunk/dports/php/php5-xmlrpc/Portfile
===================================================================
--- trunk/dports/php/php5-xmlrpc/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-xmlrpc/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     xmlrpc 5.3.1 bundled
+revision                1
 categories-append       textproc
 platforms               darwin
 maintainers             ryandesign

Modified: trunk/dports/php/php5-xsl/Portfile
===================================================================
--- trunk/dports/php/php5-xsl/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-xsl/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,7 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     xsl 5.3.1 bundled
-php5extension.extract_dirs-append   ext/dom
+revision                1
 categories-append       textproc
 platforms               darwin
 maintainers             ryandesign
@@ -20,7 +20,8 @@
 
 depends_lib-append      port:libxslt
 
-configure.args-append   --enable-libxml \
-                        --enable-dom
+configure.args-append   --with-xsl=${prefix}
 
+configure.cppflags-append -I${prefix}/include/php/ext/dom
+
 use_parallel_build      yes

Modified: trunk/dports/php/php5-yaz/Portfile
===================================================================
--- trunk/dports/php/php5-yaz/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-yaz/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,7 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     yaz 1.0.14 pecl
-revision                2
+revision                3
 categories-append       net databases devel
 platforms               darwin
 maintainers             nomaintainer

Modified: trunk/dports/php/php5-zip/Portfile
===================================================================
--- trunk/dports/php/php5-zip/Portfile	2009-12-13 05:54:16 UTC (rev 61489)
+++ trunk/dports/php/php5-zip/Portfile	2009-12-13 07:44:25 UTC (rev 61490)
@@ -4,6 +4,7 @@
 PortGroup               php5extension 1.0
 
 php5extension.setup     zip 5.3.1 bundled
+revision                1
 categories-append       archivers
 platforms               darwin
 maintainers             ryandesign
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091212/37832e49/attachment-0001.html>


More information about the macports-changes mailing list