svn commit: r340945 - in head/net-mgmt: . nagios nagios4 nagios4/files

Mathieu Arnold mat at FreeBSD.org
Fri Jan 24 23:24:58 UTC 2014 

Author: mat
Date: Fri Jan 24 23:24:53 2014
New Revision: 340945
URL: http://svnweb.freebsd.org/changeset/ports/340945
QAT: https://qat.redports.org/buildarchive/r340945/

Log:
  Add nagios4, the next version of the nagios monitoring system.
  
  While there, garbage collect the UID/GID in nagios.
  
  Sponsored by:	Absolight

Added:
  head/net-mgmt/nagios4/
     - copied from r340893, head/net-mgmt/nagios/
Modified:
  head/net-mgmt/Makefile
  head/net-mgmt/nagios/Makefile
  head/net-mgmt/nagios4/Makefile
  head/net-mgmt/nagios4/distinfo
  head/net-mgmt/nagios4/files/patch-Makefile.in
  head/net-mgmt/nagios4/files/patch-base__Makefile.in
  head/net-mgmt/nagios4/files/patch-cgi__Makefile.in
  head/net-mgmt/nagios4/files/patch-configure.in
  head/net-mgmt/nagios4/files/patch-contrib__Makefile.in
  head/net-mgmt/nagios4/files/patch-html__Makefile.in
  head/net-mgmt/nagios4/files/patch-html__index.php
  head/net-mgmt/nagios4/files/patch-html__main.php
  head/net-mgmt/nagios4/files/patch-include__locations.h.in
  head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in
  head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in
  head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in
  head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in
  head/net-mgmt/nagios4/pkg-plist

Modified: head/net-mgmt/Makefile
==============================================================================
--- head/net-mgmt/Makefile	Fri Jan 24 23:23:49 2014	(r340944)
+++ head/net-mgmt/Makefile	Fri Jan 24 23:24:53 2014	(r340945)
@@ -139,6 +139,7 @@
     SUBDIR += nagios-snmp-plugins
     SUBDIR += nagios-snmp-plugins-extras
     SUBDIR += nagios-spamd-plugin
+    SUBDIR += nagios4
     SUBDIR += nagiosagent
     SUBDIR += nagiosgraph
     SUBDIR += nagiosql

Modified: head/net-mgmt/nagios/Makefile
==============================================================================
--- head/net-mgmt/nagios/Makefile	Fri Jan 24 23:23:49 2014	(r340944)
+++ head/net-mgmt/nagios/Makefile	Fri Jan 24 23:24:53 2014	(r340945)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nagios
 PORTVERSION=	3.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
 
@@ -21,7 +21,7 @@ USE_AUTOTOOLS=	autoconf libltdl
 USE_PHP=	yes
 USE_RC_SUBR=	nagios
 
-CONFLICTS=	nagios-[12].* nagios-devel-*
+CONFLICTS=	nagios-[12].* nagios-devel-* nagios4-*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
@@ -52,8 +52,6 @@ PLIST_SUB=	NAGIOSDIR=${NAGIOSDIR} \
 		NAGIOSWWWDIR=${NAGIOSWWWDIR} \
 		NAGIOSUSER=${NAGIOSUSER} \
 		NAGIOSGROUP=${NAGIOSGROUP} \
-		NAGIOSUID=${NAGIOSUID} \
-		NAGIOSGID=${NAGIOSGID} \
 		NAGIOSHTMURL=${NAGIOSHTMURL} \
 		NAGIOSCGIURL=${NAGIOSCGIURL} \
 		WWWGRP=${WWWGRP}
@@ -68,9 +66,6 @@ NAGIOSUSER?=	nagios
 NAGIOSGROUP?=	nagios
 NAGIOSDIR?=	/var/spool/nagios
 
-NAGIOSUID=	181
-NAGIOSGID=	${NAGIOSUID}
-
 NAGIOSWWWDIR?=	www/nagios
 NAGIOSHTMURL?=	/nagios
 NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin

Modified: head/net-mgmt/nagios4/Makefile
==============================================================================
--- head/net-mgmt/nagios/Makefile	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/Makefile	Fri Jan 24 23:24:53 2014	(r340945)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	nagios
-PORTVERSION=	3.5.1
-PORTREVISION=	3
+PORTVERSION=	4.0.2
+PKGNAMESUFFIX=	4
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-3.x/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	mat at FreeBSD.org
 COMMENT=	Powerful network monitoring system
