[52280] trunk/dports/lang/php5-devel

[ryandesign at macports.org]

Revision: 52280
          http://trac.macports.org/changeset/52280
Author:   ryandesign at macports.org
Date:     2009-06-13 07:14:37 -0700 (Sat, 13 Jun 2009)
Log Message:
-----------
php5-devel:

 * Update to 5.3.0RC3.
 * Enable PDO_DBLIB and PDO_OCI when installing with +mssql and +oracle (closes #18935).
 * Add a debug variant.
 * Remove obsolete --with-xml configure arg (closes #14859).

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

Added Paths:
-----------
    trunk/dports/lang/php5-devel/files/patch-ext-pdo_oci-config.m4.diff

Property Changed:
----------------
    trunk/dports/lang/php5-devel/


Property changes on: trunk/dports/lang/php5-devel
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/dports/lang/php5:52241-52279

Modified: trunk/dports/lang/php5-devel/Portfile
===================================================================
--- trunk/dports/lang/php5-devel/Portfile	2009-06-13 13:54:13 UTC (rev 52279)
+++ trunk/dports/lang/php5-devel/Portfile	2009-06-13 14:14:37 UTC (rev 52280)
@@ -4,7 +4,7 @@
 
 name                    php5-devel
 epoch                   1
-version                 5.3.0RC2
+version                 5.3.0RC3
 set major               [lindex [split ${version} .] 0]
 set my_name             php${major}
 dist_subdir             ${my_name}
@@ -29,9 +29,9 @@
     http://downloads.php.net/johannes/
 
 checksums \
-    md5     799aab8d96c6fb0b9e616c043880384e \
-    sha1    a01fbd5607a02b41a1085f6ff9c824d78f3bbce5 \
-    rmd160  aa5f7ab076be557947d7f33c4b5bfe69cbf33207
+    md5     6ee25d60697968bc70ce80ddf94cbac0 \
+    sha1    ddaf3fd740438dd4996efa011e3c0536e5eb4fb1 \
+    rmd160  8bf9591fd89d8617eab5b74ce9132df77d25a042
 
 depends_build \
     port:pkgconfig \
@@ -85,7 +85,6 @@
     --without-pdo-sqlite \
     --with-libxml-dir=${prefix} \
     --with-gettext=${prefix} \
-    --with-xml \
     --with-libexpat-dir=${prefix} \
     --with-xmlrpc \
     --enable-soap \
@@ -219,7 +218,8 @@
     depends_lib-append \
         port:freetds
     configure.args-append \
-        --with-mssql=${prefix}
+        --with-mssql=${prefix} \
+        --with-pdo-dblib=${prefix}
     
     # See http://bugs.php.net/bug.php?id=44991
     post-patch {
@@ -290,10 +290,13 @@
 }
 
 variant oracle description {Add Oracle oci8 database functions with the Oracle Instant Client} {
+    patchfiles-append \
+        patch-ext-pdo_oci-config.m4.diff
     depends_lib-append \
         port:oracle-instantclient
     configure.args-append \
-        --with-oci8=instantclient,${prefix}/lib/oracle
+        --with-oci8=instantclient,${prefix}/lib/oracle \
+        --with-pdo-oci=instantclient,${prefix}/lib/oracle,10.1
 }
 
 variant postgresql82 conflicts postgresql83 description {provide postgresql82 support} {
@@ -498,6 +501,10 @@
     #ui_msg "* copy  ${prefix}/etc/pear.conf.sample to  ${prefix}/etc/pear.conf"
 }
 
+variant debug description {Enable debug support (useful to analyze a PHP-related core dump)} {
+    configure.args-append   --enable-debug
+}
+
 test.run                yes
 
 livecheck.check         regex

Copied: trunk/dports/lang/php5-devel/files/patch-ext-pdo_oci-config.m4.diff (from rev 52279, trunk/dports/lang/php5/files/patch-ext-pdo_oci-config.m4.diff)
===================================================================
--- trunk/dports/lang/php5-devel/files/patch-ext-pdo_oci-config.m4.diff	                        (rev 0)
+++ trunk/dports/lang/php5-devel/files/patch-ext-pdo_oci-config.m4.diff	2009-06-13 14:14:37 UTC (rev 52280)
@@ -0,0 +1,19 @@
+See http://bugs.php.net/bug.php?id=39312.
+
+--- ext/pdo_oci/config.m4.orig	2008-10-22 14:29:24.000000000 -0500
++++ ext/pdo_oci/config.m4	2009-06-13 09:00:04.000000000 -0500
+@@ -89,11 +89,11 @@
+     else
+       AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install])
+     fi
+-    if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib/libclntsh.so" ; then
++    if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then
+     PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib"
+-    elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.so" ; then
++    elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then
+       PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/client/lib"
+-    elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.so" ; then
++    elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.$SHLIB_SUFFIX_NAME" ; then
+       PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX"
+     else
+       AC_MSG_ERROR([I'm too dumb to figure out where the libraries are in your Instant Client install])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090613/281060f1/attachment.html>