1 files changed, 56 insertions, 64 deletions

diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile
index 995668484228..33f6e163cf8d 100644
--- a/net-mgmt/nagios2/Makefile
+++ b/net-mgmt/nagios2/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	nagios
-PORTVERSION=	2.0.b6
+PORTVERSION=	2.0.r1
+DISTVERSION=	2.0rc1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=nagios
-DISTNAME=	nagios-2.0b6
+MASTER_SITE_SUBDIR=	nagios
 
 MAINTAINER=	jarrod@netleader.com.au
 COMMENT=	Extremely powerful network monitoring system
@@ -18,40 +18,39 @@ COMMENT=	Extremely powerful network monitoring system
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
 
-USE_GETOPT_LONG=yes
-GNU_CONFIGURE=	yes
+USE_GETOPT_LONG=	yes
+USE_ICONV=	yes
+USE_PERL5_BUILD=	yes
 USE_AUTOTOOLS=	autoconf:259
-USE_RC_SUBR=	yes
-USE_PERL5_BUILD=yes
+USE_RC_SUBR=	nagios.sh
+USE_REINPLACE=	yes
+
+OPTIONS=	EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8+]" OFF \
+		NANOSLEEP "Use nanosleep in event timing" OFF
 
-PKGINSTALL=	${WRKDIR}/INSTALL
-PKGDEINSTALL=	${WRKDIR}/DEINSTALL
-PKGMESSAGE=	${WRKDIR}/MESSAGE
+GNU_CONFIGURE=	yes
 
 NAGIOSUSER?=	nagios
 NAGIOSGROUP?=	nagios
 NAGIOSDIR?=	/var/spool/nagios
 
+NAGIOSWWWDIR?=	www/nagios
 NAGIOSHTMURL?=	/nagios
 NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
 
-.if defined(NAGIOSWWWDIR) || defined(WITH_NAGIOS_WWWDIR)
-NAGIOSWWWDIRSET=yes
-.endif
-
-.if defined(WITH_NAGIOS_WWWDIR) && !defined(NAGIOSWWWDIR)
-NAGIOSWWWDIR=	www/nagios
-.else
-NAGIOSWWWDIR?=	share/nagios
-.endif
+# Suggested NAGIOSHOMEURL values:
+# Home:              main.html
+# Tactical Overview: ${NAGIOSCGIURL}/tac.cgi
+# Service Detail:    ${NAGIOSCGIURL}/status.cgi?host=all
+# Host Detail:       ${NAGIOSCGIURL}/status.cgi?hostgroup=all&style=hostdetail
+# Status Map:        ${NAGIOSCGIURL}/statusmap.cgi?host=all
+NAGIOSHOMEURL?=	main.html
 
 .include <bsd.port.pre.mk>
 
 CPPFLAGS=	-I${LOCALBASE}/include -fPIC
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CFLAGS="${CPPFLAGS} ${CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib -lgd"
+CFLAGS+=	${CPPFLAGS}
+
 CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--with-command-group=${WWWGRP} \
 		--with-nagios-user=${NAGIOSUSER} \
@@ -65,60 +64,53 @@ CONFIGURE_ARGS=	--with-command-user=${NAGIOSUSER} \
 		--localstatedir=${NAGIOSDIR} \
 		--prefix=${PREFIX}
 
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib" \
+		PERL=${PERL}
+
+INSTALL_TARGET=	install install-commandmode install-config
+
 PLIST_SUB=	NAGIOSDIR=${NAGIOSDIR} \
 		NAGIOSWWWDIR=${NAGIOSWWWDIR} \
 		NAGIOSUSER=${NAGIOSUSER} \
 		NAGIOSGROUP=${NAGIOSGROUP} \
+		NAGIOSHTMURL=${NAGIOSHTMURL} \
+		NAGIOSCGIURL=${NAGIOSCGIURL} \
 		WWWGRP=${WWWGRP}
 
