wok rev 21859

updated sarg and sarg-php (2.3.1 -> 2.3.11)
author Hans-G?nter Theisgen
date Thu Sep 19 16:26:43 2019 +0100 (10 months ago)
parents acc0cf34b379
children c1eb003410dc 223f49cc173b
files sarg-php/receipt sarg/receipt
line diff
     1.1 --- a/sarg-php/receipt	Wed Sep 18 19:26:59 2019 +0200
     1.2 +++ b/sarg-php/receipt	Thu Sep 19 16:26:43 2019 +0100
     1.3 @@ -1,14 +1,14 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="sarg-php"
     1.7 -VERSION="2.3.1"
     1.8 +VERSION="2.3.11"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Squid Analysis Report Generator."
    1.11  MAINTAINER="erjo@slitaz.org"
    1.12  LICENSE="GPL2"
    1.13 -WEB_SITE="http://$PACKAGE.sourceforge.net/"
    1.14 +WEB_SITE="https://sourceforge.net/projects/sarg/"
    1.15 +
    1.16  WANTED="sarg"
    1.17 -
    1.18  DEPENDS="lighttpd php"
    1.19  
    1.20  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.21 @@ -17,10 +17,10 @@
    1.22  	mkdir -p $fs/var/www
    1.23  	
    1.24  	cp -pa $src/sarg-php $fs/var/www	
    1.25 -	# Fix perms
    1.26 -	chmod 755 $fs/var/www/sarg-php
    1.27 -	chmod 644 -R $fs/var/www/sarg-php/*
    1.28 -	chmod 755  $fs/var/www/sarg-php/locale
    1.29 +
    1.30 +	# Fix permissions
    1.31 +	chmod 755	$fs/var/www/sarg-php
    1.32 +	chmod 644 -R	$fs/var/www/sarg-php/*
    1.33 +	chmod 755	$fs/var/www/sarg-php/locale
    1.34  	
    1.35  }
    1.36 -
     2.1 --- a/sarg/receipt	Wed Sep 18 19:26:59 2019 +0200
     2.2 +++ b/sarg/receipt	Thu Sep 19 16:26:43 2019 +0100
     2.3 @@ -1,38 +1,41 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="sarg"
     2.7 -VERSION="2.3.1"
     2.8 +VERSION="2.3.11"
     2.9  CATEGORY="network"
    2.10  SHORT_DESC="Squid Analysis Report Generator."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12  LICENSE="GPL2"
    2.13 +WEB_SITE="https://sourceforge.net/projects/sarg/"
    2.14 +
    2.15  TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.16 -WEB_SITE="http://$PACKAGE.sourceforge.net/"
    2.17  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    2.18  
    2.19  # Rules to configure and make the package.
    2.20  compile_rules()
    2.21  {
    2.22 -	./configure --sysconfdir=/etc/sarg \
    2.23 -		--bindir=/usr/bin \
    2.24 -		--enable-htmldir=/var/www \
    2.25 -		--enable-fontdir=/usr/share/sarg/fonts \
    2.26 -		--enable-imagedir=/usr/share/sarg/images \
    2.27 -		--enable-sargphp=/var/www/sarg-php \
    2.28 -		&&	make && make install
    2.29 +	./configure						\
    2.30 +		--sysconfdir=/etc/sarg				\
    2.31 +		--bindir=/usr/bin				\
    2.32 +		--htmldir=/var/www				\
    2.33 +		--enable-fontdir=/usr/share/sarg/fonts		\
    2.34 +		--enable-imagedir=/usr/share/sarg/images	\
    2.35 +		--enable-sargphp=/var/www/sarg-php &&
    2.36 +	make &&
    2.37 +	make install
    2.38  }
    2.39  
    2.40  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.41  genpkg_rules()
    2.42  {
    2.43 -	mkdir -p $fs/usr $fs/usr/share
    2.44 -	#cp -a $install/var $fs
    2.45 -	cp -a $install/etc $fs
    2.46 -	cp -a $install/usr/bin $fs/usr
    2.47 -	cp -a $install/usr/share/sarg $fs/usr/share
    2.48 -	
    2.49 +	mkdir -p $fs/usr/share
    2.50 +
    2.51 +	#cp -a $install/var		$fs
    2.52 +	cp -a $install/etc		$fs
    2.53 +	cp -a $install/usr/bin		$fs/usr
    2.54 +	cp -a $install/usr/share/sarg	$fs/usr/share
    2.55 +
    2.56  	sed -i -e "s!^#access_log.*!access_log /var/log/squid/access_log!" \
    2.57  		-e "s!^#output_dir.*!output_dir /var/www/squid-reports!" \
    2.58  		$fs/etc/sarg/sarg.conf
    2.59  }
    2.60 -