wok-next rev 21443

updated sarg (2.3.1 -> 2.4.0)
author Hans-G?nter Theisgen
date Tue May 05 16:34:52 2020 +0100 (2020-05-05)
parents 52c5f96f559c
children 3bb087236cc4
files sarg/receipt
line diff
     1.1 --- a/sarg/receipt	Tue May 05 16:27:22 2020 +0100
     1.2 +++ b/sarg/receipt	Tue May 05 16:34:52 2020 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="sarg"
     1.7 -VERSION="2.3.1"
     1.8 +VERSION="2.4.0"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Squid Analysis Report Generator"
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -13,40 +13,41 @@
    1.13  
    1.14  SPLIT="$PACKAGE-php"
    1.15  
    1.16 -compile_rules() {
    1.17 -	./configure \
    1.18 -		--sysconfdir=/etc/sarg \
    1.19 -		--bindir=/usr/bin \
    1.20 -		--enable-htmldir=/var/www \
    1.21 -		--enable-fontdir=/usr/share/sarg/fonts \
    1.22 -		--enable-imagedir=/usr/share/sarg/images \
    1.23 -		--enable-sargphp=/var/www/sarg-php \
    1.24 -		&&
    1.25 +compile_rules()
    1.26 +{
    1.27 +	./configure						\
    1.28 +		--sysconfdir=/etc/sarg				\
    1.29 +		--bindir=/usr/bin				\
    1.30 +		--enable-htmldir=/var/www			\
    1.31 +		--enable-fontdir=/usr/share/sarg/fonts		\
    1.32 +		--enable-imagedir=/usr/share/sarg/images	\
    1.33 +		--enable-sargphp=/var/www/sarg-php &&
    1.34  	make &&
    1.35  	make install
    1.36  }
    1.37  
    1.38 -genpkg_rules() {
    1.39 +genpkg_rules()
    1.40 +{
    1.41  	case $PACKAGE in
    1.42  		sarg)
    1.43  			mkdir -p $fs/usr $fs/usr/share
    1.44  			#cp -a $install/var $fs
    1.45 -			cp -a $install/etc $fs
    1.46 -			cp -a $install/usr/bin $fs/usr
    1.47 -			cp -a $install/usr/share/sarg $fs/usr/share
    1.48 +			cp -a $install/etc		$fs
    1.49 +			cp -a $install/usr/bin		$fs/usr
    1.50 +			cp -a $install/usr/share/sarg	$fs/usr/share
    1.51  
    1.52 -			sed -i -e "s!^#access_log.*!access_log /var/log/squid/access_log!" \
    1.53 +			sed -i	-e "s!^#access_log.*!access_log /var/log/squid/access_log!" \
    1.54  				-e "s!^#output_dir.*!output_dir /var/www/squid-reports!" \
    1.55  				$fs/etc/sarg/sarg.conf
    1.56  			;;
    1.57  		sarg-php)
    1.58  			mkdir -p $fs/var/www
    1.59  
    1.60 -			cp -pa $src/sarg-php $fs/var/www
    1.61 -			# Fix perms
    1.62 -			chmod 755 $fs/var/www/sarg-php
    1.63 -			chmod 644 -R $fs/var/www/sarg-php/*
    1.64 -			chmod 755  $fs/var/www/sarg-php/locale
    1.65 +			cp -pa $src/sarg-php		$fs/var/www
    1.66 +			# Fix permissions
    1.67 +			chmod 755			$fs/var/www/sarg-php
    1.68 +			chmod 644 -R			$fs/var/www/sarg-php/*
    1.69 +			chmod 755			$fs/var/www/sarg-php/locale
    1.70  			CAT="network|?"
    1.71  			DEPENDS="lighttpd php"
    1.72  			;;