-SED_SCRIPT=	-e 's,%%NAGIOSUSER%%,${NAGIOSUSER},g' \
-		-e 's,%%NAGIOSGROUP%%,${NAGIOSGROUP},g' \
-		-e 's,%%NAGIOSDIR%%,${NAGIOSDIR},g' \
-		-e 's,%%NAGIOSWWWDIR%%,${NAGIOSWWWDIR},g' \
-		-e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
-
-INSTALL_TARGET=	all install config install-config install-commandmode
-
-pre-everything::
-.if !defined(NAGIOSWWWDIRSET)
-	@${ECHO_CMD} "**********************************************************************"
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} " The web component of this port is currently being installed under"
-	@${ECHO_CMD} " ${PREFIX}/${NAGIOSWWWDIR}, the default for which is being changed"
-	@${ECHO_CMD} " when Nagios 2.0 is released.  If this is a new installation, please"
-	@${ECHO_CMD} " consider adding the following option to /etc/make.conf to install the"
-	@${ECHO_CMD} " component under the correct home of ${PREFIX}/www/nagios:"
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "   # net-mgmt/nagios"
-	@${ECHO_CMD} "   WITH_NAGIOS_WWWDIR=YES"
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} " Existing installations can be upgraded with this option with only"
-	@${ECHO_CMD} " minor changes being required to etc/apache[2]/httpd.conf to change"
-	@${ECHO_CMD} " references of ${PREFIX}/${NAGIOSWWWDIR} to ${PREFIX}/www/nagios."
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} " Should you wish to continue using ${PREFIX}/${NAGIOSWWWDIR}, define"
-	@${ECHO_CMD} " the NAGIOSWWWDIR variable without the ${PREFIX}/ prefix:"
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "   # net-mgmt/nagios"
-	@${ECHO_CMD} "   NAGIOSWWWDIR=${NAGIOSWWWDIR}"
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} " The WITH_NAGIOS_WWWDIR knob will vanish once the default has been"
-	@${ECHO_CMD} " changed and the NAGIOSWWWDIR tunable option will remain permanently."
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "**********************************************************************"
+SUB_FILES=	pkg-install \
+		pkg-deinstall \
+		pkg-message
+
+SUB_LIST=	PREFIX=${PREFIX} \
+		${PLIST_SUB}
+
+.if defined(WITH_EMBEDDED_PERL)
+.if ${PERL_LEVEL} >= 500800
+USE_PERL5=	yes
+CONFIGURE_ARGS+=	--enable-embedded-perl \
+		--with-perlcache
+.else
+IGNORE=		"Embedded Perl requires Perl 5.8 or higher (see lang/perl5.8)"
+.endif
+PLIST_SUB+=	EMBEDDED_PERL=""
+.else
+PLIST_SUB+=	EMBEDDED_PERL="@comment "
+.endif
+
+.if defined(WITH_NANOSLEEP)
+CONFIGURE_ARGS+=	--enable-nanosleep
 .endif
 
-pre-build:
-	for myfile in nagios.sh INSTALL DEINSTALL MESSAGE; do \
-		${SED} ${SED_SCRIPT} < ${FILESDIR}/$${myfile}.tmpl >${WRKDIR}/$${myfile}; \
-	done
+post-patch:
+	${REINPLACE_CMD} -e 's#"main.html"#"${NAGIOSHOMEURL:S/\//\\\//g:S/&/\\&/g}"#' ${WRKSRC}/html/index.html.in
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL
 
 post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/nagios.sh ${PREFIX}/etc/rc.d/
 	@${CHMOD} 775 ${NAGIOSDIR} ${NAGIOSDIR}/archives ${NAGIOSDIR}/rw
 	@${CHOWN} ${NAGIOSUSER}:${NAGIOSGROUP} ${NAGIOSDIR} ${NAGIOSDIR}/archives
 	@${CHOWN} ${NAGIOSUSER}:${WWWGRP} ${NAGIOSDIR}/rw