From 7f622bdfac085f5ee27f6c0089d1491c5b28a5d7 Mon Sep 17 00:00:00 2001 From: kuriyama Date: Mon, 22 Jul 2002 03:19:03 +0000 Subject: Upgrade to 1.0b4. Depends on nagios-plugins. Submitted by: Blaz Zupan --- net-mgmt/nagios2/Makefile | 10 +++++----- net-mgmt/nagios2/distinfo | 2 +- net-mgmt/nagios2/files/patch-aa | 12 ++++++------ net-mgmt/nagios2/files/patch-ab | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) (limited to 'net-mgmt/nagios2') diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile index 64fcd34..f169fc0 100644 --- a/net-mgmt/nagios2/Makefile +++ b/net-mgmt/nagios2/Makefile @@ -6,18 +6,18 @@ # PORTNAME= nagios -PORTVERSION= 1.0.b3 -PORTREVISION= 1 +PORTVERSION= 1.0.b4 +PORTREVISION= 0 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=nagios -DISTNAME= nagios-1.0b3 +DISTNAME= nagios-1.0b4 MAINTAINER= blaz@si.FreeBSD.org LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd \ gnugetopt.1:${PORTSDIR}/devel/libgnugetopt -RUN_DEPENDS= ${LOCALBASE}/libexec/netsaint/check_netsaint:${PORTSDIR}/net/netsaint-plugins +RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net/nagios-plugins GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -31,7 +31,7 @@ CONFIGURE_ARGS= --with-command-user=nagios \ --with-template-extinfo \ --with-init-dir=${PREFIX}/etc/rc.d \ --sbindir=${PREFIX}/share/nagios/cgi-bin \ - --libexecdir=${PREFIX}/libexec/netsaint \ + --libexecdir=${PREFIX}/libexec/nagios \ --datadir=${PREFIX}/share/nagios \ --sysconfdir=${PREFIX}/etc/nagios \ --localstatedir=${PREFIX}/var/nagios \ diff --git a/net-mgmt/nagios2/distinfo b/net-mgmt/nagios2/distinfo index 307242c..8d69c6e 100644 --- a/net-mgmt/nagios2/distinfo +++ b/net-mgmt/nagios2/distinfo @@ -1 +1 @@ -MD5 (nagios-1.0b3.tar.gz) = 2bef463bedf547321d7eb6155355a389 +MD5 (nagios-1.0b4.tar.gz) = 6ce6f57edd194b15596c8ce78880ca89 diff --git a/net-mgmt/nagios2/files/patch-aa b/net-mgmt/nagios2/files/patch-aa index 7b6966c..9600280 100644 --- a/net-mgmt/nagios2/files/patch-aa +++ b/net-mgmt/nagios2/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.in.orig Tue May 28 09:20:45 2002 -+++ Makefile.in Sat Jun 1 17:04:39 2002 +--- Makefile.in.orig Sat Jun 29 21:15:49 2002 ++++ Makefile.in Sun Jul 14 09:37:12 2002 @@ -28,7 +28,7 @@ INSTALL_OPTS=@INSTALL_OPTS@ COMMAND_OPTS=@COMMAND_OPTS@ @@ -9,23 +9,23 @@ CGICFGDIR=$(CGIDIR) PERLDIR=@PERLDIR@ -@@ -145,15 +145,17 @@ +@@ -145,16 +145,17 @@ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/services.cfg $(DESTDIR)$(CFGDIR)/services.cfg-sample $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/timeperiods.cfg-sample -+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/hostextinfo.cfg $(DESTDIR)$(CFGDIR)/hostextinfo.cfg-sample -+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-extinfo/serviceextinfo.cfg $(DESTDIR)$(CFGDIR)/serviceextinfo.cfg-sample ++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-extinfo/hostextinfo.cfg $(DESTDIR)$(CFGDIR)/hostextinfo.cfg-sample ++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-extinfo/serviceextinfo.cfg $(DESTDIR)$(CFGDIR)/serviceextinfo.cfg-sample install-init: install-daemoninit install-daemoninit: + $(INSTALL) -m 755 -d $(INIT_OPTS) $(DESTDIR)$(INIT_DIR) - $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios + $(INSTALL) -m 774 $(INIT_OPTS) daemon-init $(DESTDIR)$(INIT_DIR)/nagios.sh install-commandmode: $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw - chmod g+s $(DESTDIR)$(LOGDIR)/rw -+# chmod g+s $(DESTDIR)$(LOGDIR)/rw fullinstall: install install-init install-commandmode diff --git a/net-mgmt/nagios2/files/patch-ab b/net-mgmt/nagios2/files/patch-ab index 777551a..1482e2e 100644 --- a/net-mgmt/nagios2/files/patch-ab +++ b/net-mgmt/nagios2/files/patch-ab @@ -1,10 +1,10 @@ ---- base/Makefile.in.orig Sat Apr 20 22:34:02 2002 -+++ base/Makefile.in Sun May 19 08:35:09 2002 +--- base/Makefile.in.orig Sat Jun 29 21:15:49 2002 ++++ base/Makefile.in Sun Jul 14 09:15:27 2002 @@ -102,7 +102,6 @@ + devclean: clean install: - strip nagios - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) $(INSTALL) -m 774 $(INSTALL_OPTS) nagios $(DESTDIR)$(BINDIR) - + $(STRIP) $(DESTDIR)$(BINDIR)/nagios -- cgit v1.1