[52241] trunk/dports/lang/php5

[nox at macports.org]

Revision: 52241
          http://trac.macports.org/changeset/52241
Author:   nox at macports.org
Date:     2009-06-12 14:56:08 -0700 (Fri, 12 Jun 2009)
Log Message:
-----------
php5:
 * Enable PDO_DBLIB and PDO_OCI when installing php5 with +mssql and +oracle (closes #18935).
 * Add a debug variant.

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

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

Modified: trunk/dports/lang/php5/Portfile
===================================================================
--- trunk/dports/lang/php5/Portfile	2009-06-12 21:54:08 UTC (rev 52240)
+++ trunk/dports/lang/php5/Portfile	2009-06-12 21:56:08 UTC (rev 52241)
@@ -5,7 +5,7 @@
 name                    php5
 epoch                   1
 version                 5.2.9
-revision                2
+revision                3
 set major               [lindex [split ${version} .] 0]
 set my_name             php${major}
 dist_subdir             ${my_name}
@@ -91,7 +91,6 @@
     --without-pdo-sqlite \
     --with-libxml-dir=${prefix} \
     --with-gettext=${prefix} \
-    --with-xml \
     --with-libexpat-dir=${prefix} \
     --with-xmlrpc \
     --enable-soap \
@@ -224,7 +223,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 {
@@ -286,10 +286,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} {
@@ -494,6 +497,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

Added: trunk/dports/lang/php5/files/patch-ext-pdo_oci-config.m4.diff
===================================================================
--- trunk/dports/lang/php5/files/patch-ext-pdo_oci-config.m4.diff	                        (rev 0)
+++ trunk/dports/lang/php5/files/patch-ext-pdo_oci-config.m4.diff	2009-06-12 21:56:08 UTC (rev 52241)
@@ -0,0 +1,36 @@
+See http://bugs.php.net/bug.php?id=39312.
+
+--- ext/pdo_oci/config.m4.orig	2009-01-31 18:26:43.000000000 +0100
++++ ext/pdo_oci/config.m4	2009-01-31 18:28:46.000000000 +0100
+@@ -97,11 +97,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])
+--- configure.orig	2009-01-31 18:30:13.000000000 +0100
++++ configure	2009-01-31 18:30:45.000000000 +0100
+@@ -73611,11 +73611,11 @@
+     else
+       { echo "configure: error: I'm too dumb to figure out where the include dir is in your Instant Client install" 1>&2; exit 1; }
+     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
+       { echo "configure: error: I'm too dumb to figure out where the libraries are in your Instant Client install" 1>&2; exit 1; }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090612/72afabfc/attachment.html>