[Lunar-commits] <crater> php5: sync it with moonbase.

Florin Braescu florin at lunar-linux.org
Wed Jan 11 18:09:25 CET 2012


commit 8e082c07457e874e9438b2041dfa459f5bc49c05
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Wed Jan 11 18:09:25 2012 +0100

    php5: sync it with moonbase.
---
 compilers/php5/BUILD     |   13 ++++---------
 compilers/php5/CONFIGURE |    3 ++-
 compilers/php5/DEPENDS   |    8 ++++----
 compilers/php5/DETAILS   |   29 ++++++++++++-----------------
 4 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/compilers/php5/BUILD b/compilers/php5/BUILD
index 10bb4c8..622908a 100644
--- a/compilers/php5/BUILD
+++ b/compilers/php5/BUILD
@@ -1,19 +1,13 @@
 (
 
-  if [ "$USE_IMAP" == "y" ]; then
-    unpack $SOURCE2
-    make -C imap-${IMAP_VERSION} slx SPECIALS="SSLDIR=/etc/ssl SSLINCLUDE=/usr/include SSLLIB=/usr/lib"
-    OPTS="$OPTS --with-imap=imap-${IMAP_VERSION}"
-  fi
-
   if [ "$USE_REGGLOBALS" == "y" ]; then
-    OPTS="$OPTS "
+    OPTS+=" "
   fi
 
   if module_installed apache || module_installed apache-mod_ssl ; then
-    OPTS="$OPTS --with-apxs=/usr/sbin/apxs"
+    OPTS+=" --with-apxs=/usr/sbin/apxs"
   elif module_installed apache2 ; then
-    OPTS="$OPTS --with-apxs2=/usr/sbin/apxs"
+    OPTS+=" --with-apxs2=/usr/sbin/apxs"
   fi
 
   if [ -s /etc/httpsd/httpd.conf ] ; then
@@ -25,6 +19,7 @@
   fi
 
   # sedit "s:^:#include <errno.h>\n:" ext/mysql/libmysql/mysys_err.h &&
+  sedit 's/__GMP_BITS_PER_MP_LIMB/GMP_LIMB_BITS/' ext/gmp/gmp.c &&
 
   verbose_msg "OPTS=$OPTS" &&
 
diff --git a/compilers/php5/CONFIGURE b/compilers/php5/CONFIGURE
index de317b5..f0755cd 100644
--- a/compilers/php5/CONFIGURE
+++ b/compilers/php5/CONFIGURE
@@ -1,4 +1,3 @@
-mquery USE_IMAP "Install imap support?" y
 mquery USE_REGGLOBALS "Enable global variable support (potential security risk)?" n
 mquery USE_FTP "Install ftp support?" y "--enable-ftp" ""
 mquery USE_SESSIONID "Enable transparent session id?" y "--enable-trans-sid" ""
@@ -7,3 +6,5 @@ mquery USE_SOCKETS "Enable sockets support (experimental)?" y "--enable-sockets"
 mquery USE_NCURSES "Enable ncurses support (experimental)?" y "--with-ncurses" ""
 mquery USE_MBYTESTR "Enable multibyte string support?" n "--enable-mbstring --enable-zend-multibyte" ""
 mquery USE_MBYTEREGEX "Enable multibyte regular expression functions?" n "" "--disable-mbregex"
+mquery USE_INTERNAL_GD "Enable built-in gd" y "--with-jpeg-dir --with-gd" ""
+mquery USE_EXIF "Enable exif" y "--enable-exif" ""
diff --git a/compilers/php5/DEPENDS b/compilers/php5/DEPENDS
index 5b5d96e..8c1b374 100644
--- a/compilers/php5/DEPENDS
+++ b/compilers/php5/DEPENDS
@@ -52,12 +52,12 @@ optional_depends "sqlite" \
                  "for PDO SQLite support"
 
 optional_depends "postgresql" \
-                 "--with-pgsql=/usr" \
+                 "--with-pgsql=/usr --with-pdo-pgsql=/usr" \
                  "" \
                  "for PostgreSQL support"
 
 optional_depends "mysql" \
-                 "--with-mysql=/usr --with-mysqli" \
+                 "--with-mysql=/usr --with-mysqli --with-pdo-mysql=/usr" \
                  "" \
                  "for native MySQL support"
 
@@ -71,7 +71,7 @@ optional_depends "freetype2" \
                  "" \
                  "for freetype2 support"
 
-optional_depends "pdflib" \
+optional_depends "PDFlib-Lite" \
                  "--with-pdflib" \
                  "" \
                  "for pdflib support"
@@ -82,7 +82,7 @@ optional_depends "gd" \
                   --with-jpeg-dir=/usr \
                   --with-png-dir=/usr" \
                  "" \
-                 "for on the fly graphics"
+                 "external gd for on the fly graphics (deprecated)"
 
 optional_depends "curl" \
                  "--with-curl" \
diff --git a/compilers/php5/DETAILS b/compilers/php5/DETAILS
index 88cad8c..ae906e9 100644
--- a/compilers/php5/DETAILS
+++ b/compilers/php5/DETAILS
@@ -1,23 +1,18 @@
           MODULE=php5
-         VERSION=5.2.5
-    IMAP_VERSION=2006k
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/php-$VERSION
+         VERSION=5.2.17
           SOURCE=php-$VERSION.tar.bz2
-   SOURCE_URL[0]=http://www.php.net/distributions/
-   SOURCE_URL[1]=http://uk2.php.net/distributions/
-   SOURCE_URL[2]=http://us2.php.net/distributions/
-   SOURCE_URL[3]=http://uk.php.net/distributions/
-   SOURCE_URL[4]=http://nl.php.net/distributions/
-   SOURCE_URL[5]=http://de.php.net/distributions/
-   SOURCE_URL[6]=http://fr.php.net/distributions/
-         SOURCE2=imap-$IMAP_VERSION.tar.Z
-  SOURCE2_URL[0]=ftp://ftp.cac.washington.edu/imap/
-  SOURCE2_URL[1]=ftp://ftp.cac.washington.edu/imap/old/
-      SOURCE_VFY=sha1:6b46fd095891183b328163b70cdb5acd30a24b7a
-     SOURCE2_VFY=sha1:4b64e74d5928857a1c802ba6c9ab575205b342ce
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/php-$VERSION
+   SOURCE_URL[0]=http://www.php.net/distributions
+   SOURCE_URL[1]=http://uk2.php.net/distributions
+   SOURCE_URL[2]=http://us2.php.net/distributions
+   SOURCE_URL[3]=http://uk.php.net/distributions
+   SOURCE_URL[4]=http://nl.php.net/distributions
+   SOURCE_URL[5]=http://de.php.net/distributions
+   SOURCE_URL[6]=http://fr.php.net/distributions
+      SOURCE_VFY=sha1:d68f3b09f766990d815a3c4c63c157db8dab8095
         WEB_SITE=http://www.php.net
          ENTERED=20040919
-         UPDATED=20071117
+         UPDATED=20110113
            SHORT="PHP: Hypertext Processor scripting language"
 
 cat << EOF
@@ -26,7 +21,7 @@ that is especially suited for Web development and can be embedded
 into HTML. Its syntax draws upon C, Java, and Perl, and is easy to
 learn. PHP runs on many different platforms and can be used as a
 standalone executable or as a module under a variety of Web servers.
-It has excellent support for databases, XML, LDAP, IMAP, Java,
+It has excellent support for databases, XML, LDAP, Java,
 various Internet protocols, and general data manipulation, and is
 extensible via its powerful API. It is actively developed and
 supported by a talented and energetic international team. Numerous


More information about the Lunar-commits mailing list