# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1556887195 -3600
# Node ID 4e6f31d3d2047b74e54457d4822b87f6e2713f9d
# Parent  bc37a1a08055e6644fe85e04ff9860dbddf8f4da
updated nagvis and nagvis-doc (1.5.7 -> 1.9.11)

diff -r bc37a1a08055 -r 4e6f31d3d204 nagvis-doc/receipt
--- a/nagvis-doc/receipt	Fri May 03 13:11:28 2019 +0100
+++ b/nagvis-doc/receipt	Fri May 03 13:39:55 2019 +0100
@@ -1,27 +1,26 @@
 # SliTaz package receipt.
 
 PACKAGE="nagvis-doc"
-VERSION="1.5.7"
+VERSION="1.9.11"
 CATEGORY="network"
-SHORT_DESC="Nagvis documentation and licence"
+SHORT_DESC="Nagvis documentation and licence."
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
 WEB_SITE="http://www.nagvis.org/"
-WANTED="nagvis"
 
 DEPENDS="nagvis"
+WANTED="nagvis"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/share/doc/nagvis \
-		$fs/usr/share/nagvis
-	
-	# Copy doc and licence
-	cp -a  $src/INSTALL $fs/usr/share/doc/nagvis
-	cp -a $src/LICENCE $fs/usr/share/doc/nagvis
-	cp -a $src/README $fs/usr/share/doc/nagvis
-	cp -a $src/ChangeLog $fs/usr/share/doc/nagvis
-	cp -pa $src/docs $fs/usr/share/nagvis
+	mkdir -p $fs/usr/share/doc/nagvis
+	mkdir -p $fs/usr/share/nagvis
+
+	# Copy documentation and licence
+#	cp -a  $src/INSTALL	$fs/usr/share/doc/nagvis
+	cp -a $src/COPYING	$fs/usr/share/doc/nagvis
+	cp -a $src/README	$fs/usr/share/doc/nagvis
+	cp -a $src/ChangeLog	$fs/usr/share/doc/nagvis
+	cp -pa $src/docs	$fs/usr/share/nagvis
 }
-
diff -r bc37a1a08055 -r 4e6f31d3d204 nagvis/receipt
--- a/nagvis/receipt	Fri May 03 13:11:28 2019 +0100
+++ b/nagvis/receipt	Fri May 03 13:39:55 2019 +0100
@@ -1,23 +1,18 @@
 # SliTaz package receipt.
 
 PACKAGE="nagvis"
-VERSION="1.5.7"
+VERSION="1.9.11"
 CATEGORY="network"
 SHORT_DESC="Visualization addon for nagios."
 MAINTAINER="erjo@slitaz.org"
 LICENSE="GPL2"
+WEB_SITE="http://www.nagvis.org/"
+
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.nagvis.org/"
-WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+WGET_URL="${WEB_SITE}share/$TARBALL"
+
 SUGGESTED="graphviz"
-
-DEPENDS="nagios php-mysql php-gd ndoutils mk-livestatus"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $src
-}
+DEPENDS="mk-livestatus nagios ndoutils php-gd php-mysql"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -28,20 +23,20 @@
 		$fs/var/lib/nagvis/var/tmpl/compile \
 		$fs/usr/share/doc/nagvis
 	
-	cp -a $src/share $fs/usr/share/nagvis
-	cp -a $src/etc $fs/etc/nagvis
+	cp -a $src/share	$fs/usr/share/nagvis
+	cp -a $src/etc		$fs/etc/nagvis
 	
 	# copy demo maps.
 	#~ cp $fs/usr/share/nagios/nagvis/nagvis/images/maps/nagvis-demo.png \
 		#~ $fs/var/lib/nagvis/automap.png
-	
-	# link  var direcxtory (FHS)	
+
+	# link  var directory (FHS)	
 	ln -s /var/lib/nagvis/var  $fs/usr/share/nagvis/var
-	
-	# move config files
+
+	# move configuration files
 	ln -s /etc/nagvis $fs/usr/share/nagvis/etc
-	
-	# nagvis config
+
+	# nagvis configuration
 	mv $fs/etc/nagvis/nagvis.ini.php-sample $fs/etc/nagvis/nagvis.ini.php
 	sed -i  -e 's|;language=|language=|' \
 		-e 's|;dateformat="Y-m-d H:i:s"|dateformat="d-m-Y H:i:s"|' \
@@ -67,9 +62,9 @@
 	sed -i -e '/;socket/ a\socket="unix:/var/lib/nagios/rw/live"' $fs/etc/nagvis/nagvis.ini.php
 	sed -i -e 's/;showautomaps=1/showautomaps=0/' $fs/etc/nagvis/nagvis.ini.php
 	
-	# Apache config
-	mv $fs/etc/nagvis/apache2-nagvis.conf-sample $fs/etc/nagvis/apache2-nagvis.conf
-	ln -s /etc/nagvis/apache2-nagvis.conf $fs/etc/apache/conf.d/nagvis.conf
+	# Apache configuration
+	mv $fs/etc/nagvis/apache2-nagvis.conf-sample	$fs/etc/nagvis/apache2-nagvis.conf
+	ln -s /etc/nagvis/apache2-nagvis.conf		$fs/etc/apache/conf.d/nagvis.conf
 	sed -i -e 's|@NAGVIS_WEB@|/nagvis|' \
 		-e 's|@NAGVIS_PATH@|/usr/share/nagvis|' \
 		-e 's|#AuthName|AuthName|' \
@@ -78,7 +73,7 @@
 		-e 's|@NAGIOS_PATH@.*|/etc/nagios/htpasswd.users|' \
 		-e 's| #Require|Require|' $fs/etc/nagvis/apache2-nagvis.conf
 	
-	# Fix perms
+	# Fix permissions
 	chown -R www.www $fs/usr/share/nagvis $fs/var/lib/nagvis
 	chown -R root.www $fs/etc/nagvis
 	
@@ -86,7 +81,7 @@
 	chmod 775 $fs/etc/nagvis/maps
 	chmod 664 $fs/etc/nagvis/maps/*
 	chmod 664 $fs/etc/nagvis/geomap/*
-	chmod 664 $fs/etc/nagvis/automaps/*
+#	chmod 664 $fs/etc/nagvis/automaps/*
 	chmod 775 $fs/var/lib/nagvis
 
 	# Cleanup
@@ -97,7 +92,6 @@
 	chmod 775 $fs/var/lib/nagvis/maps
 	chmod 664 $fs/var/lib/nagvis/maps/*
 	ln -s /var/lib/nagvis/maps $fs/usr/share/nagvis/share/userfiles/images/
-
 }
 
 post_install()