# HG changeset patch
# User Eric Joseph-Alexandre <erjo@slitaz.org>
# Date 1367023728 -7200
# Node ID bec5edcc9ad1d5180a966b4001344f008d507522
# Parent  066baa4a3634c44b701f9a7cb9fcc2a4f2d4974c
Up: nagios (3.5.0)

diff -r 066baa4a3634 -r bec5edcc9ad1 nagios/receipt
--- a/nagios/receipt	Sat Apr 27 02:48:04 2013 +0200
+++ b/nagios/receipt	Sat Apr 27 02:48:48 2013 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="nagios"
-VERSION="3.2.3"
+VERSION="3.5.0"
 CATEGORY="network"
 SHORT_DESC="Host and network monitoring"
 MAINTAINER="erjo@slitaz.org"
@@ -24,7 +24,6 @@
 	done <<EOT
 $PACKAGE-$VERSION-Makefiles.u
 EOT
-	#patch -p1 < $stuff/nagios-3.2.1-Makefiles.u || return 1
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
@@ -38,14 +37,19 @@
 		--libexecdir=/usr/lib/nagios/plugins \
 		--sbindir=/usr/lib/nagios/cgi \
 		--datadir=/usr/share/nagios \
-		--htmldir=/usr/share/nagios \
 		--localstatedir=/var/lib/nagios \
 		$CONFIGURE_ARGS 
 		
 	sed -i s!HTMLDIR=.*!HTMLDIR=/usr/share/nagios! html/Makefile
 	
-	make all && make DESTDIR=$PWD/_pkg fullinstall \
-	&& make DESTDIR=$PWD/_pkg install-config
+	#~ make all && make DESTDIR=$PWD/_pkg fullinstall \
+	#~ && make DESTDIR=$PWD/_pkg install-config
+	make all && make install \
+	&& make install-config \
+	&& make install-commandmode \
+	&& make install-webconf \
+	&& make install-classicui 
+	
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -57,14 +61,14 @@
 	  $fs/var/spool/nagios/checkresults \
 	  $fs/etc/apache
 		
-	cp -a $_pkg/etc/apache $fs/etc
-	cp -a $_pkg/etc/nagios $fs/etc
-	cp -a stuff/nagios  $fs/etc/init.d
-	install -o root -g root -m 644 stuff/htpasswd.users  $fs/etc/nagios/
+	cp -a $install/etc/apache $fs/etc
+	cp -a $install/etc/nagios $fs/etc
+	cp -a $stuff/nagios  $fs/etc/init.d
+	install -o root -g root -m 644 $stuff/htpasswd.users  $fs/etc/nagios/
 	
-	cp -a $_pkg/usr/bin $fs/usr
-	cp -a $_pkg/usr/lib $fs/usr
-	cp -a $_pkg/usr/share $fs/usr
+	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/lib $fs/usr
+	cp -a $install/usr/share $fs/usr
 	
 	# Put doc in separate package
 	rm -rf $fs/usr/share/nagios/docs
diff -r 066baa4a3634 -r bec5edcc9ad1 nagios/stuff/nagios-3.5.0-Makefiles.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/stuff/nagios-3.5.0-Makefiles.u	Sat Apr 27 02:48:48 2013 +0200
@@ -0,0 +1,98 @@
+--- nagios-3.2.1-ori/Makefile.in	Thu Dec 31 11:12:08 2009
++++ nagios-3.2.1/Makefile.in	Sun Jun  6 11:03:32 2010
+@@ -30,8 +30,8 @@
+ LIBEXECDIR=@libexecdir@
+ HTMLDIR=@datarootdir@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
+-COMMAND_OPTS=@COMMAND_OPTS@
++INSTALL_OPTS=
++COMMAND_OPTS=
+ HTTPD_CONF=@HTTPD_CONF@
+ INIT_DIR=@init_dir@
+ INIT_OPTS=-o root -g root
+@@ -264,6 +264,7 @@
+ 	@echo ""
+ 
+ install-webconf:
++	$(INSTALL) -m 755 -d $(DESTDIR)$(HTTPD_CONF)
+ 	$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/nagios.conf
+ 
+ 	@echo ""
+--- nagios-3.2.1-ori/base/Makefile.in	Wed Jun 17 05:57:21 2009
++++ nagios-3.2.1/base/Makefile.in	Sun Jun  6 11:03:32 2010
+@@ -39,8 +39,8 @@
+ CGIDIR=@sbindir@
+ HTMLDIR=@datarootdir@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
+-COMMAND_OPTS=@COMMAND_OPTS@
++INSTALL_OPTS=
++COMMAND_OPTS=
+ STRIP=@STRIP@
+ 
+ CGIURL=@cgiurl@
+--- nagios-3.2.1-ori/cgi/Makefile.in	Wed Jun 17 05:57:21 2009
++++ nagios-3.2.1/cgi/Makefile.in	Sun Jun  6 11:03:32 2010
+@@ -18,8 +18,8 @@
+ CGIDIR=@sbindir@
+ HTMLDIR=@datarootdir@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
+-COMMAND_OPTS=@COMMAND_OPTS@
++INSTALL_OPTS=
++COMMAND_OPTS=
+ STRIP=@STRIP@
+ 
+ CGIEXTRAS=@CGIEXTRAS@
+--- nagios-3.2.1-ori/common/Makefile.in	Wed Jun 17 05:57:21 2009
++++ nagios-3.2.1/common/Makefile.in	Sun Jun  6 11:03:32 2010
+@@ -20,8 +20,8 @@
+ CGIDIR=@sbindir@
+ HTMLDIR=@datarootdir@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
+-COMMAND_OPTS=@COMMAND_OPTS@
++INSTALL_OPTS=
++COMMAND_OPTS=
+ 
+ CP=@CP@
+ 
+--- nagios-3.2.1-ori/contrib/Makefile.in	Mon May 19 20:01:58 2008
++++ nagios-3.2.1/contrib/Makefile.in	Sun Jun  6 10:43:34 2010
+@@ -15,7 +15,7 @@
+ # Generated automatically from configure script
+ SNPRINTF_O=@SNPRINTF_O@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
++INSTALL_OPTS=
+ 
+ 
+ prefix=@prefix@
+--- nagios-3.2.1-ori/html/Makefile.in	Wed Jul  8 00:34:51 2009
++++ nagios-3.2.1/html/Makefile.in	Sun Jun  6 10:59:50 2010
+@@ -10,8 +10,8 @@
+ CGIDIR=@sbindir@
+ HTMLDIR=@datadir@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
+-COMMAND_OPTS=@COMMAND_OPTS@
++INSTALL_OPTS=
++COMMAND_OPTS=
+ 
+ CP=@CP@
+ 
+--- nagios-3.2.1-ori/module/Makefile.in	Sat Dec 15 00:02:24 2007
++++ nagios-3.2.1/module/Makefile.in	Sun Jun  6 11:03:32 2010
+@@ -19,9 +19,8 @@
+ exec_prefix=@exec_prefix@
+ BINDIR=@bindir@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
+-COMMAND_OPTS=@COMMAND_OPTS@
+-STRIP=@STRIP@
++INSTALL_OPTS=
++COMMAND_OPTS=
+ 
+ CP=@CP@
+