# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1568906803 -3600
# Node ID d310b6c488c09baedd20715176d0e923445d9672
# Parent  acc0cf34b379348a67a63728e63f078a2897d791
updated sarg and sarg-php (2.3.1 -> 2.3.11)

diff -r acc0cf34b379 -r d310b6c488c0 sarg-php/receipt
--- a/sarg-php/receipt	Wed Sep 18 19:26:59 2019 +0200
+++ b/sarg-php/receipt	Thu Sep 19 16:26:43 2019 +0100
@@ -1,14 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="sarg-php"
-VERSION="2.3.1"
+VERSION="2.3.11"
 CATEGORY="network"
 SHORT_DESC="Squid Analysis Report Generator."
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
-WEB_SITE="http://$PACKAGE.sourceforge.net/"
+WEB_SITE="https://sourceforge.net/projects/sarg/"
+
 WANTED="sarg"
-
 DEPENDS="lighttpd php"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -17,10 +17,10 @@
 	mkdir -p $fs/var/www
 	
 	cp -pa $src/sarg-php $fs/var/www	
-	# Fix perms
-	chmod 755 $fs/var/www/sarg-php
-	chmod 644 -R $fs/var/www/sarg-php/*
-	chmod 755  $fs/var/www/sarg-php/locale
+
+	# Fix permissions
+	chmod 755	$fs/var/www/sarg-php
+	chmod 644 -R	$fs/var/www/sarg-php/*
+	chmod 755	$fs/var/www/sarg-php/locale
 	
 }
-
diff -r acc0cf34b379 -r d310b6c488c0 sarg/receipt
--- a/sarg/receipt	Wed Sep 18 19:26:59 2019 +0200
+++ b/sarg/receipt	Thu Sep 19 16:26:43 2019 +0100
@@ -1,38 +1,41 @@
 # SliTaz package receipt.
 
 PACKAGE="sarg"
-VERSION="2.3.1"
+VERSION="2.3.11"
 CATEGORY="network"
 SHORT_DESC="Squid Analysis Report Generator."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="https://sourceforge.net/projects/sarg/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://$PACKAGE.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	./configure --sysconfdir=/etc/sarg \
-		--bindir=/usr/bin \
-		--enable-htmldir=/var/www \
-		--enable-fontdir=/usr/share/sarg/fonts \
-		--enable-imagedir=/usr/share/sarg/images \
-		--enable-sargphp=/var/www/sarg-php \
-		&&	make && make install
+	./configure						\
+		--sysconfdir=/etc/sarg				\
+		--bindir=/usr/bin				\
+		--htmldir=/var/www				\
+		--enable-fontdir=/usr/share/sarg/fonts		\
+		--enable-imagedir=/usr/share/sarg/images	\
+		--enable-sargphp=/var/www/sarg-php &&
+	make &&
+	make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr $fs/usr/share
-	#cp -a $install/var $fs
-	cp -a $install/etc $fs
-	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/sarg $fs/usr/share
-	
+	mkdir -p $fs/usr/share
+
+	#cp -a $install/var		$fs
+	cp -a $install/etc		$fs
+	cp -a $install/usr/bin		$fs/usr
+	cp -a $install/usr/share/sarg	$fs/usr/share
+
 	sed -i -e "s!^#access_log.*!access_log /var/log/squid/access_log!" \
 		-e "s!^#output_dir.*!output_dir /var/www/squid-reports!" \
 		$fs/etc/sarg/sarg.conf
 }
-