[arch-commits] CVS update of arch/build/devel/php (PKGBUILD)

[Pierre Schmitz]

    Date: Sunday, June 17, 2007 @ 12:10:07
  Author: pierre
    Path: /home/cvs-arch/arch/build/devel/php

Modified: PKGBUILD (1.102 -> 1.103)

upgpkg: php 5.2.3-4


----------+
 PKGBUILD |   27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)


Index: arch/build/devel/php/PKGBUILD
diff -u arch/build/devel/php/PKGBUILD:1.102 arch/build/devel/php/PKGBUILD:1.103
--- arch/build/devel/php/PKGBUILD:1.102	Thu Jun  7 09:55:38 2007
+++ arch/build/devel/php/PKGBUILD	Sun Jun 17 12:10:07 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.102 2007/06/07 13:55:38 pierre Exp $
+# $Id: PKGBUILD,v 1.103 2007/06/17 16:10:07 pierre Exp $
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 pkgname=php
 pkgver=5.2.3
-pkgrel=3
+pkgrel=4
 _suhosinver=0.9.6.2
 pkgdesc='A high-level scripting language'
 arch=('i686' 'x86_64')
@@ -141,23 +141,6 @@
 	# FS #3395
 	cd ${startdir}/pkg/usr/lib/php/extensions && ln -s * php
 
-	# Ugly fix for FS #3563 and #3577
-	cd ${startdir}/pkg
-	sed "s|$PWD||g" -i usr/share/pear/{peclcmd.php,pearcmd.php,PEAR/Command/Package.php} usr/bin/{pear,peardev,pecl}
-
-	sed 's#:\([0-9]*\):\"'$PWD'#:$((\1-'`echo -n $PWD|wc -c`')):\"#g;  s#\"#\\"#g;  s#.*#echo "&"#g' \
-	etc/pear.conf |sh > etc/pear.conf.tmp
-	mv etc/pear.conf.tmp etc/pear.conf
-
-	sed 's#:\([0-9]*\):\"'$PWD'#:$((\1-'`echo -n $PWD|wc -c`')):\"#g;  s#\"#\\"#g;  s#.*#echo "&"#g' \
-	usr/share/pear/.registry/console_getopt.reg |sh > usr/share/pear/.registry/console_getopt.reg.tmp
-	mv usr/share/pear/.registry/console_getopt.reg.tmp usr/share/pear/.registry/console_getopt.reg
-
-	sed 's#:\([0-9]*\):\"'$PWD'#:$((\1-'`echo -n $PWD|wc -c`')):\"#g;  s#\"#\\"#g;  s#.*#echo "&"#g' \
-	usr/share/pear/.registry/archive_tar.reg |sh > usr/share/pear/.registry/archive_tar.reg.tmp
-	mv usr/share/pear/.registry/archive_tar.reg.tmp usr/share/pear/.registry/archive_tar.reg
-
-	sed 's#:\([0-9]*\):\"'$PWD'#:$((\1-'`echo -n $PWD|wc -c`')):\"#g;  s#\"#\\"#g;  s#.*#echo "&"#g' \
-	usr/share/pear/.registry/pear.reg |sh > usr/share/pear/.registry/pear.reg.tmp
-	mv usr/share/pear/.registry/pear.reg.tmp usr/share/pear/.registry/pear.reg
-}
+	# fix pear path
+	sed "s|$PWD||g" -i ${startdir}/pkg/usr/{bin/pear,share/pear/pearcmd.php}
+}
\ No newline at end of file