[arch-commits] Commit in php/trunk (PKGBUILD php.ini.patch)

[Pierre Schmitz]

    Date: Sunday, September 11, 2011 @ 07:09:35
  Author: pierre
Revision: 137804

upgpkg: php 5.3.8-3

* Move curl and gmp extensions back into the php package as their deps are needed anyway
* remove redundant deps
* Enable curl and json in default php.ini

Modified:
  php/trunk/PKGBUILD
  php/trunk/php.ini.patch

---------------+
 PKGBUILD      |   38 +++++++++++++-------------------------
 php.ini.patch |    4 ++--
 2 files changed, 15 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-11 11:04:53 UTC (rev 137803)
+++ PKGBUILD	2011-09-11 11:09:35 UTC (rev 137804)
@@ -8,10 +8,8 @@
          'php-fpm'
          'php-embed'
          'php-pear'
-         'php-curl'
          'php-enchant'
          'php-gd'
-         'php-gmp'
          'php-intl'
          'php-ldap'
          'php-mcrypt'
@@ -25,7 +23,7 @@
          'php-xsl')
 pkgver=5.3.8
 _suhosinver=5.3.7-0.9.10
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -39,7 +37,7 @@
         'logrotate.d.php-fpm')
 md5sums=('704cd414a0565d905e1074ffdc1fadfb'
          '08582e502fed8221c6577042ca45ddb8'
-         '39eaa70d276fc3d45d6bcf6cd5ae1106'
+         '65606c606df97a0760dfe5aaf9893afc'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          'b01be5f816988fcee7e78225836e5e27'
          '09005dabd90c48ddd392b3dbf05f8a82'
@@ -212,10 +210,10 @@
 
 package_php() {
 	pkgdesc='An HTML-embedded scripting language'
-	depends=('pcre' 'libxml2' 'bzip2' 'openssl')
-	replaces=('php-fileinfo')
-	provides=('php-fileinfo')
-	conflicts=('php-fileinfo')
+	depends=('pcre' 'libxml2' 'bzip2' 'curl')
+	replaces=('php-fileinfo' 'php-gmp' 'php-curl')
+	provides=('php-fileinfo' 'php-gmp' 'php-curl')
+	conflicts=('php-fileinfo' 'php-gmp' 'php-curl')
 	backup=('etc/php/php.ini')
 
 	cd ${srcdir}/build-php
@@ -228,19 +226,21 @@
 	# remove static modules
 	rm -f ${pkgdir}/usr/lib/php/modules/*.a
 	# remove modules provided by sub packages
-	rm -f ${pkgdir}/usr/lib/php/modules/{curl,enchant,gd,gmp,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
+	rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
+	# remove empty directory
+	rmdir ${pkgdir}/usr/include/php/include
 }
 
 package_php-cgi() {
 	pkgdesc='CGI and FCGI SAPI for PHP'
-	depends=('php' 'pcre' 'libxml2')
+	depends=('php')
 
 	install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi
 }
 
 package_php-apache() {
 	pkgdesc='Apache SAPI for PHP'
-	depends=('php' 'apache' 'pcre' 'libxml2')
+	depends=('php' 'apache')
 	backup=('etc/httpd/conf/extra/php5_module.conf')
 
 	install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so
@@ -262,7 +262,7 @@
 
 package_php-embed() {
 	pkgdesc='Embed SAPI for PHP'
-	depends=('php' 'pcre' 'libxml2')
+	depends=('php')
 
 	install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so
 	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h
@@ -270,7 +270,7 @@
 
 package_php-pear() {
 	pkgdesc='PHP Extension and Application Repository'
-	depends=('php' 'bash')
+	depends=('php')
 	backup=('etc/php/pear.conf')
 
 	cd ${srcdir}/build-pear
@@ -281,12 +281,6 @@
 	done < <(find ${pkgdir} -name '.*')
 }
 
-package_php-curl() {
-	depends=('php' 'curl')
-	pkgdesc='curl module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/curl.so ${pkgdir}/usr/lib/php/modules/curl.so
-}
-
 package_php-enchant() {
 	depends=('php' 'enchant')
 	pkgdesc='enchant module for PHP'
@@ -299,12 +293,6 @@
 	install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
 }
 
-package_php-gmp() {
-	depends=('php' 'gmp')
-	pkgdesc='gmp module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/gmp.so ${pkgdir}/usr/lib/php/modules/gmp.so
-}
-
 package_php-intl() {
 	depends=('php' 'icu')
 	pkgdesc='intl module for PHP'

Modified: php.ini.patch
===================================================================
--- php.ini.patch	2011-09-11 11:04:53 UTC (rev 137803)
+++ php.ini.patch	2011-09-11 11:09:35 UTC (rev 137804)
@@ -81,7 +81,7 @@
 +;extension=bcmath.so
 +;extension=bz2.so
 +;extension=calendar.so
-+;extension=curl.so
++extension=curl.so
 +;extension=dba.so
 +;extension=enchant.so
 +;extension=exif.so
@@ -92,7 +92,7 @@
 +;extension=iconv.so
 +;extension=imap.so
 +;extension=intl.so
-+;extension=json.so
++extension=json.so
 +;extension=ldap.so
 +;extension=mcrypt.so
 +;extension=mssql.so