[arch-commits] CVS update of extra/devel/php (PKGBUILD php.install)
Pierre Schmitz
pierre at archlinux.org
Sat Feb 16 11:55:36 UTC 2008
Date: Saturday, February 16, 2008 @ 06:55:36
Author: pierre
Path: /home/cvs-extra/extra/devel/php
Modified: PKGBUILD (1.119 -> 1.120) php.install (1.12 -> 1.13)
upgpkg: php 5.2.5-4
use system pcre; added optdepends
-------------+
PKGBUILD | 30 ++++++++++++++++++++++++++----
php.install | 4 ++--
2 files changed, 28 insertions(+), 6 deletions(-)
Index: extra/devel/php/PKGBUILD
diff -u extra/devel/php/PKGBUILD:1.119 extra/devel/php/PKGBUILD:1.120
--- extra/devel/php/PKGBUILD:1.119 Sat Jan 26 19:02:35 2008
+++ extra/devel/php/PKGBUILD Sat Feb 16 06:55:36 2008
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.119 2008/01/27 00:02:35 pierre Exp $
+# $Id: PKGBUILD,v 1.120 2008/02/16 11:55:36 pierre Exp $
# Maintainer: Pierre Schmitz <pierre at archlinux.de>
pkgname=php
pkgver=5.2.5
-pkgrel=3
+pkgrel=4
_suhosinver=0.9.6.2
pkgdesc='A high-level scripting language'
arch=('i686' 'x86_64')
@@ -10,11 +10,31 @@
url='http://www.php.net'
backup=('etc/php/php.ini')
install=php.install
-depends=('glibc' 'readline' 'ncurses' 'libxml2')
+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')
+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' \
+ )
options=('emptydirs')
source=("http://www.php.net/distributions/${pkgname}-${pkgver}.tar.bz2" \
"http://www.hardened-php.net/suhosin/_media/suhosin-patch-${pkgver}-${_suhosinver}.patch.gz" \
@@ -36,6 +56,7 @@
--disable-rpath \
--disable-static \
--enable-shared \
+ --with-pcre-regex=/usr \
"
phpextensions="--with-openssl=shared \
@@ -114,6 +135,7 @@
--with-pear=/usr/share/pear \
${phpextensions} || return 1
make || return 1
+ # make test
make INSTALL_ROOT=${startdir}/pkg install || return 1
# fix pear path
@@ -144,4 +166,4 @@
${phpextensions} || return 1
make || return 1
install -D -m644 libs/libphp5.so ${startdir}/pkg/usr/lib/apache/libphp5.so || return 1
-}
+}
\ No newline at end of file
Index: extra/devel/php/php.install
diff -u extra/devel/php/php.install:1.12 extra/devel/php/php.install:1.13
--- extra/devel/php/php.install:1.12 Sat Sep 29 08:34:04 2007
+++ extra/devel/php/php.install Sat Feb 16 06:55:36 2008
@@ -17,9 +17,9 @@
* mysql/mysqli : libmysqlclient
* odbc/pdo_odbc : unixodbc
* openssl : openssl
- * pgsql/pdo_pgsql : postgresql*libs
+ * pgsql/pdo_pgsql : postgresql-libs
* pspell : aspell
- * snmp : net*snmp
+ * snmp : net-snmp
* sqlite : sqlite3
* tidy : tidyhtml
* xsl : libxslt
More information about the arch-commits
mailing list