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

[Pierre Schmitz]

    Date: Wednesday, January 28, 2009 @ 16:56:59
  Author: pierre
Revision: 25781

upgpkg: php 5.2.8-1

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

----------+
 PKGBUILD |   64 +++++++++++++++++++++++++++++++------------------------------
 php.ini  |    2 +
 2 files changed, 35 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-28 21:37:27 UTC (rev 25780)
+++ PKGBUILD	2009-01-28 21:56:59 UTC (rev 25781)
@@ -11,37 +11,38 @@
 url='http://www.php.net'
 backup=('etc/php/php.ini')
 depends=('glibc' 'readline' 'ncurses' 'libxml2' 'pcre')
-makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'smtp-server' \
-             'libpng' 'libjpeg' 'sqlite3' 'unixodbc' 'net-snmp' \
-             'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'freetype2' 'libjpeg' \
-             'curl' 'libxslt' 'pam' 'openssl' 'bzip2' 'gdbm' 'db>=4.7')
-optdepends=('bzip2: bz2' \
-            'curl: curl' \
-            'gdbm: dba' \
-            'libpng: gd' \
-            'libjpeg: gd' \
-            'freetype2: gd' \
-            'pam: imap' \
-            'libldap: ldap' \
-            'mcrypt: mcrypt' \
-            'libtool: mcrypt' \
-            'libmysqlclient: mysql/mysqli' \
-            'unixodbc: odbc/pdo_odbc' \
-            'openssl: openssl' \
-            'postgresql-libs: pgsql/pdo_pgsql' \
-            'aspell: pspell' \
-            'net-snmp: snmp' \
-            'sqlite3: sqlite' \
-            'tidyhtml: tidy' \
-            'libxslt: xsl' \
+makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'smtp-server' 
+             'libpng' 'libjpeg' 'sqlite3' 'unixodbc' 'net-snmp' 'mhash' 'gmp'
+             'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'freetype2' 'libjpeg' 
+             'curl' 'libxslt' 'pam' 'openssl' 'bzip2' 'gdbm' 'db')
+optdepends=('bzip2: bz2'
+            'curl: curl'
+            'gdbm: dba'
+            'libpng: gd'
+            'libjpeg: gd'
+            'freetype2: gd'
+            'pam: imap'
+            'libldap: ldap'
+            'libmcrypt: mcrypt'
+            'libtool: mcrypt'
+            'libmysqlclient: mysql/mysqli/pdo_mysql'
+            'unixodbc: odbc/pdo_odbc'
+            'openssl: openssl'
+            'postgresql-libs: pgsql/pdo_pgsql'
+            'aspell: pspell'
+            'net-snmp: snmp'
+            'sqlite3: pdo_sqlite'
+            'tidyhtml: tidy'
+            'libxslt: xsl'
+            'mhash: mhash'
+            'gmp: gmp'
             )
-options=('emptydirs')
 source=("http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2" \
         "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" \
         'php.ini' 'apache.conf' 'db-configure.patch')
 md5sums=('8760a833cf10433d3e72271ab0d0eccf'
          'd455c3dd5b652046dbac2951a58f64fa'
-         '0ee1dad48f7d67af3d2c78ca6eed68ba'
+         'f131ec28cb079f604588c7ffefae5f62'
          '96ca078be6729b665be8a865535a97bf'
          '74e5ce5a02488ec91b1c59f539e42936')
 
@@ -91,15 +92,15 @@
 	--with-unixODBC=shared,/usr \
 	--enable-pdo=shared \
 	--with-pdo-mysql=shared \
-	--with-pdo-sqlite=shared \
+	--with-pdo-sqlite=shared,/usr \
 	--with-pdo-odbc=shared,unixODBC,/usr \
 	--with-pdo-pgsql=shared \
 	--with-sqlite=shared \
+	--enable-sqlite-utf8 \
 	--with-pgsql=shared \
 	--enable-shmop=shared \
 	--with-snmp=shared \
 	--enable-soap=shared \
-	--enable-sqlite-utf8=shared \
 	--enable-sysvmsg=shared \
 	--enable-sysvsem=shared \
 	--enable-sysvshm=shared \
@@ -121,8 +122,13 @@
 	--with-pspell=shared \
 	--with-freetype-dir=shared,/usr \
 	--with-mime-magic=shared \
+	--with-gmp=shared \
+	--with-mhash=shared \
 	"
 
+	PEAR_INSTALLDIR=/usr/share/pear
+	export PEAR_INSTALLDIR
+
 	cd ${srcdir}/${pkgname}-${pkgver}
 
 	# avoid linking against old db version
@@ -142,12 +148,8 @@
 	# make test
 	make INSTALL_ROOT=${pkgdir} install || return 1
 
-	# fix pear path
-	sed "s|$PWD||g" -i ${pkgdir}/usr/{bin/pear,share/pear/pearcmd.php}
 	# cleanup
 	rm -f ${pkgdir}`${pkgdir}/usr/bin/php-config --extension-dir`/*.a
-	rm -rf ${pkgdir}/{.registry,.channels,.depdb*,.lock,.filemap}
-	rmdir ${pkgdir}/usr/include/php/include
 	# install php.ini
 	install -D -m644 ${srcdir}/php.ini ${pkgdir}/etc/php/php.ini
 	install -d -m755 ${pkgdir}/etc/php/conf.d/

Modified: php.ini
===================================================================
--- php.ini	2009-01-28 21:37:27 UTC (rev 25780)
+++ php.ini	2009-01-28 21:56:59 UTC (rev 25781)
@@ -1264,11 +1264,13 @@
 ;extension=ftp.so
 ;extension=gd.so
 extension=gettext.so
+;extension=gmp.so
 ;extension=iconv.so
 ;extension=imap.so
 ;extension=json.so
 ;extension=ldap.so
 ;extension=mcrypt.so
+;extension=mhash.so
 ;extension=mime_magic.so
 ;extension=mysql.so
 ;extension=mysqli.so