php: post-update fixes

8 files changed, 53 insertions, 61 deletions

diff --git a/php-pear/php/BUILD b/php-pear/php/BUILD
index a92da7e884..0965552d47 100755
--- a/php-pear/php/BUILD
+++ b/php-pear/php/BUILD
@@ -34,10 +34,6 @@ fi &&
 
 CFLAGS="${CFLAGS//-ffast-math}" &&
 
-if is_version_less "${VERSION}" 5.4; then
-  OPTS="--with-exec-dir=${INSTALL_ROOT}/usr/bin $OPTS"
-fi &&
-
 OPTS="--with-config-file-path=${INSTALL_ROOT}/etc \
                --disable-rpath \
                 --enable-bcmath \
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE
index 1c3a799bf8..d89a67a7a2 100755
--- a/php-pear/php/CONFIGURE
+++ b/php-pear/php/CONFIGURE
@@ -12,12 +12,6 @@ config_query PHP5_PEAR "Do you want PEAR support?" y &&
 config_query_option PHP5_OPTS "Enable IPv6?" n \
                     "--enable-ipv6" "--disable-ipv6" &&
 
-if is_version_less "${VERSION}" 5.4; then
-  config_query_option PHP5_OPTS "Enable PHP safe mode?" n \
-                                "--enable-safe-mode" \
-                                "--disable-safe-mode"
-fi &&
-
 config_query_option PHP5_OPTS "Enable sockets support?" y \
                     "--enable-sockets" "--disable-sockets" &&
 
@@ -84,16 +78,8 @@ else
   list_add "PHP5_OPTS" "--disable-dba"
 fi &&
 
-# get the native simple drivers
-if is_version_less "${VERSION}" 5.3; then
-  # 5.2 drops SQLite 3 support
-  local DB_DRIVERS="mysql mysqli pgsql sqlite firebird unixODBC iODBC"
-elif is_version_less "${VERSION}" 5.4; then
-  local DB_DRIVERS="mysql mysqli pgsql sqlite sqlite3 firebird unixODBC iODBC"
-else
-  # 5.4 drops SQLite 2 support
-  local DB_DRIVERS="mysql mysqli pgsql sqlite3 firebird unixODBC iODBC"
-fi &&
+# get the native simple drivers (5.4 drops SQLite 2 support)
+local DB_DRIVERS="mysql mysqli pgsql sqlite3 firebird unixODBC iODBC" &&
 
 config_query_multi PHP5_DATABASE_DRIVERS "Select vendor specific database drivers to install (if any)" \
                                          none all $DB_DRIVERS &&
diff --git a/php-pear/php/CONFLICTS b/php-pear/php/CONFLICTS
index 7703bf30e4..f512999a03 100755
--- a/php-pear/php/CONFLICTS
+++ b/php-pear/php/CONFLICTS
@@ -2,8 +2,4 @@
 
 conflicts php-dev &&
 conflicts php4 &&
-
-# PHP >=5.3 includes fileinfo
-if spell_ok fileinfo && is_version_less 5.2.9999 "${VERSION}"; then
-  conflicts fileinfo y
-fi
+conflicts fileinfo y
diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS
index a7eb5a1bb7..b076aaf7e3 100755
--- a/php-pear/php/DEPENDS
+++ b/php-pear/php/DEPENDS
@@ -96,20 +96,18 @@ optional_depends mhash \
                  "--with-mhash" "--without-mhash" \
                  "for hash functions support" &&
 
-if is_version_less 5.2.9999 "${VERSION}"; then
-  optional_depends enchant \
-                   "--with-enchant" "--without-enchant" \
-                   "use enchant for spelling functions?" &&
-
-  optional_depends icu \
-                   "--enable-intl --with-icu-dir=${INSTALL_ROOT}/usr" \
-                   "--disable-intl --without-icu-dir" \
-                   "for ICU unicode (internationalization) support" &&
-
-  optional_depends oniguruma \
-                   "--with-onig=${INSTALL_ROOT}/usr" "--without-onig" \
-                   "for external oniguruma"
-fi &&
+optional_depends enchant \
+                 "--with-enchant" "--without-enchant" \
+                 "use enchant for spelling functions?" &&
+
+optional_depends icu \
+                 "--enable-intl --with-icu-dir=${INSTALL_ROOT}/usr" \
+                 "--disable-intl --without-icu-dir" \
+                 "for ICU unicode (internationalization) support" &&
+
+optional_depends oniguruma \
+                 "--with-onig=${INSTALL_ROOT}/usr" "--without-onig" \
+                 "for external oniguruma" &&
 
 optional_depends libmcrypt \
                  "--with-mcrypt" "--without-mcrypt" \
