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

ryandesign at macports.org ryandesign at macports.org
Wed Aug 26 02:43:42 PDT 2009


Revision: 56348
          http://trac.macports.org/changeset/56348
Author:   ryandesign at macports.org
Date:     2009-08-26 02:43:41 -0700 (Wed, 26 Aug 2009)
Log Message:
-----------
php5-devel @5.3.0RC4_4: merge from php5 r56346:

 * now disable all modules by default and just enable the ones we want, instead of letting php decide what to enable
 * calendar, exif, ftp, gettext, iconv, mbstring, mssql, mysql, openssl, oracle, pcntl, posix, postgresql, soap, sockets, sqlite, wddx, xmlrpc, zip functions moved to separate ports
 * readline, zlib functions restored (these separate module ports will become stubs)

See #19091.

Revision Links:
--------------
    http://trac.macports.org/changeset/56346

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

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


Property changes on: trunk/dports/lang/php5-devel
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/lang/php5:52241-52279,53127
   + /trunk/dports/lang/php5:52241-52279,53127,56346

Modified: trunk/dports/lang/php5-devel/Portfile
===================================================================
--- trunk/dports/lang/php5-devel/Portfile	2009-08-26 09:41:03 UTC (rev 56347)
+++ trunk/dports/lang/php5-devel/Portfile	2009-08-26 09:43:41 UTC (rev 56348)
@@ -5,7 +5,7 @@
 name                    php5-devel
 epoch                   1
 version                 5.3.0RC4
-revision                3
+revision                4
 set major               [lindex [split ${version} .] 0]
 set my_name             php${major}
 dist_subdir             ${my_name}
@@ -42,14 +42,11 @@
     path:bin/gsed:gsed \
     port:libtool \
     port:libxml2 \
-    port:openssl \
     port:bzip2 \
-    port:libiconv \
-    port:expat \
-    port:gettext \
-    port:tiff \
     port:mhash \
-    port:pcre
+    port:pcre \
+    port:readline \
+    port:zlib
 
 patchfiles \
     patch-ext-date-php_date.c.diff \
@@ -68,30 +65,36 @@
     --infodir=${prefix}/share/info \
     --with-config-file-path=${phpinidir} \
     --with-config-file-scan-dir=${extraphpinidir} \
-    --enable-calendar \
-    --with-iconv=${prefix} \
-    --enable-exif \
-    --enable-ftp \
-    --enable-wddx\
-    --with-bz2=${prefix} \
-    --without-mysql \
-    --without-sqlite \
-    --without-pdo-sqlite \
-    --with-libxml-dir=${prefix} \
-    --with-gettext=${prefix} \
-    --with-libexpat-dir=${prefix} \
-    --with-xmlrpc \
-    --enable-soap \
+    --disable-all \
     --enable-bcmath \
-    --enable-mbstring \
+    --enable-ctype \
     --enable-dba \
-    --enable-zip \
-    --with-openssl=${prefix} \
+    --enable-dom \
+    --enable-fileinfo \
+    --enable-filter \
+    --enable-hash \
+    --enable-json \
+    --enable-libxml \
+    --enable-pdo \
+    --enable-phar \
+    --enable-session \
+    --enable-simplexml \
+    --enable-tokenizer \
+    --enable-xml \
+    --enable-xmlreader \
+    --enable-xmlwriter \
+    --with-bz2=${prefix} \
     --with-mhash=${prefix} \
     --with-pcre-regex=${prefix} \
+    --with-readline=${prefix} \
+    --with-libxml-dir=${prefix} \
+    --with-zlib=${prefix} \
     --without-pear \
     --disable-cgi
 
+# php5-mysql +mysqlnd needs mysqlnd support compiled into php
+configure.env-append    PHP_MYSQLND_ENABLED=yes
+
 platform darwin 7 {
     configure.env-append \
         LIBS=-ldl
@@ -157,11 +160,27 @@
     }
 }
 
-foreach feature {imap gmp pspell readline tidy} {
+foreach {old_variant new_port} {
+    gmp             gmp
+    imap            imap
+    mssql           mssql
+    mysql3          mysql
+    mysql4          mysql
+    mysql5          mysql
+    mysqlnd         mysql
+    oracle          oracle
+    pcntl           pcntl
+    postgresql82    postgresql
+    postgresql83    postgresql
+    pspell          pspell
+    sockets         sockets
+    sqlite          sqlite
+    tidy            tidy
+} {
     eval [subst {
-        variant ${feature} description "Obsolete; install ${my_name}-${feature} port instead" {
+        variant ${old_variant} description "Obsolete; install ${my_name}-${new_port} port instead" {
             pre-configure {
-                ui_msg "The +${feature} variant has been replaced by the ${my_name}-${feature} port"
+                ui_msg "The +${old_variant} variant has been replaced by the ${my_name}-${new_port} port"
             }
         }
     }]
@@ -172,14 +191,6 @@
         --enable-dbase
 }
 
-variant mssql description {Add MS-SQL server support} {
-    depends_lib-append \
-        port:freetds
-    configure.args-append \
-        --with-mssql=${prefix} \
-        --with-pdo-dblib=${prefix}
-}
-
 variant snmp conflicts macports_snmp description {Add SNMP support using Apple SNMP} {
     # This compiles PHP5 with SNMP linked against Apple's included NET-SNMP.
     configure.args-append \
@@ -194,92 +205,6 @@
         --with-snmp=${prefix}
 }
 
-variant mysql3 conflicts mysql4 mysql5 mysqlnd description {Add MySQL 3 support} {
-    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 mysqlnd description {Add MySQL 4 support} {
-    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 mysqlnd description {Add MySQL 5 support} {
-    depends_lib-append \
-        path: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 mysqlnd conflicts mysql3 mysql4 mysql5 description {Add MySQL Native Driver support for MySQL 4.1 and up} {
-    configure.args-delete \
-        --without-mysql
-    configure.args-append \
-        --with-mysql=mysqlnd \
-        --with-mysqli=mysqlnd \
-        --with-pdo-mysql=mysqlnd
-}
-
-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-pdo-oci=instantclient,${prefix}/lib/oracle,10.1
-}
-
-variant postgresql82 conflicts postgresql83 description {Add postgresql82 support} {
-    depends_lib-append \
-        port:postgresql82
-    configure.args-append \
-        --with-pgsql=${prefix}/lib/postgresql82/bin \
-        --with-pdo-pgsql=${prefix}/lib/postgresql82/bin
-}
-
-variant postgresql83 conflicts postgresql82 description {Add postgresql83 support} {
-    depends_lib-append \
-        port:postgresql83
-    configure.args-append \
-        --with-pgsql=${prefix}/lib/postgresql83/bin \
-        --with-pdo-pgsql=${prefix}/lib/postgresql83/bin
-}
-
-# 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 {Add 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
-}
-
 variant ipc description {Add semaphore, shared memory and IPC functions} {
     configure.args-append \
         --enable-shmop \
@@ -288,11 +213,6 @@
         --enable-sysvmsg
 }
 
-variant pcntl description {Add process control functions} {
-    configure.args-append \
-        --enable-pcntl
-}
-
 if {![variant_isset apache] && ![variant_isset apache2] && ![variant_isset fastcgi] && ![variant_isset no_web]} {
     default_variants +apache2
 }
@@ -318,11 +238,6 @@
     }
 }
 
-variant sockets description {Add socket communication functions} {
-    configure.args-append \
-        --enable-sockets
-}
-
 destroot.args \
     INSTALL_ROOT=${destroot}
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090826/b5450ad4/attachment-0001.html>


More information about the macports-changes mailing list