Attachment #73474 for bug #106502

View | Details | Raw Unified | Return to bug 106502
Collapse All | Expand All

Lines 6-12 Link Here

(-)ports/net-mgmt/nagios/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= nagios	8	PORTNAME= nagios
9	PORTVERSION= 2.5	9	PORTVERSION= 2.6
10	CATEGORIES= net-mgmt	10	CATEGORIES= net-mgmt
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= nagios	12	MASTER_SITE_SUBDIR= nagios

Lines 1-3 Link Here

(-)ports/net-mgmt/nagios/distinfo (-3 / +3 lines)
1	MD5 (nagios-2.5.tar.gz) = 1a77528f6797bd3c0320da5e4fae2b1a	1	MD5 (nagios-2.6.tar.gz) = a032edba07bf389b803ce817e9406c02
2	SHA256 (nagios-2.5.tar.gz) = de9eb06609299cc231d0c2104a7f65367446cb86cb6aa3f6787fb25003fd452e	2	SHA256 (nagios-2.6.tar.gz) = e53cd8cc5cb00a00b66aa7e33fb34b70b783f095161cde9376cea489c5445e42
3	SIZE (nagios-2.5.tar.gz) = 1736167	3	SIZE (nagios-2.6.tar.gz) = 1734400




--- Makefile.in.orig	Tue Nov 28 12:59:04 2006
+++ Makefile.in	Sat Dec  9 08:04:47 2006
@@ -186,7 +186,7 @@
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
 	if [ $(INSTALLPERLSTUFF) = yes ]; then \

 	fi;
 
 	@echo ""
@@ -213,12 +213,12 @@
 
 
 install-config:

-	$(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/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample
-	$(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.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) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg-sample
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
+	$(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
 
 	@echo ""
 	@echo "*** Sample config file installed ***"

Lines 7-17 Link Here

(-)ports/net-mgmt/nagios/pkg-plist (-4 / +2 lines)
7	bin/nagios	7	bin/nagios
8	bin/nagiostats	8	bin/nagiostats
9	%%EMBEDDED_PERL%%bin/p1.pl	9	%%EMBEDDED_PERL%%bin/p1.pl
10	etc/nagios/bigger.cfg-sample
11	etc/nagios/cgi.cfg-sample	10	etc/nagios/cgi.cfg-sample
12	etc/nagios/checkcommands.cfg-sample	11	etc/nagios/commands.cfg-sample
13	etc/nagios/minimal.cfg-sample	12	etc/nagios/localhost.cfg-sample
14	etc/nagios/misccommands.cfg-sample
15	etc/nagios/nagios.cfg-sample	13	etc/nagios/nagios.cfg-sample
16	etc/nagios/resource.cfg-sample	14	etc/nagios/resource.cfg-sample
17	%%NAGIOSWWWDIR%%/cgi-bin/avail.cgi	15	%%NAGIOSWWWDIR%%/cgi-bin/avail.cgi

Return to bug 106502

Lines 1-6 Link Here

(-)ports/net-mgmt/nagios/files/patch-Makefile.in (-12 / +8 lines)
1	--- Makefile.in.orig Sat Nov 26 17:35:35 2005	1	--- Makefile.in.orig Tue Nov 28 12:59:04 2006
2	+++ Makefile.in Wed Dec 28 23:06:40 2005	2	+++ Makefile.in Sat Dec 9 08:04:47 2006
3	@@ -177,7 +177,7 @@	3	@@ -186,7 +186,7 @@
4	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)	4	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
5	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives	5	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
6	if [ $(INSTALLPERLSTUFF) = yes ]; then \	6	if [ $(INSTALLPERLSTUFF) = yes ]; then \
Lines 9-15 Link Here
9	fi;	9	fi;
10		10
11	@echo ""	11	@echo ""
12	@@ -204,14 +204,14 @@	12	@@ -213,12 +213,12 @@
13		13
14		14
15	install-config:	15	install-config:
Lines 17-34 Link Here
17	- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample	17	- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
18	- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample	18	- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
19	- $(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample	19	- $(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
20	- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample	20	- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample
21	- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample	21	- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg-sample
22	- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
23	- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
24	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)	22	+ $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
25	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample	23	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
26	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample	24	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
27	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample	25	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
28	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample	26	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample
29	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample	27	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg-sample
30	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
31	+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
32		28
33	@echo ""	29	@echo ""
34	@echo "* Sample config file installed *"	30	@echo "* Sample config file installed *"