wok-next diff php-gd/receipt @ rev 15147
jed: filter wrong error trigger
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Aug 15 13:01:55 2013 +0000 (2013-08-15) |
parents | 855f42b596c0 |
children | 78cb1e930abd |
line diff
1.1 --- a/php-gd/receipt Mon Jun 18 22:11:42 2012 +0200 1.2 +++ b/php-gd/receipt Thu Aug 15 13:01:55 2013 +0000 1.3 @@ -1,11 +1,11 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="php-gd" 1.7 -VERSION="5.4.4" 1.8 +VERSION="5.4.13" 1.9 CATEGORY="development" 1.10 SHORT_DESC="gd module for PHP web programming language." 1.11 MAINTAINER="pascal.bellard@slitaz.org" 1.12 -DEPENDS="libpng php jpeg freetype" 1.13 +DEPENDS="libpng php jpeg libvpx" 1.14 WEB_SITE="http://www.php.net/" 1.15 WANTED="php" 1.16 1.17 @@ -13,7 +13,7 @@ 1.18 genpkg_rules() 1.19 { 1.20 mkdir -p $fs/usr/share/php 1.21 - cp $(find $_pkg | grep gd.so) $fs/usr/share/php/ 1.22 + cp $(find $install | grep gd.so) $fs/usr/share/php/ 1.23 } 1.24 1.25 # Post and pre install commans to stop 1.26 @@ -53,14 +53,19 @@ 1.27 # Pre and post remove commands for Tazpkg. 1.28 pre_remove() 1.29 { 1.30 - sed -i '/.*=gd.so.*/d' /etc/php.ini 1.31 + sed -i '/.*=gd.so.*/d' $1/etc/php.ini 1.32 1.33 # Start Web server. 1.34 while read daemon file; do 1.35 if [ -f /etc/init.d/$daemon -a -f "/var/run/$file" ]; then 1.36 - /etc/init.d/$daemon stop 1.37 - sleep 2 1.38 - /etc/init.d/$daemon start 1.39 + [ -z "$1" ] || continue 1.40 + if [ -z "$1" -a -f "/var/run/$file" ]; then 1.41 + /etc/init.d/$daemon stop 1.42 + sleep 2 1.43 + fi 1.44 + if [ -z "$1" -a -f /etc/init.d/$daemon ]; then 1.45 + /etc/init.d/$daemon start 1.46 + fi 1.47 fi 1.48 done <<EOT 1.49 apache apache/httpd.pid