php: removed php-5.2.11-fpm-0.5.13.diff and consolidated php.conf

develop/php/php.conf

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../php/php.conf
-# Copyright (C) 2006 - 2010 The OpenSDE Project
+# Copyright (C) 2006 - 2011 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -28,6 +28,20 @@ var_append confopt ' ' "--with-config-file-path=$sysconfdir"
 # sockets does not need any external lib. We have to enable it explicitly
 var_append confopt ' ' "--enable-sockets"
 
+for x in zlib bzip2:bz2 curl openssl libmhash:mhash gettext \
+libjpeg:jpeg-dir libpng:png-dir freetype1:ttf; do
+    if pkginstalled "${x%:*}"; then
+        var_append extraconfopt ' ' "--with-${x#*:}"
+    fi
+done
+
+for x in postgresql:pgsql openldap:ldap libmcrypt:mcrypt \
+freetype pcre:pcre-regex; do
+    if pkginstalled "${x%:*}"; then
+        var_append extraconfopt " " "--with-${x#*:}=$( pkgprefix -r ${x%:*} )"
+    fi
+done
+
 if pkginstalled apache; then
 	pkgprefix -t apache
 	var_append extraconfopt " " "--with-apxs2=$( pkgprefix sbindir apache )/apxs"
@@ -36,14 +50,6 @@ else
 	var_append extraconfopt " " "--enable-force-cgi-redirect"
 fi
 
-if pkginstalled zlib; then
-	var_append extraconfopt " " "--with-zlib"
-fi
-
-if pkginstalled bzip2; then
-	var_append extraconfopt " " "--with-bz2"
-fi
-
 if pkginstalled mysql; then
 	pkgprefix -t mysql
 
@@ -58,43 +64,9 @@ if pkginstalled mysql; then
 	var_append extraconfopt " " "--with-mysql=mysqlnd --with-mysqli=mysqlnd --with-pdo-mysql=mysqlnd"
 fi
 
-if pkginstalled postgresql; then
-	pkgprefix -t postgresql
-	var_append extraconfopt " " "--with-pgsql=$root/$( pkgprefix postgresql )"
-fi
-
-if pkginstalled openldap; then
-	pkgprefix -t openldap
-	var_append extraconfopt " " "--with-ldap=$root/$( pkgprefix openldap )"
-fi
-
-pkginstalled curl && var_append extraconfopt " " "--with-curl"
-pkginstalled openssl && var_append extraconfopt " " "--with-openssl"
-
-if pkginstalled libmcrypt; then
-	pkgprefix -t libmcrypt
-	var_append extraconfopt " " "--with-mcrypt=$root/$( pkgprefix libmcrypt )"
-fi
-
-pkginstalled libmhash && var_append extraconfopt " " "--with-mhash"
-
-pkginstalled gettext &&
-	var_append extraconfopt " " "--with-gettext"
-
 pkginstalled libgd &&
 	var_append extraconfopt " " "--with-gd --enable-gd-native-ttf"
 
-pkginstalled libjpeg && var_append extraconfopt " " "--with-jpeg-dir"
-pkginstalled libpng && var_append extraconfopt " " "--with-png-dir"
-
-pkginstalled freetype1 && var_append extraconfopt " " "--with-ttf"
-
-pkginstalled pcre && var_append extraconfopt ' ' "--with-pcre-regex=$root/$( pkgprefix pcre )"
-
-if pkginstalled freetype; then
-	pkgprefix -t freetype
-	var_append extraconfopt " " "--with-freetype-dir=$root/$( pkgprefix freetype )"
-fi
 
 if [ "$SDECFG_PKG_PHP_EXTRACONFOPT" ]; then
 	var_append extraconfopt " " "$SDECFG_PKG_PHP_EXTRACONFOPT"
@@ -102,13 +74,6 @@ fi
 
 [ "$SDECFG_PKG_PHP_FPM" == 1 ] && var_append extraconfopt " " "--enable-fpm"
 
-#fpm_patch() {
-#	if [ "$SDECFG_PKG_PHP_FPM" ]; then
-#		var_append patchfiles "$confdir/php-5.2.11-fpm-0.5.13.diff"
-#	fi
-#}
-
-#hook_add prepatch 5 'fpm_patch'
 hook_add postmake 5 'cp php.ini-* $root$docdir'
 
 # HACK ALERT