Source Mage code commit list

[Arjan Bouter <scm AT sourcemage.org>]

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

 php-pear/php/BUILD     |   20 ----
 php-pear/php/CONFIGURE |   33 ++++--
 php-pear/php/DEPENDS   |  236 
++++++++++++++++++++++++++++++-------------------
 php-pear/php/HISTORY   |    6 +
 4 files changed, 174 insertions(+), 121 deletions(-)

New commits:
commit bdb2e15fd01913e87c667074271f755ba6799247
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

    php: moved optional configure options from BUILD and CONFIGURE to
    DEPENDS, and remixed DEPENDS to minimize irrelevant questions.

diff --git a/php-pear/php/BUILD b/php-pear/php/BUILD
index 9a453e8..9f7d7c5 100755
--- a/php-pear/php/BUILD
+++ b/php-pear/php/BUILD
@@ -7,19 +7,6 @@ if list_find "${OPTS}" "--enable-cgi" || list_find "${OPTS}" 
"--enable-fastcgi";
     OPTS="--enable-force-cgi-redirect ${OPTS}"
 fi &&
 
-# Setup SSL IMAP if desired
-if list_find "${OPTS}" "--with-imap=${INSTALL_ROOT}/usr"; then
-    # Setup SSL IMAP if desired
-    local CCLIENT=$(get_spell_provider $SPELL C-CLIENT) &&
-
-    if [[ ! -z "${CCLIENT}" ]]; then
-        if is_depends_enabled $CCLIENT openssl; then
-            message "${MESSAGE_COLOR}Enabling SSL for the IMAP 
extension${DEFAULT_COLOR}" &&
-            OPTS="--with-imap-ssl ${OPTS}"
-        fi
-    fi
-fi &&
-
 case "${PHP5_APACHE}" in
     handler)
         if httpd -v | grep -q "Apache/2\."; then
@@ -36,11 +23,6 @@ case "${PHP5_APACHE}" in
     ;;
 esac &&
 
-#Check for xorg or xserver and pass location of xpm
-if [ "$PHP5_X11LIBS" == "y" ]; then
-  OPTS="$OPTS --with-xpm-dir=/usr"
-fi &&
-
 # Check to see if internal GD requested
 if [[ "${PHP5_GD}" == "internal" ]]; then
     OPTS="--with-gd --enable-gd-native-ttf ${OPTS}"
@@ -48,8 +30,6 @@ fi &&
 
 OPTS="   --with-exec-dir=${INSTALL_ROOT}/usr/bin \
  --with-config-file-path=${INSTALL_ROOT}/etc \
-             --with-pear=${INSTALL_ROOT}/usr/share/pear \
-                --enable-cli \
                --disable-rpath \
                 --enable-bcmath \
          --enable-inline-optimization \
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index 77af64e..87f57c7 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -1,3 +1,6 @@
+config_query_option PHP5_OPTS "Enable IPv6?" n \
+                    "--enable-ipv6" "--disable-ipv6" &&
+
 config_query_option PHP5_OPTS "Enable PHP safe mode?" n \
                     "--enable-safe-mode" "--disable-safe-mode" &&
 
@@ -10,9 +13,6 @@ config_query_option PHP5_OPTS "Enable FTP support?" y \
 config_query_option PHP5_OPTS "Enable calendar support?" y \
                     "--enable-calendar" "--disable-calendar" &&
 
-config_query_option PHP5_OPTS "Enable perl regular expressions?" y \
-                    "--with-pcre-regex" "--without-pcre-regex" &&
-
 config_query_option PHP5_OPTS "Enable pcntl support (CLI/CGI only)" n \
                     "--enable-pcntl" "--disable-pcntl" &&
 
@@ -24,18 +24,29 @@ config_query_option PHP5_OPTS "Enable FastCGI SAPI?" n \
 config_query_option PHP5_OPTS "Enable CGI SAPI?" y \
                     "--enable-cgi" "--disable-cgi" &&
 
+config_query_option PHP5_OPTS "Enable CLI version? (needed for PEAR and 
CGI/FastCGI)" y \
+                    "--enable-cli" "--disable-cli" &&
+
 config_query_option PHP5_OPTS "Enable multibyte support?"  n \
-                    "--enable-mbstring" "--disable-mbstring" &&
+                    "--enable-mbstring --enable-mbregex" \
+                    "--disable-mbstring --disable-mbregex" &&
+
+config_query_option PHP5_OPTS "Enable the DBA database drivers? 
(qdbm/gdbm/db/flatfile)" n \
+                    "--enable-dba" "--disable-dba" &&
 
