wok diff php/receipt @ rev 14626

Up: cups to 1.6.2.
author Christopher Rogers <slaxemulator@gmail.com>
date Sat Jun 01 12:06:52 2013 +0000 (2013-06-01)
parents f9732678756f
children 7f6b04cd013a
line diff
     1.1 --- a/php/receipt	Sun Oct 07 23:54:36 2012 +0200
     1.2 +++ b/php/receipt	Sat Jun 01 12:06:52 2013 +0000
     1.3 @@ -1,13 +1,13 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="php"
     1.7 -VERSION="5.4.4"
     1.8 +VERSION="5.4.13"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="PHP web programming language."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.13  WEB_SITE="http://www.php.net/"
    1.14 -WGET_URL="http://us2.php.net/distributions/$TARBALL"
    1.15 +WGET_URL="http://www.php.net/distributions/$TARBALL"
    1.16  PROVIDE="php:lighttpd"
    1.17  
    1.18  DEPENDS="php-common lighttpd zlib libxml2 sqlite libssl"
    1.19 @@ -15,8 +15,7 @@
    1.20  net-snmp-dev postgresql-dev gettext openssl-dev apache-dev apr-util-dev \
    1.21  c-client mhash-dev libpng-dev libunixODBC unixODBC-dev openldap-dev \
    1.22  libldap apr-dev libmcrypt-dev curl-dev cyrus-sasl-dev perl pkg-config \
    1.23 -jpeg-dev net-snmp-dev apache freetype-dev libtool bison \
    1.24 -re2c coreutils-conditions"
    1.25 +jpeg-dev net-snmp-dev libvpx-dev apache"
    1.26  
    1.27  # Rules to configure and make the package.
    1.28  compile_rules()
    1.29 @@ -27,17 +26,14 @@
    1.30  --sysconfdir=/etc \
    1.31  --infodir=/usr/share/info \
    1.32  --mandir=/usr/share/man \
    1.33 ---enable-fastcgi \
    1.34 ---enable-discard-path \
    1.35 ---enable-force-cgi-redirect \
    1.36  --enable-mbstring \
    1.37  --enable-sockets \
    1.38  --enable-ftp \
    1.39  --enable-zip \
    1.40  --enable-calendar \
    1.41  --enable-exif \
    1.42 +--config-cache \
    1.43  --enable-dba=shared \
    1.44 ---enable-dbase=shared \
    1.45  --with-config-file-path=/etc \
    1.46  --with-zlib \
    1.47  --with-gettext \
    1.48 @@ -45,31 +41,35 @@
    1.49  --with-mysql=shared,/usr \
    1.50  --with-mysqli=shared \
    1.51  --with-mysql-sock=/var/mysql/mysql.sock \
    1.52 +--with-pdo-sqlite=shared,/usr \
    1.53  --with-pgsql=shared,/usr \
    1.54  --with-snmp=shared,/usr \
    1.55  --enable-soap=shared,/usr \
    1.56  --with-ldap=shared \
    1.57  --with-imap=shared --with-imap-ssl \
    1.58 ---with-freetype-dir=/usr/include/freetype2 \
    1.59 ---with-mhash=shared \
    1.60 +--with-mhash \
    1.61  --with-gd=shared \
    1.62  --with-jpeg-dir=/usr \
    1.63  --with-png-dir=/usr \
    1.64 +--with-vpx-dir=/usr \
    1.65  --with-openssl=shared \
    1.66  --with-unixODBC=shared,/usr \
    1.67  --with-pear=/usr/share/php \
    1.68  --with-pdo-mysql=shared \
    1.69  --with-pdo-pgsql=shared \
    1.70  --with-curl=shared \
    1.71 +--enable-sqlite-utf8 \
    1.72 +--with-sqlite3=shared,/usr \
    1.73 +--with-sqlite=shared \
    1.74  "
    1.75  	sed -i 's/pam_start/pam_nostart/' configure
    1.76 -	./configure $COMMON_ARGS && \
    1.77 -	make $MAKEFLAGS && make INSTALL_ROOT=$DESTDIR install
    1.78 -	./configure $COMMON_ARGS --with-apxs2=/usr/bin/apxs && \
    1.79 +	./configure $COMMON_ARGS $CONFIGURE_ARGS && \
    1.80 +	make $MAKEFLAGS && make -j1 INSTALL_ROOT=$DESTDIR install
    1.81 +	./configure $COMMON_ARGS $CONFIGURE_ARGS --with-apxs2=/usr/bin/apxs && \
    1.82  	make $MAKEFLAGS && {
    1.83  		mkdir -p $DESTDIR/etc/apache
    1.84  		cp /etc/apache/httpd.conf $DESTDIR/etc/apache/httpd.conf
    1.85 -		make INSTALL_ROOT=$DESTDIR install
    1.86 +		make -j1 INSTALL_ROOT=$DESTDIR install
    1.87  	}
    1.88  	# Production config file.
    1.89  	mkdir -p $DESTDIR/etc
    1.90 @@ -85,10 +85,11 @@
    1.91  	cp -a $src/sapi/cgi/php-cgi $fs/usr/bin
    1.92  }
    1.93  
    1.94 -# Post and pre install commands to stop and restart Web server if needed.
    1.95 +# Post and pre install commands to stop
    1.96 +# and restart Web server if needed.
    1.97  pre_install()
    1.98  {
    1.99 -	if [ -f "$1/var/run/lighttpd.pid" ]; then
   1.100 +	if [ -z "$1" -a ! -f "/var/run/lighttpd.pid" ]; then
   1.101  		/etc/init.d/lighttpd stop
   1.102  	fi
   1.103  }