[arch-commits] CVS update of extra/devel/php (PKGBUILD php.install)

[Pierre Schmitz]

    Date: Monday, September 24, 2007 @ 16:35:20
  Author: pierre
    Path: /home/cvs-extra/extra/devel/php

Modified: PKGBUILD (1.108 -> 1.109) php.install (1.8 -> 1.9)

be nice and try to update the old php.ini to use the new extension dir


-------------+
 PKGBUILD    |    3 +--
 php.install |    4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)


Index: extra/devel/php/PKGBUILD
diff -u extra/devel/php/PKGBUILD:1.108 extra/devel/php/PKGBUILD:1.109
--- extra/devel/php/PKGBUILD:1.108	Sat Sep 22 13:06:08 2007
+++ extra/devel/php/PKGBUILD	Mon Sep 24 16:35:19 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.108 2007/09/22 17:06:08 pierre Exp $
+# $Id: PKGBUILD,v 1.109 2007/09/24 20:35:19 pierre Exp $
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 pkgname=php
 pkgver=5.2.4
@@ -35,7 +35,6 @@
 	--disable-rpath \
 	--disable-static \
 	--enable-shared \
-	--with-pic \
 	"
 
 	phpextensions="--with-openssl=shared \
Index: extra/devel/php/php.install
diff -u extra/devel/php/php.install:1.8 extra/devel/php/php.install:1.9
--- extra/devel/php/php.install:1.8	Sat Sep 22 13:22:03 2007
+++ extra/devel/php/php.install	Mon Sep 24 16:35:19 2007
@@ -36,6 +36,7 @@
   # we moved php.ini from /etc/ to /etc/php
   # lets save the old file before pacman deletes it
   if [ -f /etc/php.ini ] && [ $(vercmp '5.2.4-2' $2) -ge 0 ];then
+    echo 'Backing up old php.ini...'
     mv /etc/php.ini /etc/php.ini.pacsave.tmp
   fi
 }
@@ -52,8 +53,11 @@
   # if we upgraded from an installation with old config layout, move the old
   # php.ini to the right place and inform the user about the changes
   if [ -f /etc/php.ini.pacsave.tmp ] && [ $(vercmp '5.2.4-2' $2) -ge 0 ]; then
+    echo 'Restore old php.ini...'
     mv /etc/php/php.ini /etc/php/php.ini.pacnew
     mv /etc/php.ini.pacsave.tmp /etc/php/php.ini
+    echo 'Update extension dir...'
+    sed -i -e 's#extension_dir = "/usr/lib/php/extensions/php/"#extension_dir = "/usr/lib/php/extensions/"#g' /etc/php/php.ini
     echo '
     ==> Location of php.ini has changed