@@ -164,14 +162,7 @@ fi &&
 
 db_driver_depends "mysqli" "MYSQL" &&
 db_driver_depends "pgsql" "postgresql" &&
-
-if is_version_less "${VERSION}" 5.4; then
-  db_driver_depends "sqlite" "sqlite2"
-fi &&
-
-if is_version_less 5.2.9999 "${VERSION}"; then
-  db_driver_depends "sqlite3" "sqlite"
-fi &&
+db_driver_depends "sqlite3" "sqlite" &&
 
 if list_find "${PHP5_DATABASE_DRIVERS}" "firebird"; then
   depends firebird "--with-pdo-firebird=${INSTALL_ROOT}/usr"
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index a5b95acf82..ec71d4e765 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,16 +1,20 @@
            SPELL=php
-case "$PHP_BRANCH" in stable)
+case "$PHP_BRANCH" in
+  stable)
          VERSION=5.6.6
   SECURITY_PATCH=14
      SOURCE_HASH=sha512:2b305a3487464b35ae6a3b0cc1d4537649e1e49fd1cd8c2ca8f2b6b7dd7d02f1738b12dca484a0327766b6fe060d1e6a9250b65da5399ecf61e9f579aa486fb6
-;; oldstable)
+  ;;
+  previous)
          VERSION=5.5.22
   SECURITY_PATCH=23
      SOURCE_HASH=sha512:3eabd6fa2cd10e83fc3c00fb43313feefbb8c2772778dc6f176612fcb449761e22b55053e5b0b7f6954c0c141ab6c799f08bdca1851078511b7ef9376dadefac
-;; legacy)
+  ;;
+  legacy)
          VERSION=5.4.38
   SECURITY_PATCH=23
      SOURCE_HASH=sha512:92b2901117bbaa6c4749027e4a7dbb2f4bb50a3f60b52583051abdfcddafbe4715025a928ea9a6c70b51352e5e43f7ced626d78f5fff97cb1be34a9864f9ed6e
+  ;;
 esac
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 999c44f50b..1dd535f79f 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,11 @@
+2015-04-17 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: oldstable -> previous, there's no practical reason to change
+	  that; added missing ";;", alligned lines
+	* PREPARE: correctly migrate old users from previous updates
+	* CONFLICTS: always conflicts fileinfo
+	* BUILD, CONFIGURE, DEPENDS: removed deprecated settings
+	* INSTALL: dropped obsolete installation instruction
+
 2015-03-13 Ismael Luceno <ismael@sourcemage.org>
 	* DETAILS, PRE_BUILD, PREPARE: Suhosin patch removed, dead
 	* DETAILS, PRE_BUILD: Backports removed
diff --git a/php-pear/php/INSTALL b/php-pear/php/INSTALL
index db83e72df9..0a11fdea16 100755
--- a/php-pear/php/INSTALL
+++ b/php-pear/php/INSTALL
@@ -2,10 +2,5 @@
 
 default_install &&
 
-if is_version_less "${VERSION}" 5.3; then
-  install_config_file "$SOURCE_DIRECTORY/php.ini-recommended" \
-                      "$INSTALL_ROOT/etc/php.ini"
-else
-  install_config_file "$SOURCE_DIRECTORY/php.ini-production" \
-                      "$INSTALL_ROOT/etc/php.ini"
-fi
+install_config_file "$SOURCE_DIRECTORY/php.ini-production" \
+                    "$INSTALL_ROOT/etc/php.ini"
diff --git a/php-pear/php/PREPARE b/php-pear/php/PREPARE
index a26656d92c..90235223ed 100755
--- a/php-pear/php/PREPARE
+++ b/php-pear/php/PREPARE
@@ -1,6 +1,22 @@
 . ${GRIMOIRE}/FUNCTIONS &&
 
-prepare_select_branch \
-                              stable \
-                              oldstable \
-                              legacy
+# PHP5 -> PHP
+if spell_ok $SPELL && [[ -n $PHP5_BRANCH ]]; then
+  persistent_add PHP_BRANCH &&
+  PHP_BRANCH="$PHP5_BRANCH" &&
+  persistent_remove PHP5_BRANCH &&
+
+  # backporting legacy branch selection
+  if [[ $PHP_BRANCH == alpha ]] || [[ $PHP_BRANCH == rc ]]; then
+    PHP_BRANCH="stable"
+  fi &&
+
+  # keep 5.4 branch selection
+  if [[ $(installed_version $SPELL | cut -d. -f1,2) == "5.4" ]]; then
+    PHP_BRANCH="legacy"
+  fi
+fi &&
+
+prepare_select_branch stable \
+                      previous \
+                      legacy