[arch-commits] CVS update of extra/devel/php (PKGBUILD php.ini php.install)
Pierre Schmitz
pierre at archlinux.org
Sat Sep 22 12:25:41 UTC 2007
Date: Saturday, September 22, 2007 @ 08:25:41
Author: pierre
Path: /home/cvs-extra/extra/devel/php
Modified: PKGBUILD (1.106 -> 1.107) php.ini (1.19 -> 1.20)
php.install (1.5 -> 1.6)
move config files to /etc/php/; updated install script
-------------+
PKGBUILD | 26 +++++++++--------
php.ini | 3 +-
php.install | 85 ++++++++++++++++++++++++++++++++++++----------------------
3 files changed, 69 insertions(+), 45 deletions(-)
Index: extra/devel/php/PKGBUILD
diff -u extra/devel/php/PKGBUILD:1.106 extra/devel/php/PKGBUILD:1.107
--- extra/devel/php/PKGBUILD:1.106 Fri Sep 21 15:53:29 2007
+++ extra/devel/php/PKGBUILD Sat Sep 22 08:25:41 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.106 2007/09/21 19:53:29 pierre Exp $
+# $Id: PKGBUILD,v 1.107 2007/09/22 12:25:41 pierre Exp $
# Maintainer: Pierre Schmitz <pierre at archlinux.de>
pkgname=php
pkgver=5.2.4
@@ -8,7 +8,7 @@
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
-backup=('etc/php.ini')
+backup=('etc/php.ini' 'etc/php/php.ini') # workaround: save old php.ini; remove this for later versions of php
install=php.install
depends=('glibc')
makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'smtp-server' \
@@ -21,19 +21,21 @@
'php.ini')
md5sums=('55c97a671fdabf462cc7a82971a656d2' \
'58b18d0db00bc52b004fc749190a958f' \
- 'b8a74b5f5f3e5868e525c70488798f5c')
+ '48fad1a63c557cfe216419e87fdf65a2')
build() {
phpconfig="--prefix=/usr \
- --sysconfdir=/etc \
- --with-layout=PHP \
- --with-config-file-path=/etc/ \
- --with-config-file-scan-dir=/etc/php.d/ \
+ --sysconfdir=/etc/php \
+ --with-layout=GNU \
+ --with-config-file-path=/etc/php \
+ --with-config-file-scan-dir=/etc/php/conf.d \
--with-pear=/usr/share/pear \
--enable-inline-optimization \
--disable-debug \
--disable-rpath \
--disable-static \
+ --enable-shared \
+ --with-pic \
"
phpextensions="--with-openssl=shared \
@@ -45,6 +47,7 @@
--enable-dba=shared \
--without-db2 \
--without-db3 \
+ --with-db4=shared \
--with-gdbm=shared \
--enable-dbase=shared \
--enable-exif=shared \
@@ -87,7 +90,6 @@
--enable-xml \
--with-ttf=shared \
--enable-session=shared \
- --enable-shared \
--with-regex=php \
--enable-mbstring=all \
--enable-mbregex \
@@ -128,14 +130,14 @@
make INSTALL_ROOT=${startdir}/pkg install || return 1
# remove empty dirs
- rm -rf ${startdir}/pkg{/etc/httpd,/usr/include/php/include}
+ rmdir -p ${startdir}/pkg{/etc/httpd/conf,/usr/include/php/include}
# install php.ini
- install -D -m644 ${startdir}/src/php.ini ${startdir}/pkg/etc/php.ini
- install -d -m755 ${startdir}/pkg/etc/php.d/
+ install -D -m644 ${startdir}/src/php.ini ${startdir}/pkg/etc/php/php.ini
+ install -d -m755 ${startdir}/pkg/etc/php/conf.d/
# FS #3395
- cd ${startdir}/pkg/usr/lib/php/extensions && ln -s * php
+ ln -s `${startdir}/pkg/usr/bin/php-config --extension-dir` ${startdir}/pkg/usr/lib/php/extensions
# fix pear path
sed "s|$PWD||g" -i ${startdir}/pkg/usr/{bin/pear,share/pear/pearcmd.php}
Index: extra/devel/php/php.ini
diff -u extra/devel/php/php.ini:1.19 extra/devel/php/php.ini:1.20
--- extra/devel/php/php.ini:1.19 Fri Sep 21 15:53:29 2007
+++ extra/devel/php/php.ini Sat Sep 22 08:25:41 2007
@@ -529,7 +529,7 @@
user_dir =
; Directory in which the loadable extensions (modules) reside.
-extension_dir = "/usr/lib/php/extensions/php/"
+extension_dir = "/usr/lib/php/extensions/"
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -1253,6 +1253,7 @@
; available extensions
+;
;extension=bcmath.so
;extension=bz2.so
;extension=calendar.so
Index: extra/devel/php/php.install
diff -u extra/devel/php/php.install:1.5 extra/devel/php/php.install:1.6
--- extra/devel/php/php.install:1.5 Fri Sep 21 15:53:29 2007
+++ extra/devel/php/php.install Sat Sep 22 08:25:41 2007
@@ -1,41 +1,62 @@
post_install() {
- /bin/cat << ENDOFMESSAGE
-==>
-==> PHP has been built with some optional modules.
-==> To enable these modules, uncomment the modules from php.ini
-==>
-==> The optional modules included in php require extra packages
-==> to be installed.
-==>
-==> - bz2 : bzip2
-==> - curl : curl
-==> - dba : gdbm
-==> - gd : libpng, libjpeg
-==> - imap : pam
-==> - ldap : libldap
-==> - mcrypt : mcrypt, libtool
-==> - mysql/mysqli : libmysqlclient
-==> - odbc/pdo_odbc : unixodbc
-==> - openssl : openssl
-==> - pgsql : postgresql-libs
-==> - pspell : aspell
-==> - snmp : net-snmp
-==> - sqlite : sqlite3
-==> - tidy : tidyhtml
-==> - xsl : libxslt
-==>
-==> FOR PHP-CGI usage:
-==> There are several cgi relevant settings in your /etc/php.ini. Make sure
-==> you understand them and adjust them according to your needs. At least you
-==> should activate the cgi.fix_pathinfo directive in php.ini by setting it
-==> to 1 and uncommenting it.
-ENDOFMESSAGE
+ echo '
+==> PHP modules
+
+ PHP has been built with optional modules. To enable these modules,
+ uncomment the modules from php.ini
+
+ Some of them require extra packages to be installed:
+
+ * bz2 : bzip2
+ * curl : curl
+ * dba : gdbm
+ * gd : libpng, libjpeg
+ * imap : pam
+ * ldap : libldap
+ * mcrypt : mcrypt, libtool
+ * mysql/mysqli : libmysqlclient
+ * odbc/pdo_odbc : unixodbc
+ * openssl : openssl
+ * pgsql/pdo_pgsql : postgresql*libs
+ * pspell : aspell
+ * snmp : net*snmp
+ * sqlite : sqlite3
+ * tidy : tidyhtml
+ * xsl : libxslt
+
+==> PHP-CGI and FCGI
+
+ There are several cgi relevant settings in your php.ini. Make sure to
+ adjust them according to your needs. At least you should activate the
+ cgi.fix_pathinfo directive in php.ini by uncommenting it.
+'
}
post_upgrade() {
post_install
+ echo '
+==> Review your php.ini
+
+ Your php installation has been updated. You should review your current
+ php.ini and check any upstream changes according to the default
+ configuration which can be found at php.ini.pacnew.
+'
+ [ -f /etc/php.ini ] && mv /etc/php.ini /etc/php/php.ini.pacsave && echo '
+==> Location of php.ini has changed
+
+ A previous configuration was found at /etc/php.ini. PHP stores its
+ configuration at /etc/php/ now. Your old php.ini was moved to
+ /etc/php/php.ini.pacsave. You should merge your old file with the
+ default one that can be found at /etc/php/.
+
+ Make sure to enable the modules you need. A lot of them are shared
+ objects now and not statically built into php.
+
+ External modules store their configuration in /etc/php/conf.d/. PHP
+ scans that directory for any ini files.
+'
}
op=$1
shift
-$op $*
+[ "$(type -t "$op")" = "function" ] && $op "$@"
\ No newline at end of file
More information about the arch-commits
mailing list