SliTaz Repositories

     1.1 --- a/nagios/receipt	Sat Apr 27 02:48:04 2013 +0200
     1.2 +++ b/nagios/receipt	Sat Apr 27 02:48:48 2013 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="nagios"
     1.7 -VERSION="3.2.3"
     1.8 +VERSION="3.5.0"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Host and network monitoring"
    1.11  MAINTAINER="erjo@slitaz.org"
    1.12 @@ -24,7 +24,6 @@
    1.13  	done <<EOT
    1.14  $PACKAGE-$VERSION-Makefiles.u
    1.15  EOT
    1.16 -	#patch -p1 < $stuff/nagios-3.2.1-Makefiles.u || return 1
    1.17  	./configure \
    1.18  		--prefix=/usr \
    1.19  		--infodir=/usr/share/info \
    1.20 @@ -38,14 +37,19 @@
    1.21  		--libexecdir=/usr/lib/nagios/plugins \
    1.22  		--sbindir=/usr/lib/nagios/cgi \
    1.23  		--datadir=/usr/share/nagios \
    1.24 -		--htmldir=/usr/share/nagios \
    1.25  		--localstatedir=/var/lib/nagios \
    1.26  		$CONFIGURE_ARGS 
    1.27  		
    1.28  	sed -i s!HTMLDIR=.*!HTMLDIR=/usr/share/nagios! html/Makefile
    1.29  	
    1.30 -	make all && make DESTDIR=$PWD/_pkg fullinstall \
    1.31 -	&& make DESTDIR=$PWD/_pkg install-config
    1.32 +	#~ make all && make DESTDIR=$PWD/_pkg fullinstall \
    1.33 +	#~ && make DESTDIR=$PWD/_pkg install-config
    1.34 +	make all && make install \
    1.35 +	&& make install-config \
    1.36 +	&& make install-commandmode \
    1.37 +	&& make install-webconf \
    1.38 +	&& make install-classicui 
    1.39 +	
    1.40  }
    1.41  
    1.42  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.43 @@ -57,14 +61,14 @@
    1.44  	  $fs/var/spool/nagios/checkresults \
    1.45  	  $fs/etc/apache
    1.46  		
    1.47 -	cp -a $_pkg/etc/apache $fs/etc
    1.48 -	cp -a $_pkg/etc/nagios $fs/etc
    1.49 -	cp -a stuff/nagios  $fs/etc/init.d
    1.50 -	install -o root -g root -m 644 stuff/htpasswd.users  $fs/etc/nagios/
    1.51 +	cp -a $install/etc/apache $fs/etc
    1.52 +	cp -a $install/etc/nagios $fs/etc
    1.53 +	cp -a $stuff/nagios  $fs/etc/init.d
    1.54 +	install -o root -g root -m 644 $stuff/htpasswd.users  $fs/etc/nagios/
    1.55  	
    1.56 -	cp -a $_pkg/usr/bin $fs/usr
    1.57 -	cp -a $_pkg/usr/lib $fs/usr
    1.58 -	cp -a $_pkg/usr/share $fs/usr
    1.59 +	cp -a $install/usr/bin $fs/usr
    1.60 +	cp -a $install/usr/lib $fs/usr
    1.61 +	cp -a $install/usr/share $fs/usr
    1.62  	
    1.63  	# Put doc in separate package
    1.64  	rm -rf $fs/usr/share/nagios/docs

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/nagios/stuff/nagios-3.5.0-Makefiles.u	Sat Apr 27 02:48:48 2013 +0200
     2.3 @@ -0,0 +1,98 @@
     2.4 +--- nagios-3.2.1-ori/Makefile.in	Thu Dec 31 11:12:08 2009
     2.5 ++++ nagios-3.2.1/Makefile.in	Sun Jun  6 11:03:32 2010
     2.6 +@@ -30,8 +30,8 @@
     2.7 + LIBEXECDIR=@libexecdir@
     2.8 + HTMLDIR=@datarootdir@
     2.9 + INSTALL=@INSTALL@
    2.10 +-INSTALL_OPTS=@INSTALL_OPTS@
    2.11 +-COMMAND_OPTS=@COMMAND_OPTS@
    2.12 ++INSTALL_OPTS=
    2.13 ++COMMAND_OPTS=
    2.14 + HTTPD_CONF=@HTTPD_CONF@
    2.15 + INIT_DIR=@init_dir@
    2.16 + INIT_OPTS=-o root -g root
    2.17 +@@ -264,6 +264,7 @@
    2.18 + 	@echo ""
    2.19 + 
    2.20 + install-webconf:
    2.21 ++	$(INSTALL) -m 755 -d $(DESTDIR)$(HTTPD_CONF)
    2.22 + 	$(INSTALL) -m 644 sample-config/httpd.conf $(DESTDIR)$(HTTPD_CONF)/nagios.conf
    2.23 + 
    2.24 + 	@echo ""
    2.25 +--- nagios-3.2.1-ori/base/Makefile.in	Wed Jun 17 05:57:21 2009
    2.26 ++++ nagios-3.2.1/base/Makefile.in	Sun Jun  6 11:03:32 2010
    2.27 +@@ -39,8 +39,8 @@
    2.28 + CGIDIR=@sbindir@
    2.29 + HTMLDIR=@datarootdir@
    2.30 + INSTALL=@INSTALL@
    2.31 +-INSTALL_OPTS=@INSTALL_OPTS@
    2.32 +-COMMAND_OPTS=@COMMAND_OPTS@
    2.33 ++INSTALL_OPTS=
    2.34 ++COMMAND_OPTS=
    2.35 + STRIP=@STRIP@
    2.36 + 
    2.37 + CGIURL=@cgiurl@
    2.38 +--- nagios-3.2.1-ori/cgi/Makefile.in	Wed Jun 17 05:57:21 2009
    2.39 ++++ nagios-3.2.1/cgi/Makefile.in	Sun Jun  6 11:03:32 2010
    2.40 +@@ -18,8 +18,8 @@
    2.41 + CGIDIR=@sbindir@
    2.42 + HTMLDIR=@datarootdir@
    2.43 + INSTALL=@INSTALL@
    2.44 +-INSTALL_OPTS=@INSTALL_OPTS@
    2.45 +-COMMAND_OPTS=@COMMAND_OPTS@
    2.46 ++INSTALL_OPTS=
    2.47 ++COMMAND_OPTS=
    2.48 + STRIP=@STRIP@
    2.49 + 
    2.50 + CGIEXTRAS=@CGIEXTRAS@
    2.51 +--- nagios-3.2.1-ori/common/Makefile.in	Wed Jun 17 05:57:21 2009
    2.52 ++++ nagios-3.2.1/common/Makefile.in	Sun Jun  6 11:03:32 2010
    2.53 +@@ -20,8 +20,8 @@
    2.54 + CGIDIR=@sbindir@
    2.55 + HTMLDIR=@datarootdir@
    2.56 + INSTALL=@INSTALL@
    2.57 +-INSTALL_OPTS=@INSTALL_OPTS@
    2.58 +-COMMAND_OPTS=@COMMAND_OPTS@
    2.59 ++INSTALL_OPTS=
    2.60 ++COMMAND_OPTS=
    2.61 + 
    2.62 + CP=@CP@
    2.63 + 
    2.64 +--- nagios-3.2.1-ori/contrib/Makefile.in	Mon May 19 20:01:58 2008
    2.65 ++++ nagios-3.2.1/contrib/Makefile.in	Sun Jun  6 10:43:34 2010
    2.66 +@@ -15,7 +15,7 @@
    2.67 + # Generated automatically from configure script
    2.68 + SNPRINTF_O=@SNPRINTF_O@
    2.69 + INSTALL=@INSTALL@
    2.70 +-INSTALL_OPTS=@INSTALL_OPTS@
    2.71 ++INSTALL_OPTS=
    2.72 + 
    2.73 + 
    2.74 + prefix=@prefix@
    2.75 +--- nagios-3.2.1-ori/html/Makefile.in	Wed Jul  8 00:34:51 2009
    2.76 ++++ nagios-3.2.1/html/Makefile.in	Sun Jun  6 10:59:50 2010
    2.77 +@@ -10,8 +10,8 @@
    2.78 + CGIDIR=@sbindir@
    2.79 + HTMLDIR=@datadir@
    2.80 + INSTALL=@INSTALL@
    2.81 +-INSTALL_OPTS=@INSTALL_OPTS@
    2.82 +-COMMAND_OPTS=@COMMAND_OPTS@
    2.83 ++INSTALL_OPTS=
    2.84 ++COMMAND_OPTS=
    2.85 + 
    2.86 + CP=@CP@
    2.87 + 
    2.88 +--- nagios-3.2.1-ori/module/Makefile.in	Sat Dec 15 00:02:24 2007
    2.89 ++++ nagios-3.2.1/module/Makefile.in	Sun Jun  6 11:03:32 2010
    2.90 +@@ -19,9 +19,8 @@
    2.91 + exec_prefix=@exec_prefix@
    2.92 + BINDIR=@bindir@
    2.93 + INSTALL=@INSTALL@
    2.94 +-INSTALL_OPTS=@INSTALL_OPTS@
    2.95 +-COMMAND_OPTS=@COMMAND_OPTS@
    2.96 +-STRIP=@STRIP@
    2.97 ++INSTALL_OPTS=
    2.98 ++COMMAND_OPTS=
    2.99 + 
   2.100 + CP=@CP@
   2.101 +