@@ -13,9 +13,8 @@ COMMENT=	Powerful network monitoring sys
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
-RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
 
-USES=		iconv perl5 uidfix
+USES=		gmake iconv perl5 uidfix
 USE_PERL5=	build
 USE_AUTOTOOLS=	autoconf libltdl
 USE_PHP=	yes
@@ -45,15 +44,11 @@ CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include -fPIC
 CFLAGS+=	${CPPFLAGS}
 
-MAKE_JOBS_UNSAFE=	yes
-
 INSTALL_TARGET=	install install-commandmode install-config
 PLIST_SUB=	NAGIOSDIR=${NAGIOSDIR} \
 		NAGIOSWWWDIR=${NAGIOSWWWDIR} \
 		NAGIOSUSER=${NAGIOSUSER} \
 		NAGIOSGROUP=${NAGIOSGROUP} \
-		NAGIOSUID=${NAGIOSUID} \
-		NAGIOSGID=${NAGIOSGID} \
 		NAGIOSHTMURL=${NAGIOSHTMURL} \
 		NAGIOSCGIURL=${NAGIOSCGIURL} \
 		WWWGRP=${WWWGRP}
@@ -68,9 +63,6 @@ NAGIOSUSER?=	nagios
 NAGIOSGROUP?=	nagios
 NAGIOSDIR?=	/var/spool/nagios
 
-NAGIOSUID=	181
-NAGIOSGID=	${NAGIOSUID}
-
 NAGIOSWWWDIR?=	www/nagios
 NAGIOSHTMURL?=	/nagios
 NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
@@ -78,23 +70,16 @@ NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
 USERS=		${NAGIOSUSER}
 GROUPS=		${NAGIOSGROUP}
 
-OPTIONS_DEFINE=	EMBEDDED_PERL NANOSLEEP EVENT_BROKER UNHANDLED_HACK
-EMBEDDED_PERL_DESC=	Enable embedded Perl [requires Perl 5.8.0+]
+OPTIONS_DEFINE=	NANOSLEEP EVENT_BROKER UNHANDLED_HACK
 NANOSLEEP_DESC=		Use nanosleep in event timing
 EVENT_BROKER_DESC=	Enable event broker functionality
 UNHANDLED_HACK_DESC=	Display passive checks in unhandled queries
 
 OPTIONS_SUB=
 
-EMBEDDED_PERL_USE=	perl5=run
-EMBEDDED_PERL_CONFIGURE_ENABLE=	embedded-perl
-EMBEDDED_PERL_CONFIGURE_WITH=	perlcache
 NANOSLEEP_CONFIGURE_ENABLE=	nanosleep
 EVENT_BROKER_CONFIGURE_ENABLE=	event-broker
 
-post-extract:
-	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
-
 .include <bsd.port.options.mk>
 
 post-patch:

Modified: head/net-mgmt/nagios4/distinfo
==============================================================================
--- head/net-mgmt/nagios/distinfo	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/distinfo	Fri Jan 24 23:24:53 2014	(r340945)
@@ -1,2 +1,2 @@
-SHA256 (nagios-3.5.1.tar.gz) = ca9dd68234fa090b3c35ecc8767b2c9eb743977eaf32612fa9b8341cc00a0f99
-SIZE (nagios-3.5.1.tar.gz) = 1763584
+SHA256 (nagios-4.0.2.tar.gz) = 01a3865301cb57ffec57247a2a23ea43d9cf2d21a480a89e9070546fdd366629
+SIZE (nagios-4.0.2.tar.gz) = 1696847

Modified: head/net-mgmt/nagios4/files/patch-Makefile.in
==============================================================================
--- head/net-mgmt/nagios/files/patch-Makefile.in	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/files/patch-Makefile.in	Fri Jan 24 23:24:53 2014	(r340945)
@@ -1,15 +1,6 @@
---- ./Makefile.in.orig	2013-08-30 19:46:14.000000000 +0200
-+++ ./Makefile.in	2014-01-14 13:57:06.000000000 +0100
-@@ -30,8 +30,6 @@
- LIBEXECDIR=@libexecdir@
- HTMLDIR=@datadir@
- INSTALL=@INSTALL@
--INSTALL_OPTS=@INSTALL_OPTS@
--COMMAND_OPTS=@COMMAND_OPTS@
- HTTPD_CONF=@HTTPD_CONF@
- INIT_DIR=@init_dir@
- INIT_OPTS=-o root -g root
-@@ -234,12 +232,12 @@
+--- ./Makefile.in.orig	2013-11-25 14:16:25.000000000 +0000
++++ ./Makefile.in	2014-01-24 22:43:01.000000000 +0000
+@@ -245,7 +245,7 @@
  	$(MAKE) install-basic
  
  install-basic:
