diff options
Diffstat (limited to 'net/nagios-base/patches/patch-aa')
| -rw-r--r-- | net/nagios-base/patches/patch-aa | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/net/nagios-base/patches/patch-aa b/net/nagios-base/patches/patch-aa index 9f61be848c9..17f99fd308c 100644 --- a/net/nagios-base/patches/patch-aa +++ b/net/nagios-base/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2007/11/26 22:14:14 seb Exp $ +$NetBSD: patch-aa,v 1.5 2008/06/21 14:35:49 tonnerre Exp $ ---- Makefile.in.orig 2006-05-30 16:31:44.000000000 +0000 +--- Makefile.in.orig 2007-04-23 17:44:25.000000000 +0200 +++ Makefile.in -@@ -22,15 +22,16 @@ LDFLAGS=@LDFLAGS@ @LIBS@ +@@ -22,16 +22,16 @@ LDFLAGS=@LDFLAGS@ @LIBS@ prefix=@prefix@ exec_prefix=@exec_prefix@ LOGDIR=@localstatedir@ @@ -15,13 +15,14 @@ $NetBSD: patch-aa,v 1.4 2007/11/26 22:14:14 seb Exp $ INSTALL=@INSTALL@ INSTALL_OPTS=@INSTALL_OPTS@ COMMAND_OPTS=@COMMAND_OPTS@ +-HTTPD_CONF=@HTTPD_CONF@ INIT_DIR=@init_dir@ -INIT_OPTS=-o root -g root +INIT_OPTS=-o root -g wheel CGICFGDIR=$(CGIDIR) PERLDIR=@PERLDIR@ -@@ -57,61 +58,7 @@ all: +@@ -58,60 +58,7 @@ all: cd $(SRC_BASE) && $(MAKE) cd $(SRC_CGI) && $(MAKE) cd $(SRC_HTM) && $(MAKE) @@ -71,10 +72,9 @@ $NetBSD: patch-aa,v 1.4 2007/11/26 22:14:14 seb Exp $ - @echo " - Relevant snippets from your config files" - @echo " - Relevant error messages from the Nagios log file" - @echo "" -- @echo "For those of you who are interested in contract support or" -- @echo "consulting services for Nagios, please visit:" +- @echo "For more information on obtaining support for Nagios, visit:" - @echo "" -- @echo " http://www.nagios.org/contractsupport" +- @echo " http://www.nagios.org/support/" - @echo "" - @echo "*************************************************************" - @echo "" @@ -99,26 +99,22 @@ $NetBSD: patch-aa,v 1.4 2007/11/26 22:14:14 seb Exp $ @echo "" @echo "*** Main program, CGIs and HTML files installed ***" @echo "" -@@ -213,14 +159,14 @@ install-basic: +@@ -213,12 +159,12 @@ install-basic: install-config: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample -- $(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample +- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg +- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg +- $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg +- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg +- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg + [ -d $(DESTDIR)$(SAMPDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR) -+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(SAMPDIR)/nagios.cfg-sample -+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(SAMPDIR)/cgi.cfg-sample -+ $(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(SAMPDIR)/resource.cfg-sample -+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(SAMPDIR)/bigger.cfg-sample -+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(SAMPDIR)/minimal.cfg-sample -+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(SAMPDIR)/checkcommands.cfg-sample -+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(SAMPDIR)/misccommands.cfg-sample ++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(SAMPDIR)/nagios.cfg-sample ++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(SAMPDIR)/cgi.cfg-sample ++ $(INSTALL) -m 640 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(SAMPDIR)/resource.cfg-sample ++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(SAMPDIR)/localhost.cfg-sample ++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(SAMPDIR)/commands.cfg-sample @echo "" @echo "*** Sample config file installed ***" |