-config_query_option PHP5_OPTS "Enable the PDO driver?" y \
+if list_find "${PHP5_OPTS}" "--enable-dba"; then
+   config_query_option PHP5_OPTS "Enable DBA inifile support?" y \
+                     "--enable-inifile" "--disable-inifile" &&
+   config_query_option PHP5_OPTS "Enable DBA flatfile support?" y \
+                     "--enable-flatfile" "--disable-flatfile"
+fi &&
+
+config_query_option PHP5_OPTS "Enable the PDO database drivers? 
(mysql/postgresql/oracle/*odbc)" y \
                     "--enable-pdo" "--disable-pdo" &&
 
 config_query_option PHP5_OPTS "Enable shmop support?" n \
                     "--enable-shmop" "--disable-shmop" &&
 
-config_query_option PHP5_OPTS "Enable soap support?" n \
-                    "--enable-soap" "--disable-soap" &&
-
 config_query_option PHP5_OPTS "Enable ZIP support?" n \
                     "--enable-zip" "--disable-zip" &&
 
@@ -52,8 +63,4 @@ config_query_list PHP5_APACHE "Which Apache module to 
build?" \
                   none handler filter &&
 
 config_query_list PHP5_GD "Which GD library to use?" \
-                  none internal external &&
-
-if [[ "${PHP5_GD}" != "none" ]]; then
-    config_query PHP5_X11LIBS "Would you like to support XPM image files? 
(requires: X11-LIBS)" n
-fi
+                  none internal external
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index 77aa84f..204c162 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -1,4 +1,4 @@
-. "${GRIMOIRE}/FUNCTIONS" &&
+. ${GRIMOIRE}/FUNCTIONS &&
 
 depends flex &&
 
@@ -7,45 +7,74 @@ depends flex &&
 depends readline "--with-readline" &&
 depends zlib "--with-zlib" &&
 
-# This is required since PHP5
-depends libxml2 "--enable-xml --enable-dom --with-xmlrpc" &&
+optional_depends bzip2 \
+                 "--with-bz2" "--without-bz2" \
+                 "for compression support" &&
+
+optional_depends libxml2 \
+                 '--enable-xml --enable-dom --with-xmlrpc' \
+                 '--disable-xml --disable-dom --without-xmlrpc 
--disable-xmlreader --disable-xmlwriter --disable-simplexml' \
+                 'For XML support (required for SOAP and PEAR)' &&
+
+optional_depends libxslt \
+                 "--with-xsl" "--without-xsl" \
+                 "for XSLT support" &&
+
+if is_depends_enabled $SPELL libxml2 ; then
+  config_query_option PHP5_OPTS "Enable SOAP support?" n \
+                      "--enable-soap" "--disable-soap" &&
+  if list_find "${PHP5_OPTS}" "--enable-cli"; then
+     config_query_option PHP5_OPTS "Enable PEAR support?" y \
+                         "--enable-pear=${INSTALL_ROOT}/usr/share/pear" \
+                         "--without-pear"
+  fi
+else
+  PHP5_OPTS="${PHP5_OPTS} --disable-soap --without-pear"
+fi &&
+
+optional_depends pth \
+                 "--with-tsrm-pth=${INSTALL_ROOT}/usr" 
"--with-tsrm-pthreads" \
+                 "use GNU Portable Threads instead of POSIX threads" &&
 
 case "${PHP5_APACHE}" in
     handler) depends APACHE;;
     filter) depends APACHE2;;
 esac &&
 
-if [[ "${PHP5_GD}" == "external" ]]; then
-    depends gd "--with-gd=${INSTALL_ROOT}/usr --enable-gd-native-ttf" 
-fi &&
-
-# Query for external PCRE library if PCRE support is enabled
-if list_find "${PHP5_OPTS}" "--with-pcre-regex"; then
-    optional_depends pcre \
-                     "--with-pcre-dir=${INSTALL_ROOT}/usr" "" \
-                     "to use an external PCRE library"
-fi &&
+optional_depends pcre \
+                 "--with-pcre-regex --with-pcre=${INSTALL_ROOT}/usr" \
+                 "--without-pcre-regex --without-pcre" \
+                 "for perl regular expressions support (required for PEAR)" 
&&
 
 optional_depends C-CLIENT \
                  "--with-imap=${INSTALL_ROOT}/usr" "--without-imap" \
                  "for IMAP support" &&
 
+if list_find "${OPTS}" "--with-imap"; then
+  optional_depends openssl "--with-imap-ssl" "--without-imap-ssl" \
+                           "for SSL support with IMAP"
+fi &&
+
 optional_depends MAIL-TRANSPORT-AGENT \
                   "" "" \
                   "for SMTP support" &&
 
-optional_depends bzip2 \
-                 "--with-bz2" "--without-bz2" \
-                 "for compression support" &&
+optional_depends enchant \
+                 "--with-enchant" "--without-enchant" \
+                 "use enchant for spelling functions?" &&
 
 optional_depends aspell \
                  "--with-pspell" "--without-pspell" \
-                 "for spelling functions" &&
+                 "use aspell for spelling functions" &&
 
 optional_depends mhash \
                  "--with-mhash" "--without-mhash" \
                  "for hash functions support" &&
 
+optional_depends oniguruma \
+                 "--with-onig=${INSTALL_ROOT}/usr" "--without-onig" \
+                 "for external oniguruma" &&
+
 optional_depends libmcrypt \
                  "--with-mcrypt" "--without-mcrypt" \
                  "for crypto library" &&
@@ -67,40 +96,27 @@ optional_depends openssl \
                  "--with-openssl" "--without-openssl" \
                  "for OpenSSL support" &&
 
+optional_depends krb5 \
+                 "--with-kerberos" "--without-kerberos" \
+                 "for Kerberos support" &&
+
 optional_depends gettext \
                  "--with-gettext" "--without-gettext" \
                  "for GNU gettext support" &&
 
-optional_depends firebird \
-                 "--with-pdo-firebird=${INSTALL_ROOT}/opt/firebird" 
"--without-pdo-firebird" \
-                 "for native Firebird support" &&
-
-optional_depends unixodbc \
-                 "--with-unixODBC=${INSTALL_ROOT}/usr" "--without-unixODBC" \
-                 "for ODBC database support" &&
+optional_depends icu \
+                 "--with-icu-dir=${INSTALL_ROOT}/usr" \
+                 "--without-icu-dir" \
+                 "for ICU unicode support" &&
 
-if is_depends_enabled $SPELL unixodbc && list_find "${PHP5_OPTS}" 
"--enable-pdo"; then
-    config_query_option PHP5_OPTS "Do you also want to build the unixODBC 
PDO driver?" n \
-                        "--with-pdo-odbc=unixODBC,${INSTALL_ROOT}/usr" 
"--without-pdo-odbc"
-fi &&
+optional_depends ODBC-MGR "" "" "for ODBC support" &&
 
-optional_depends libiodbc \
-                 "--with-iodbc" "--without-iodbc" \
-                 "for ODBC database support" &&
-
-optional_depends postgresql \
-                 "--with-pgsql" "--without-pgsql" \
-                 "for native Postgresql support" &&
-
-if is_depends_enabled $SPELL postgresql && list_find "${PHP5_OPTS}" 
"--enable-pdo"; then
-    config_query_option PHP5_OPTS "Do you also want to build the PostgreSQL 
PDO driver?" n \
-                        "--with-pdo-pgsql" "--without-pdo-pgsql"
-fi &&
-
-optional_depends mysql \
-                 "" "" \
-                 "for MySQL support" &&
+case $(get_spell_provider $SPELL ODBC-MGR) in
+  unixodbc) OPTS="${OPTS} --with-unixODBC=${INSTALL_ROOT}/usr 
--without-iodbc" ;;
+  libiodbc) OPTS="${--with-iodbc=${INSTALL_ROOT}}/usr --without-unixODBC" ;;
+esac &&
 
+optional_depends mysql "" "--without-mysql" "for MySQL support" &&
 if is_depends_enabled $SPELL mysql && [[ "${VERSION:0:3}" == "5.3" ]]; then
     config_query PHP5_MYSQLND "Do you want to use the MySQL Native Driver 
[mysqlnd]? (experimental)" y &&
 
@@ -109,64 +125,90 @@ if is_depends_enabled $SPELL mysql && [[ 
"${VERSION:0:3}" == "5.3" ]]; then
     else
         PHP5_OPTS="${PHP5_OPTS} --with-mysql"
     fi
+    config_query_option PHP5_OPTS "Do you want to build the MySQLi 
extension?" n \
+                        "--with-mysqli" "--without-mysqli"
 elif is_depends_enabled $SPELL mysql && [[ "${VERSION:0:3}" != "5.3" ]]; then
     PHP5_OPTS="${PHP5_OPTS} --with-mysql"
-else
-    PHP5_OPTS="${PHP5_OPTS} --without-mysql"
 fi &&
 
-if is_depends_enabled $SPELL mysql && list_find "${PHP5_OPTS}" 
"--enable-pdo"; then
-    if [[ "${VERSION:0:3}" == "5.3" ]] && [[ "${PHP5_MYSQLND}" == "y" ]]; 
then
-        config_query_option PHP5_OPTS "Do you want to build the MySQLi 
extension?" n \
-                            "--with-mysqli=mysqlnd" "--without-mysqli" &&
+optional_depends postgresql \
+                 "--with-pgsql" "--without-pgsql" \
+                 "for native Postgresql support" &&
+
+optional_depends sqlite \
+                 "--with-sqlite3=${INSTALL_ROOT}/usr --enable-sqlite-utf8" 
"--without-sqlite" \
+                 "for SQLite support" &&
+
+if list_find "${PHP5_OPTS}" "--enable-pdo"; then
+
+  if is_depends_enabled $SPELL postgresql ; then
+    config_query_option PHP5_OPTS "Do you want to build the SQLite PDO 
driver?" y \
+                        "--with-pdo-sqlite=${INSTALL_ROOT}/usr" 
"--without-pdo-sqlite"
+  fi &&
+  optional_depends firebird \
+                 "--with-pdo-firebird=${INSTALL_ROOT}/opt/firebird" 
"--without-pdo-firebird" \
+                 "for native Firebird support" &&
 
-        config_query_option PHP5_OPTS "Do you also want to build the MySQL 
PDO driver?" n \
-                            "--with-pdo-mysql=mysqlnd" "--without-pdo-mysql"
+  if is_depends_enabled $SPELL postgresql ; then
+    config_query_option PHP5_OPTS "Do you also want to build the PostgreSQL 
PDO driver?" n \
+                        "--with-pdo-pgsql" "--without-pdo-pgsql"
+  fi &&
+
+  if is_depends_enabled $SPELL mysql ; then
+    if [[ "${VERSION:0:3}" == "5.3" ]] && [[ "${PHP5_MYSQLND}" == "y" ]]; 
then
+       config_query_option PHP5_OPTS "Do you also want to build the MySQL 
PDO driver?" n \
+                           "--with-pdo-mysql=mysqlnd" "--without-pdo-mysql"
     else
-        config_query_option PHP5_OPTS "Do you want to build the MySQLi 
extension?" n \
-                            "--with-mysqli" "--without-mysqli" &&
-        config_query_option PHP5_OPTS "Do you also want to build the MySQL 
PDO driver?" n \
-                            "--with-pdo-mysql" "--without-pdo-mysql"
+       config_query_option PHP5_OPTS "Do you also want to build the MySQL 
PDO driver?" n \
+                           "--with-pdo-mysql" "--without-pdo-mysql"
     fi
+  fi &&
+
+  case $(get_spell_provider $SPELL ODBC-MGR) in
+    unixodbc) config_query_option PHP5_OPTS \
+                        "Do you also want to build the unixODBC PDO driver?" 
n \
+                        "--with-pdo-odbc=unixODBC,${INSTALL_ROOT}/usr" \
+                        "--without-pdo-odbc" ;;
+    libiodbc) config_query_option PHP5_OPTS \
+                        "Do you also want to build the iODBC PDO driver?" n \
+                        "--with-pdo-odbc=iODBC,${INSTALL_ROOT}/usr" \
+                        "--without-pdo-odbc" ;;
+  esac
 fi &&
 
-optional_depends gdbm \
-                 "--with-gdbm" "--without-gdbm" \
-                 "database routines that use extensive hashing" &&
+if list_find "${PHP5_OPTS}" "--enable-dba"; then
+  optional_depends qdbm \
+                 "--with-qdbm" "--without-qdbm" \
+                 "qdbm database routines" &&
 
-optional_depends sqlite2 \
-                 "--with-sqlite=${INSTALL_ROOT}/usr --enable-sqlite-utf8" 
"--without-sqlite" \
-                 "for SQLite 2.x support" &&
+  optional_depends db \
+                 "--with-db4" "--without-db4" \
+                 "qdbm database routines" &&
 
-if list_find "${PHP5_OPTS}" "--enable-pdo"; then
-    config_query_option PHP5_OPTS "Do you also want to build the SQLite 3.x 
PDO driver (requires: sqlite)?" y \
-                        "--with-pdo-sqlite=${INSTALL_ROOT}/usr" 
"--without-pdo-sqlite" &&
+  optional_depends gdbm \
+                 "--with-gdbm" "--without-gdbm" \
+                 "database routines that use extensive hashing"
+fi &&
 
-    if ! list_find "${PHP5_OPTS}" "--without-pdo-sqlite"; then
-        depends sqlite
-    fi
+optional_depends openldap \
+                 "--with-ldap" "--without-ldap" \
+                 "for LDAP support" &&
+
+if list_find "${PHP5_OPTS}" "--with-ldap"; then
+  optional_depends LIBSASL \
+                 "--with-ldap-sasl" "--without-ldap-sasl" \
+                 "for LDAP with Cyrus SASL support" &&
+  depends -sub openldap SASL
 fi &&
 
 optional_depends mm \
                  "--with-mm" "--without-mm" \
                  "for sharing memory between related processes" &&
 
-optional_depends openldap \
-                 "--with-ldap" "--without-ldap" \
-                 "for LDAP support" &&
-
 optional_depends tidy \
                  "--with-tidy" "--without-tidy" \
                  "for HTML Tidy support" &&
 
-optional_depends libxslt \
-                 "--with-xsl" "--without-xsl" \
-                 "for XSLT support" &&
-
-optional_depends t1lib \
-                 "--with-t1lib" "--without-t1lib" \
-                 "for T1lib support" &&
-
 optional_depends re2c \
                  "" "" \
                  "to regenerate PHP parsers" &&
@@ -175,21 +217,39 @@ optional_depends libexif \
                  "--enable-exif" "--disable-exif" \
                  "for image metadata support" &&
 
+if [[ "${PHP5_GD}" == "external" ]]; then
+    depends gd "--with-gd=${INSTALL_ROOT}/usr --enable-gd-native-ttf" 
+fi &&
+
 if [[ "${PHP5_GD}" != "none" ]]; then
-    if [[ "${PHP5_X11LIBS}" == "y" ]]; then
-        depends xorg-libs &&
-        depends libxpm "--with-xpm-dir=${INSTALL_ROOT}/usr"
-    fi &&
+
+    optional_depends libxpm \
+                     "--with-xpm-dir=${INSTALL_ROOT}/usr" \
+                     "--without-xpm" \
+                     "for XPM image support" &&
 
     optional_depends jpeg \
-                     "--with-jpeg-dir=${INSTALL_ROOT}/usr" 
"--without-jpeg-dir" \
+                     "--with-jpeg-dir=${INSTALL_ROOT}/usr" \
+                     "--without-jpeg-dir" \
                      "for JPEG support (for GD)" &&
 
     optional_depends libpng \
-                     "--with-png-dir=${INSTALL_ROOT}/usr" 
"--without-png-dir" \
+                     "--with-png-dir=${INSTALL_ROOT}/usr" \
+                     "--without-png-dir" \
                      "for PNG support (for GD)" &&
 
+    optional_depends t1lib \
+                     "--with-t1lib=${INSTALL_ROOT}/usr" \
+                     "--without-t1lib" \
+                     "for t1lib support" &&
+
     optional_depends freetype2 \
-                     "--with-freetype-dir=${INSTALL_ROOT}/usr" 
"--without-freetype-dir" \
-                     "for freetype2 support"
+                     "--with-freetype-dir=${INSTALL_ROOT}/usr" \
+                     "--without-freetype-dir" \
+                     "for freetype2 support" &&
+
+    optional_depends font-jis-misc \
+                     "--enable-gd-jis-conv" \
+                     "--disable-gd-jis-conv" \
+                     "for JIS-mapped Japanese font support"
 fi
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 8f69a2d..507b2b8 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,9 @@
+2009-07-29 Arjan Bouter <abouter AT sourcemage.org>
+       * BUILD, CONFIGURE: moved options to DEPENDS
+         and added some missing options.
+       * DEPENDS: almost rewritten to minimise irrelevant questions,
+         added some missing options
+
 2009-07-02 Eric Sandall <sandalle AT sourcemage.org>
        * INSTALL: php.ini-dist -> php.ini-production (Bug #15278)