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

[Pierre Schmitz]

    Date: Thursday, September 27, 2007 @ 05:02:09
  Author: pierre
    Path: /home/cvs-extra/extra/devel/php

Modified: PKGBUILD (1.109 -> 1.110) php.ini (1.20 -> 1.21)
          php.install (1.9 -> 1.10)

remove symlink to avoid any problems with pacman not detecting a file conflict


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


Index: extra/devel/php/PKGBUILD
diff -u extra/devel/php/PKGBUILD:1.109 extra/devel/php/PKGBUILD:1.110
--- extra/devel/php/PKGBUILD:1.109	Mon Sep 24 16:35:19 2007
+++ extra/devel/php/PKGBUILD	Thu Sep 27 05:02:09 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.109 2007/09/24 20:35:19 pierre Exp $
+# $Id: PKGBUILD,v 1.110 2007/09/27 09:02:09 pierre Exp $
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 pkgname=php
 pkgver=5.2.4
@@ -21,7 +21,7 @@
         'php.ini')
 md5sums=('55c97a671fdabf462cc7a82971a656d2' \
          '58b18d0db00bc52b004fc749190a958f' \
-         '48fad1a63c557cfe216419e87fdf65a2')
+         '3a6a6001e8d1cc9bf942574327832795')
 
 build() {
 	phpconfig="--prefix=/usr \
@@ -135,9 +135,6 @@
 	install -D -m644 ${startdir}/src/php.ini ${startdir}/pkg/etc/php/php.ini
 	install -d -m755 ${startdir}/pkg/etc/php/conf.d/
 
-	# FS #3395
-	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}
 }
\ No newline at end of file
Index: extra/devel/php/php.ini
diff -u extra/devel/php/php.ini:1.20 extra/devel/php/php.ini:1.21
--- extra/devel/php/php.ini:1.20	Sat Sep 22 08:25:41 2007
+++ extra/devel/php/php.ini	Thu Sep 27 05:02:09 2007
@@ -529,7 +529,7 @@
 user_dir =
 
 ; Directory in which the loadable extensions (modules) reside.
-extension_dir = "/usr/lib/php/extensions/"
+extension_dir = "/usr/lib/php/20060613/"
 
 ; 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
Index: extra/devel/php/php.install
diff -u extra/devel/php/php.install:1.9 extra/devel/php/php.install:1.10
--- extra/devel/php/php.install:1.9	Mon Sep 24 16:35:19 2007
+++ extra/devel/php/php.install	Thu Sep 27 05:02:09 2007
@@ -57,7 +57,7 @@
     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
+    sed -i -e 's#extension_dir = "/usr/lib/php/extensions/php/"#extension_dir = "/usr/lib/php/20060613/"#g' /etc/php/php.ini
     echo '
     ==> Location of php.ini has changed