[92887] trunk/dports/lang/php/Portfile

[ryandesign at macports.org]

Revision: 92887
          https://trac.macports.org/changeset/92887
Author:   ryandesign at macports.org
Date:     2012-05-10 00:02:23 -0700 (Thu, 10 May 2012)
Log Message:
-----------
php: update php54 to 5.4.3; update php53 to 5.3.13; use libedit by default to make PHP ports distributable but still offer a readline variant (#34391); remove unnecessary libtool dependency (#34390)

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

Modified: trunk/dports/lang/php/Portfile
===================================================================
--- trunk/dports/lang/php/Portfile	2012-05-10 03:47:20 UTC (rev 92886)
+++ trunk/dports/lang/php/Portfile	2012-05-10 07:02:23 UTC (rev 92887)
@@ -60,24 +60,24 @@
 # Remember to increment revision of ${php}-eaccelerator when updating version of ${php}.
 switch ${subport_branch} {
     5.3 {
-        version         5.3.12
+        version         5.3.13
         set suhosin_available       yes
         set suhosin_patch_version   5.3.9-0.9.10
         set suhosin_patch           suhosin-patch-${suhosin_patch_version}.patch.gz
         checksums       [suffix ${distname}] \
-                        rmd160  5d91c2d16b54632aa123677f63776b312872997c \
-                        sha256  91659fd645b03011e1620134fa2457fade1e502499111cef8c4e23f428ad16ac \
+                        rmd160  1ad55e7bd1262471c66d2236fbba76c137960029 \
+                        sha256  ef1a7235b16be449f31f73f60d5770a133b863d225d65a218546cfb7d031d99b \
                         ${suhosin_patch} \
                         rmd160  ce43921fd9b183b154713ecda98294f6c68d5f22 \
                         sha256  4438caeab0a10c6c94aee9f7eaa703f5799f97d4e0579f43a947bb7314e38317
     }
     5.4 {
         epoch           1
-        version         5.4.2
+        version         5.4.3
         set suhosin_available       no
         checksums       [suffix ${distname}] \
-                        rmd160  b4e88bf65d9ed6488f9b9baa7ea597c47b60c7da \
-                        sha256  7f4c13f3b8c7e217b5d0fa04d4dd5bb5d86654f8dc79f49feeffe13e510ad7ce
+                        rmd160  a6c0ab078283a3499bf1d10ac2b6e67716fa2cba \
+                        sha256  d7e0c987586b6554ee08e3b71cc2806ddd1b192451159083d861c132994bc1bd
     }
 }
 
@@ -104,12 +104,10 @@
     
     depends_lib-append  path:bin/gsed:gsed \
                         port:libiconv \
-                        port:libtool \
                         port:libxml2 \
                         port:bzip2 \
                         port:mhash \
                         port:pcre \
-                        port:readline \
                         port:zlib
     
     # Use -p1 to accommodate the Suhosin patch
@@ -150,7 +148,6 @@
                         --with-bz2=${prefix} \
                         --with-mhash=${prefix} \
                         --with-pcre-regex=${prefix} \
-                        --with-readline=${prefix} \
                         --with-libxml-dir=${prefix} \
                         --with-zlib=${prefix} \
                         --without-pear \
@@ -231,6 +228,26 @@
         eval xinstall -m 644 [glob ${worksrcpath}/ext/mysqlnd/*.h] ${destroot}${prefix}/include/${php}/php/ext/mysqlnd
     }
     
+    # Include the readline extension http://www.php.net/readline directly in
+    # the PHP CLI SAPI because until PHP 6 the interactive mode "php -a" won't
+    # work with a separately built readline extension.
+    # https://bugs.php.net/bug.php?id=53878
+    # Users might prefer readline over libedit because only readline supports
+    # readline_list_history() (http://www.php.net/readline-list-history).
+    # On the other hand we want libedit to be the default because its license
+    # is compatible with PHP's which means PHP can be distributable.
+    variant libedit conflicts readline description {Build readline extension using libedit library} {
+        depends_lib-append      port:libedit
+        configure.args-append   --with-libedit=${prefix}
+    }
+    variant readline conflicts libedit description {Build readline extension using readline library} {
+        depends_lib-append      port:readline
+        configure.args-append   --with-readline=${prefix}
+    }
+    if {![variant_isset readline]} {
+        default_variants +libedit
+    }
+    
     if {![file exists ${phpinidir}/php.ini]} {
         notes-append "
 To customize ${php}, copy\
@@ -565,9 +582,12 @@
     
     long_description        ${description}
     
-    depends_lib-append      port:libmcrypt \
-                            port:libtool
+    depends_lib-append      port:libmcrypt
     
+    # The mcrypt extension may be using libtool unnecessarily; monitor
+    # https://bugs.php.net/bug.php?id=54500
+    depends_lib-append      port:libtool
+    
     configure.args-append   --with-mcrypt=${prefix}
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120510/7768fac6/attachment.html>