diff options
Diffstat (limited to 'net/nagios-base/patches/patch-aa')
| -rw-r--r-- | net/nagios-base/patches/patch-aa | 121 |
1 files changed, 121 insertions, 0 deletions
diff --git a/net/nagios-base/patches/patch-aa b/net/nagios-base/patches/patch-aa new file mode 100644 index 00000000000..1e6306e0419 --- /dev/null +++ b/net/nagios-base/patches/patch-aa @@ -0,0 +1,121 @@ +$NetBSD: patch-aa,v 1.1.1.1 2006/02/18 17:12:20 bouyer Exp $ + +--- Makefile.in.orig 2004-12-16 02:15:24.000000000 +0100 ++++ Makefile.in 2005-10-14 20:00:49.000000000 +0200 +@@ -21,16 +21,17 @@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-LOGDIR=@localstatedir@ ++LOGDIR=@localstatedir@/log/nagios + CFGDIR=@sysconfdir@ + BINDIR=@bindir@ +-CGIDIR=@sbindir@ ++CGIDIR=@libexecdir@ + HTMLDIR=@datadir@ ++SAMPDIR=@prefix@/share/examples/nagios + INSTALL=@INSTALL@ + INSTALL_OPTS=@INSTALL_OPTS@ + COMMAND_OPTS=@COMMAND_OPTS@ + INIT_DIR=@init_dir@ +-INIT_OPTS=-o root -g root ++INIT_OPTS=-o root -g wheel + CGICFGDIR=$(CGIDIR) + PERLDIR=@PERLDIR@ + +@@ -59,60 +60,6 @@ + cd $(SRC_HTM) && $(MAKE) + cd $(SRC_MODULE) && $(MAKE) + +- @echo "" +- @echo "*** Compile finished ***" +- @echo "" +- @echo "If the main program and CGIs compiled without any errors, you" +- @echo "can continue with installing Nagios as follows (type 'make'" +- @echo "without any arguments for a list of all possible options):" +- @echo "" +- @echo " make install" +- @echo " - This installs the main program, CGIs, and HTML files" +- @echo "" +- @echo " make install-init" +- @echo " - This installs the init script in $(DESTDIR)$(INIT_DIR)" +- @echo "" +- @echo " make install-commandmode" +- @echo " - This installs and configures permissions on the" +- @echo " directory for holding the external command file" +- @echo "" +- @echo " make install-config" +- @echo " - This installs *SAMPLE* config files in $(DESTDIR)$(CFGDIR)" +- @echo " You'll have to modify these sample files before you can" +- @echo " use Nagios. Read the HTML documentation for more info" +- @echo " on doing this. Pay particular attention to the docs on" +- @echo " object configuration files, as they determine what/how" +- @echo " things get monitored!" +- @echo "" +- @echo "" +- @echo "*** Support Notes *******************************************" +- @echo "" +- @echo "If you have questions about configuring or running Nagios," +- @echo "please make sure that you:" +- @echo "" +- @echo " - Look at the sample config files" +- @echo " - Read the HTML documentation" +- @echo " - Read the FAQs online at http://www.nagios.org/faqs" +- @echo "" +- @echo "before you post a question to one of the mailing lists." +- @echo "Also make sure to include pertinent information that could" +- @echo "help others help you. This might include:" +- @echo "" +- @echo " - What version of Nagios you are using" +- @echo " - What version of the plugins you are using" +- @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 "" +- @echo " http://www.nagios.org/contractsupport" +- @echo "" +- @echo "*************************************************************" +- @echo "" +- @echo "Enjoy." +- @echo "" +- + nagios: + cd $(SRC_BASE) && $(MAKE) + +@@ -174,10 +121,8 @@ + cd $(SRC_BASE) && $(MAKE) $@ + cd $(SRC_CGI) && $(MAKE) $@ + cd $(SRC_HTM) && $(MAKE) $@ +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives + if [ $(INSTALLPERLSTUFF) = yes ]; then \ +- $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \ ++ ${BSD_INSTALL_SCRIPT} p1.pl $(DESTDIR)$(BINDIR); \ + fi; + + @echo "" +@@ -204,14 +149,14 @@ + + + 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 ++ [ -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 + + @echo "" + @echo "*** Sample config file installed ***" |