aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJun Kuriyama <kuriyama@FreeBSD.org>2002-07-22 03:19:03 +0000
committerJun Kuriyama <kuriyama@FreeBSD.org>2002-07-22 03:19:03 +0000
commitdcd1fd8a9c98bc9920d33668a0ebb480702e0e28 (patch)
tree1c6c15d7fe431e8e40082664e6415066444cf207 /net
parentfba12cc1be1506bde4566b98c377faf41771a3c1 (diff)
downloadports-dcd1fd8a9c98bc9920d33668a0ebb480702e0e28.tar.gz
ports-dcd1fd8a9c98bc9920d33668a0ebb480702e0e28.zip
Notes
Diffstat (limited to 'net')
-rw-r--r--net/nagios/Makefile10
-rw-r--r--net/nagios/distinfo2
-rw-r--r--net/nagios/files/patch-aa12
-rw-r--r--net/nagios/files/patch-ab8
4 files changed, 16 insertions, 16 deletions
diff --git a/net/nagios/Makefile b/net/nagios/Makefile
index 64fcd34882ed..f169fc00a422 100644
--- a/net/nagios/Makefile
+++ b/net/nagios/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/nagios/distinfo b/net/nagios/distinfo
index 307242c08065..8d69c6e48b08 100644
--- a/net/nagios/distinfo
+++ b/net/nagios/distinfo
@@ -1 +1 @@
-MD5 (nagios-1.0b3.tar.gz) = 2bef463bedf547321d7eb6155355a389
+MD5 (nagios-1.0b4.tar.gz) = 6ce6f57edd194b15596c8ce78880ca89
diff --git a/net/nagios/files/patch-aa b/net/nagios/files/patch-aa
index 7b6966cefe68..96002804b574 100644
--- a/net/nagios/files/patch-aa
+++ b/net/nagios/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/nagios/files/patch-ab b/net/nagios/files/patch-ab
index 777551a1ddc8..1482e2e6cd46 100644
--- a/net/nagios/files/patch-ab
+++ b/net/nagios/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