@@ -18,13 +9,7 @@
  	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
  	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
  	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR)
- 	if [ $(INSTALLPERLSTUFF) = yes ]; then \
--		$(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
-+		$(INSTALL) -m 644 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
- 	fi;
- 
- 	@echo ""
-@@ -261,19 +259,18 @@
+@@ -269,19 +269,18 @@
  
  
  install-config:
@@ -56,7 +41,7 @@
  
  	@echo ""
  	@echo "*** Config files installed ***"
-@@ -321,7 +318,6 @@
+@@ -329,7 +328,6 @@
  
  install-commandmode:
  	$(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw

Modified: head/net-mgmt/nagios4/files/patch-base__Makefile.in
==============================================================================
--- head/net-mgmt/nagios/files/patch-base__Makefile.in	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/files/patch-base__Makefile.in	Fri Jan 24 23:24:53 2014	(r340945)
@@ -1,15 +1,6 @@
---- ./base/Makefile.in.orig	2013-08-30 19:46:14.000000000 +0200
-+++ ./base/Makefile.in	2014-01-14 13:57:06.000000000 +0100
-@@ -39,8 +39,6 @@
- CGIDIR=@sbindir@
- HTMLDIR=@datarootdir@
- INSTALL=@INSTALL@
--INSTALL_OPTS=@INSTALL_OPTS@
--COMMAND_OPTS=@COMMAND_OPTS@
- STRIP=@STRIP@
- 
- CGIURL=@cgiurl@
-@@ -204,9 +202,9 @@
+--- ./base/Makefile.in.orig	2013-11-25 14:16:25.000000000 +0000
++++ ./base/Makefile.in	2014-01-24 22:43:21.000000000 +0000
+@@ -180,9 +180,9 @@
  	$(MAKE) install-basic
  
  install-basic:

Modified: head/net-mgmt/nagios4/files/patch-cgi__Makefile.in
==============================================================================
--- head/net-mgmt/nagios/files/patch-cgi__Makefile.in	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/files/patch-cgi__Makefile.in	Fri Jan 24 23:24:53 2014	(r340945)
@@ -1,15 +1,6 @@
---- ./cgi/Makefile.in.orig	2013-08-30 19:46:14.000000000 +0200
-+++ ./cgi/Makefile.in	2014-01-14 13:57:06.000000000 +0100
-@@ -18,8 +18,6 @@
- CGIDIR=@sbindir@
- HTMLDIR=@datarootdir@
- INSTALL=@INSTALL@
--INSTALL_OPTS=@INSTALL_OPTS@
--COMMAND_OPTS=@COMMAND_OPTS@
- STRIP=@STRIP@
- 
- CGIEXTRAS=@CGIEXTRAS@
-@@ -201,9 +199,9 @@
+--- ./cgi/Makefile.in.orig	2013-11-25 14:16:25.000000000 +0000
++++ ./cgi/Makefile.in	2014-01-24 22:43:36.000000000 +0000
+@@ -182,9 +182,9 @@
  	$(MAKE) install-basic
  
  install-basic:

Modified: head/net-mgmt/nagios4/files/patch-configure.in
==============================================================================
--- head/net-mgmt/nagios/files/patch-configure.in	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/files/patch-configure.in	Fri Jan 24 23:24:53 2014	(r340945)
@@ -1,53 +1,27 @@
---- ./configure.in.orig	2013-08-30 19:46:14.000000000 +0200
-+++ ./configure.in	2014-01-14 13:57:06.000000000 +0100
+--- ./configure.in.orig	2013-11-25 14:16:25.000000000 +0000
++++ ./configure.in	2014-01-24 22:41:15.000000000 +0000
 @@ -6,7 +6,6 @@
  
  AC_INIT(base/nagios.c)
- AC_CONFIG_HEADER(include/config.h include/snprintf.h)
+ AC_CONFIG_HEADER(include/config.h lib/snprintf.h lib/iobroker.h)
 -AC_PREFIX_DEFAULT(/usr/local/nagios)
  
  PKG_NAME=nagios
- PKG_VERSION="3.5.1"
-@@ -125,7 +124,15 @@
- dnl Test for pthreads support - taken from ICU FreeBSD Port configure script
- THREADLIBS=""
- have_pthreads="no"
-+have_thr="no"
- 
-+dnl Prefer libthr(3) over libpthread(3) due to serious process hanging issues
-+AC_CHECK_LIB(thr,pthread_create)
-+if test $ac_cv_lib_thr_pthread_create = yes; then
-+	THREADLIBS="-lthr"
-+	have_pthreads="yes"
-+	have_thr="yes"
-+else
- dnl FreeBSD: Try ports/linuxthreads first - Mammad Zadeh <mammad at yahoo-inc.com>
- dnl FreeBSD -pthread check - Jonathan McDowell <noodles at earth.li>
- AC_DEFUN([AC_PTHREAD_FREEBSD],[
-@@ -186,6 +193,7 @@
- if test $have_pthreads = "no"; then
- 	AC_PTHREAD_FREEBSD
- fi
-+fi
- 
- AC_SUBST(THREADLIBS)
- 
-@@ -201,7 +209,7 @@
+ PKG_VERSION="4.0.2"
+@@ -134,14 +133,14 @@
  AC_SUBST(nagios_grp)
  AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user",[user name to run nagios])
  AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp",[group name to run nagios])
 -INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
-+INSTALL_OPTS="-o root -g wheel"
++INSTALL_OPTS=""
  AC_SUBST(INSTALL_OPTS)
  
  AC_ARG_WITH(command_user,AC_HELP_STRING([--with-command-user=<user>],[sets user name for command access]),command_user=$withval,command_user=$nagios_user)
-@@ -668,6 +676,9 @@
+ AC_ARG_WITH(command_group,AC_HELP_STRING([--with-command-group=<grp>],[sets group name for command access]),command_grp=$withval,command_grp=$nagios_grp)
+ AC_SUBST(command_user)
+ AC_SUBST(command_grp)
+-COMMAND_OPTS="-o $command_user -g $command_grp"
++COMMAND_OPTS=""
+ AC_SUBST(COMMAND_OPTS)
  
- 	AC_DEFINE_UNQUOTED(EMBEDDEDPERL,,[Is embedded Perl being compiled in?])
- 	PERLLIBS="`perl -MExtUtils::Embed -e ldopts`" 
-+	if test x$have_thr = xyes; then
-+		PERLLIBS="`echo $PERLLIBS | sed 's#pthread #lthr #'`"
-+	fi
- 	PERLDIR="`perl -MConfig -e 'print $Config{installsitearch}'`" 
- 	CFLAGS="${CFLAGS} `perl -MExtUtils::Embed -e ccopts`" 
- 	USEPERL=yes
+ dnl Check for location of mail program

Modified: head/net-mgmt/nagios4/files/patch-contrib__Makefile.in
==============================================================================
--- head/net-mgmt/nagios/files/patch-contrib__Makefile.in	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/files/patch-contrib__Makefile.in	Fri Jan 24 23:24:53 2014	(r340945)
@@ -1,14 +1,6 @@
---- ./contrib/Makefile.in.orig	2013-08-30 19:46:14.000000000 +0200
-+++ ./contrib/Makefile.in	2014-01-14 13:57:06.000000000 +0100
-@@ -16,7 +16,6 @@
- # Generated automatically from configure script
- SNPRINTF_O=@SNPRINTF_O@
- INSTALL=@INSTALL@
--INSTALL_OPTS=@INSTALL_OPTS@
- 
- 
- prefix=@prefix@
-@@ -51,10 +50,10 @@
+--- ./contrib/Makefile.in.orig	2013-11-25 14:16:25.000000000 +0000
++++ ./contrib/Makefile.in	2014-01-24 22:44:01.000000000 +0000
+@@ -52,10 +52,10 @@
  devclean: distclean
  
  install:

Modified: head/net-mgmt/nagios4/files/patch-html__Makefile.in
==============================================================================
--- head/net-mgmt/nagios/files/patch-html__Makefile.in	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/files/patch-html__Makefile.in	Fri Jan 24 23:24:53 2014	(r340945)
@@ -1,15 +1,6 @@
---- ./html/Makefile.in.orig	2013-08-30 19:46:14.000000000 +0200
-+++ ./html/Makefile.in	2014-01-14 13:57:06.000000000 +0100
-@@ -10,8 +10,6 @@
- CGIDIR=@sbindir@
- HTMLDIR=@datadir@
- INSTALL=@INSTALL@
--INSTALL_OPTS=@INSTALL_OPTS@
--COMMAND_OPTS=@COMMAND_OPTS@
- 
- CP=@CP@
- 
-@@ -34,55 +32,55 @@
+--- ./html/Makefile.in.orig	2014-01-24 22:44:21.000000000 +0000
++++ ./html/Makefile.in	2014-01-24 22:44:31.000000000 +0000
+@@ -35,55 +35,55 @@
  devclean: distclean
  
  install:

Modified: head/net-mgmt/nagios4/files/patch-html__index.php
==============================================================================
--- head/net-mgmt/nagios/files/patch-html__index.php	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/files/patch-html__index.php	Fri Jan 24 23:24:53 2014	(r340945)
@@ -1,5 +1,5 @@
---- ./html/index.php.orig	2013-08-30 19:46:14.000000000 +0200
-+++ ./html/index.php	2014-01-14 13:57:06.000000000 +0100
+--- ./html/index.php.orig	2013-11-25 14:16:25.000000000 +0000
++++ ./html/index.php	2014-01-24 22:40:43.000000000 +0000
 @@ -8,8 +8,9 @@
  </head>
  

Modified: head/net-mgmt/nagios4/files/patch-html__main.php
==============================================================================
--- head/net-mgmt/nagios/files/patch-html__main.php	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/files/patch-html__main.php	Fri Jan 24 23:24:53 2014	(r340945)
@@ -1,10 +1,10 @@
---- ./html/main.php.orig	2013-08-30 19:46:14.000000000 +0200
-+++ ./html/main.php	2014-01-14 13:57:06.000000000 +0100
-@@ -40,36 +40,10 @@
+--- ./html/main.php.orig	2013-11-25 14:16:25.000000000 +0000
++++ ./html/main.php	2014-01-24 22:40:43.000000000 +0000
+@@ -40,37 +40,10 @@
  <div class="product">Nagios<sup><span style="font-size: small;">®</span></sup> Core<sup><span style="font-size: small;">™</span></sup></div>
- <div class="version">Version 3.5.1</div>
- <div class="releasedate">August 30, 2013</div>
--<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=3.5.1&product=nagioscore" target="_blank">Check for updates</a></div>
+ <div class="version">Version 4.0.2</div>
+ <div class="releasedate">November 25, 2013</div>
+-<div class="checkforupdates"><a href="http://www.nagios.org/checkforupdates/?version=4.0.2&product=nagioscore" target="_blank">Check for updates</a></div>
  <!--<div class="whatsnew"><a href="http://go.nagios.com/nagioscore/whatsnew">Read what's new in Nagios Core 3</a></div>-->
  </div>
  
@@ -34,6 +34,7 @@
 -?>
 -</div>
 -
- 
+-
  
  <div id="splashboxes">
+ 	<div id='topsplashbox'>

Modified: head/net-mgmt/nagios4/files/patch-include__locations.h.in
==============================================================================
--- head/net-mgmt/nagios/files/patch-include__locations.h.in	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/files/patch-include__locations.h.in	Fri Jan 24 23:24:53 2014	(r340945)
@@ -1,6 +1,6 @@
---- ./include/locations.h.in.orig	2013-08-30 19:46:14.000000000 +0200
-+++ ./include/locations.h.in	2014-01-14 13:57:06.000000000 +0100
-@@ -20,7 +20,7 @@
+--- ./include/locations.h.in.orig	2013-11-25 14:16:25.000000000 +0000
++++ ./include/locations.h.in	2014-01-24 22:40:43.000000000 +0000
+@@ -19,7 +19,7 @@
  
  #define DEFAULT_TEMP_FILE			"@localstatedir@/tempfile"
  #define DEFAULT_TEMP_PATH                       "/tmp"

Modified: head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in
==============================================================================
--- head/net-mgmt/nagios/files/patch-sample-config__cgi.cfg.in	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in	Fri Jan 24 23:24:53 2014	(r340945)
@@ -1,6 +1,6 @@
---- ./sample-config/cgi.cfg.in.orig	2013-08-30 19:46:14.000000000 +0200
-+++ ./sample-config/cgi.cfg.in	2014-01-14 13:57:06.000000000 +0100
-@@ -264,7 +264,7 @@
+--- ./sample-config/cgi.cfg.in.orig	2013-11-25 14:16:25.000000000 +0000
++++ ./sample-config/cgi.cfg.in	2014-01-24 22:40:43.000000000 +0000
+@@ -263,7 +263,7 @@
  # OS and distribution, so you may have to tweak this to
  # work on your system.
  

Modified: head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in
==============================================================================
--- head/net-mgmt/nagios/files/patch-sample-config__nagios.cfg.in	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in	Fri Jan 24 23:24:53 2014	(r340945)
@@ -1,6 +1,6 @@
---- ./sample-config/nagios.cfg.in.orig	2013-08-30 19:46:14.000000000 +0200
-+++ ./sample-config/nagios.cfg.in	2014-01-14 13:57:06.000000000 +0100
-@@ -32,7 +32,7 @@
+--- ./sample-config/nagios.cfg.in.orig	2013-11-25 14:16:25.000000000 +0000
++++ ./sample-config/nagios.cfg.in	2014-01-24 22:40:43.000000000 +0000
+@@ -31,7 +31,7 @@
  cfg_file=@sysconfdir@/objects/timeperiods.cfg
  cfg_file=@sysconfdir@/objects/templates.cfg
  

Modified: head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in
==============================================================================
--- head/net-mgmt/nagios/files/patch-sample-config__template-object__localhost.cfg.in	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in	Fri Jan 24 23:24:53 2014	(r340945)
@@ -1,6 +1,6 @@
---- ./sample-config/template-object/localhost.cfg.in.orig	2013-08-30 19:46:14.000000000 +0200
-+++ ./sample-config/template-object/localhost.cfg.in	2014-01-14 13:57:06.000000000 +0100
-@@ -5,7 +5,7 @@
+--- ./sample-config/template-object/localhost.cfg.in.orig	2013-11-25 14:16:25.000000000 +0000
++++ ./sample-config/template-object/localhost.cfg.in	2014-01-24 22:40:43.000000000 +0000
+@@ -4,7 +4,7 @@
  #
  # NOTE: This config file is intended to serve as an *extremely* simple 
  #       example of how you can create configuration entries to monitor
@@ -9,7 +9,7 @@
  #
  ###############################################################################
  
-@@ -23,9 +23,9 @@
+@@ -22,9 +22,9 @@
  # Define a host for the local machine
  
  define host{
@@ -21,7 +21,7 @@
          host_name               localhost
          alias                   localhost
          address                 127.0.0.1
-@@ -41,12 +41,12 @@
+@@ -40,12 +40,12 @@
  ###############################################################################
  ###############################################################################
  

Modified: head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in
==============================================================================
--- head/net-mgmt/nagios/files/patch-sample-config__template-object__templates.cfg.in	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in	Fri Jan 24 23:24:53 2014	(r340945)
@@ -1,6 +1,6 @@
---- ./sample-config/template-object/templates.cfg.in.orig	2013-08-30 19:46:14.000000000 +0200
-+++ ./sample-config/template-object/templates.cfg.in	2014-01-14 13:57:06.000000000 +0100
-@@ -63,17 +63,17 @@
+--- ./sample-config/template-object/templates.cfg.in.orig	2013-11-25 14:16:25.000000000 +0000
++++ ./sample-config/template-object/templates.cfg.in	2014-01-24 22:40:43.000000000 +0000
+@@ -61,17 +61,17 @@
          }
  
  

Modified: head/net-mgmt/nagios4/pkg-plist
==============================================================================
--- head/net-mgmt/nagios/pkg-plist	Fri Jan 24 12:50:53 2014	(r340893)
+++ head/net-mgmt/nagios4/pkg-plist	Fri Jan 24 23:24:53 2014	(r340945)
@@ -7,7 +7,6 @@
 @exec chown %%NAGIOSUSER%%:%%WWWGRP%% %%NAGIOSDIR%%/rw
 bin/nagios
 bin/nagiostats
-%%EMBEDDED_PERL%%bin/p1.pl
 etc/nagios/cgi.cfg-sample
 etc/nagios/nagios.cfg-sample
 etc/nagios/objects/commands.cfg-sample

More information about the svn-ports-all mailing list