From be2ae216393a5ca3a63c4c058cb202df93c541ba Mon Sep 17 00:00:00 2001
From: fake <fake@rapidnetworks.de>
Date: Mon, 4 Apr 2005 09:33:12 +0000
Subject: [PATCH] fake: 	php: update to 4.3.10, change config behaviour to not 
 allow options for packages not being installed, and 	default to enable
 those possible. change check for imap 	it uses a pine lib, nothing from
 courier/binc

[2005032216272530460] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5846 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/alessandro/php/config.in | 10 ++++++----
 package/alessandro/php/php.conf  | 19 +++++++++----------
 package/alessandro/php/php.desc  |  4 ++--
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/package/alessandro/php/config.in b/package/alessandro/php/config.in
index dc8de25b9..d33e8e10e 100644
--- a/package/alessandro/php/config.in
+++ b/package/alessandro/php/config.in
@@ -23,16 +23,18 @@
 if pkgcheck php X ; then
 	menu_begin MENU_PKG_PHP 'PHP Package Options'
 		bool 'Force usage of shared modules' ROCKCFG_PKG_PHP_FORCESHARED 0
-		bool 'Build PHP with Mysql support' ROCKCFG_PKG_PHP_mysql 0
-		for xpkg in postgresql openldap openssl ; do
+		for xpkg in postgresql openssl mysql libgd ; do
 		  if pkgcheck $xpkg X ; then
-		    bool "Build PHP with $xpkg support" ROCKCFG_PKG_PHP_$xpkg 0
+		  	bool "Build PHP with $xpkg support" ROCKCFG_PKG_PHP_$xpkg 1
 		  fi
 		done
 
+		if pkgcheck pine X ; then
+		  bool "Build PHP with imap support" ROCKCFG_PKG_PHP_imap 1
+		fi
+
 		bool "Build PHP with mcrypt support" ROCKCFG_PKG_PHP_mcrypt 0
 		bool "Build PHP with mhash support" ROCKCFG_PKG_PHP_mhash 0
-		bool "Build PHP with gd support"     ROCKCFG_PKG_PHP_gd 0
 
 	menu_end
 fi
diff --git a/package/alessandro/php/php.conf b/package/alessandro/php/php.conf
index 9c668831e..9a7334a36 100644
--- a/package/alessandro/php/php.conf
+++ b/package/alessandro/php/php.conf
@@ -23,7 +23,7 @@
 var_append extraconfopt " " "--with-apxs2=$root/opt/apache/sbin/apxs"
 var_append extraconfopt " " "--with-zlib --with-bz2"
 
-if [ "$ROCKCFG_PKG_PHP_mysql" = 1 ] ; then
+if [ "$ROCKCFG_PKG_PHP_mysql" == 1 ] ; then
 	if [ "$ROCKCFG_PKG_PHP_FORCESHARED" -eq 1 ]; then
 		pkg_php_shared="=$root/${pkg_mysql_prefix}"
 	elif pkginstalled mysql; then
@@ -34,17 +34,16 @@ if [ "$ROCKCFG_PKG_PHP_mysql" = 1 ] ; then
 	var_append extraconfopt " " "--with-mysql$pkg_php_shared"
 fi
 
-[ "$ROCKCFG_PKG_PHP_postgresql" = 1 ] && var_append extraconfopt " " "--with-pgsql=$root/${pkg_postgresql_prefix}"
-[ "$ROCKCFG_PKG_PHP_openldap" = 1 ] && var_append extraconfopt " " "--with-ldap=$root/${pkg_openldap_prefix}"
-[ "$ROCKCFG_PKG_PHP_openssl" = 1 ] && var_append extraconfopt " " "--with-openssl"
+[ "$ROCKCFG_PKG_PHP_postgresql" == 1 ] && var_append extraconfopt " " "--with-pgsql=$root/${pkg_postgresql_prefix}"
+[ "$ROCKCFG_PKG_PHP_openldap" == 1 ] && var_append extraconfopt " " "--with-ldap=$root/${pkg_openldap_prefix}"
+[ "$ROCKCFG_PKG_PHP_openssl" == 1 ] && var_append extraconfopt " " "--with-openssl"
 
-[ "$ROCKCFG_PKG_PHP_mcrypt"  = 1 ] && var_append extraconfopt " " "--with-mcrypt"
-[ "$ROCKCFG_PKG_PHP_mcrypt"  = 1 ] && var_append extraconfopt " " "--with-mhash"
-[ "$ROCKCFG_PKG_PHP_gd"      = 1 ] && var_append extraconfopt " " "--with-gd"
+[ "$ROCKCFG_PKG_PHP_mcrypt"  == 1 ] && var_append extraconfopt " " "--with-mcrypt"
+[ "$ROCKCFG_PKG_PHP_mcrypt"  == 1 ] && var_append extraconfopt " " "--with-mhash"
+[ "$ROCKCFG_PKG_PHP_libgd"   == 1 ] && var_append extraconfopt " " "--with-gd"
 
-pkginstalled courier-imap || pkginstalled bincimap && \
-	 var_append extraconfopt " " "--with-imap" \
-	 && pkginstalled openssl && var_append extraconfopt " " "--with-imap-ssl"
+[ "$ROCKCFG_PKG_PHP_imap"   == 1 ] && var_append extraconfopt " " "--with-imap"
+[ "$ROCKCFG_PKG_PHP_imap" == 1 -a "$ROCKCFG_PKG_PHP_openssl" == 1 ] && var_append extraconfopt " " "--with-imap-ssl" ; 
 
 pkginstalled libxml2 && var_append extraconfopt " " "--with-dom"
 pkginstalled libxslt && var_append extraconfopt " " "--with-dom-xslt"
diff --git a/package/alessandro/php/php.desc b/package/alessandro/php/php.desc
index 47644eda5..0a910c095 100644
--- a/package/alessandro/php/php.desc
+++ b/package/alessandro/php/php.desc
@@ -36,8 +36,8 @@
 
 [L] OpenSource
 [S] Stable
-[V] 4.3.9
+[V] 4.3.10
 [P] X -?---5---9 178.300
 
-[D] 2335548844 php-4.3.9.tar.bz2 http://static.php.net/www.php.net/distributions/
+[D] 1523172590 php-4.3.10.tar.bz2 http://static.php.net/www.php.net/distributions/