Index: head/net-mgmt/icinga-core/Makefile
===================================================================
--- head/net-mgmt/icinga-core/Makefile	(revision 447116)
+++ head/net-mgmt/icinga-core/Makefile	(revision 447117)
@@ -1,72 +1,73 @@
 # Created by: Chin-San Huang <chinsan@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	icinga-core
 DISTNAME=	icinga-${PORTVERSION}
+PORTREVISION=	1
 
 COMMENT=	Enterprise grade open source monitoring system based on Nagios
 
 .include "${.CURDIR}/Makefile.common"
 
 USE_RC_SUBR=	icinga
 
 ALL_TARGET=	icinga
 INSTALL_TARGET=	install-base install-basic install-config install-eventhandlers
 
 SUB_FILES=	pkg-message
 
 # XXX: Don't remove PREFIX from SUB_LIST here.
 SUB_LIST=	PREFIX=${PREFIX} \
 		${PLIST_SUB}
 
 OPTIONS_DEFINE=		IDOUTILS
 OPTIONS_RADIO=		PLUGINS
 OPTIONS_RADIO_PLUGINS=	MONPLUGINS NAGPLUGINS
 OPTIONS_DEFAULT=	IDOUTILS MONPLUGINS
 
 IDOUTILS_DESC=		Enable Icinga Data Objects support
 
 MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
 NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIDOUTILS}
 LIB_DEPENDS+=		libdbi.so:databases/libdbi
 CONFIGURE_ARGS+=	--enable-idoutils \
 			--enable-ssl \
 			--with-dbi-lib=${LOCALBASE}/lib \
 			--with-dbi-inc=${LOCALBASE}/include
 ALL_TARGET+=		idoutils
 INSTALL_TARGET+=	install-idoutils
 USES+=			ssl
 USE_RC_SUBR+=		ido2db
 PLIST_SUB+=		IDOUTILS=""
 .else
 PLIST_SUB+=		IDOUTILS="@comment "
 CONFIGURE_ARGS+=	--disable-idoutils
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#775#755#g; s#664#644#g' \
 		${WRKSRC}/html/Makefile.in
 # Use correct make(1) syntax to unbreak parallel builds
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
 		-E 's#cd (.+) && (make|\$$\(MAKE\))#$$(MAKE) -C \1#'
 
 pre-install:
 .if ${PORT_OPTIONS:MIDOUTILS}
 	@${STRIP_CMD} ${WRKSRC}/module/idoutils/src/ido2db \
 		${WRKSRC}/module/idoutils/src/log2ido \
 		${WRKSRC}/module/idoutils/src/idomod.so
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/idoutils/config/
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/idoutils/db
 	cd ${WRKSRC}/module/idoutils/config && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${EXAMPLESDIR}/idoutils/config
 	cd ${WRKSRC}/module/idoutils/db && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${EXAMPLESDIR}/idoutils/db
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icinga-core/files/icinga.in
===================================================================
--- head/net-mgmt/icinga-core/files/icinga.in	(revision 447116)
+++ head/net-mgmt/icinga-core/files/icinga.in	(revision 447117)
@@ -1,141 +1,142 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: icinga
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable icinga:
 # icinga_enable (bool):    Set to "NO" by default.
 #                          Set it to "YES" to enable icinga.
 # icinga_precache (bool):  Set to "NO" by default.
 #                          Set it to "YES" to enable pre-caching.
 # icinga_flags (str):      Set to "" by default.
 # icinga_configfile (str): Set to "%%PREFIX%%/etc/icinga/icinga.cfg" by default.
 #
 
 . /etc/rc.subr
 
 name="icinga"
+desc="Icinga 1 monitoring (core)"
 rcvar=icinga_enable
 
 load_rc_config "${name}"
 
 : ${icinga_enable:="NO"}
 : ${icinga_configfile="%%PREFIX%%/etc/icinga/icinga.cfg"}
 : ${icinga_precache:="NO"}
 
 command="%%PREFIX%%/bin/icinga"
 command_args="-d"
 extra_commands="reload checkconfig configtest"
 icinga_user="%%ICINGAUSER%%"
 icinga_group="%%ICINGAGROUP%%"
 
 icinga_dir="%%ICINGADIR%%"
 icinga_logdir="%%ICINGALOGDIR%%"
 
 pidfile="${icinga_dir}/icinga.lock"
 icinga_logfile="${icinga_logdir}/${name}.log"
 icinga_statusfile="${icinga_dir}/status.sav"
 icinga_cmdfile="${icinga_dir}/rw/${name}.cmd"
 
 start_cmd="start_cmd"
 checkconfig_cmd="icinga_checkconfig verbose"
 configtest_cmd="${checkconfig_cmd}"
 start_precmd="start_precmd"
 stop_postcmd="stop_postcmd"
 restart_precmd="icinga_checkconfig"
 reload_precmd="reload_precmd"
 sig_reload=HUP
 
 required_files="${icinga_configfile}"
 command_args="${command_args} ${icinga_configfile}"
 
 icinga_cacheconfig() {
   if ! checkyesno icinga_precache; then
     return 0
   fi
 
   echo -n "Pre-Caching icinga configuration: "
   ${command} -pv ${icinga_configfile} 2>&1 >/dev/null
   if [ $? != 0 ]; then
     echo "FAILED"
     ${command} -v ${icinga_configfile}
     return 1
   else
     command_args="-u -x ${command_args}"
     echo "OK"
   fi
 }
 
 icinga_checkconfig() {
   echo -n "Performing sanity check of icinga configuration: "
 
   if [ "$1" != "verbose" ]; then
     ${command} -v ${icinga_configfile} 2>&1 >/dev/null
   else
     ${command} -v ${icinga_configfile}
   fi
 
 
   if [ $? != 0 ]; then
     echo "FAILED"
     ${command} -v ${icinga_configfile}
     return 1
   else
     echo "OK"
   fi
 }
 
 reload_precmd() {
   if ! icinga_checkconfig; then
     return 1
   fi
 
   if ! icinga_cacheconfig; then
     return 1
   fi
 }
 
 start_precmd() {
   for d in "${icinga_dir}" \
            "${icinga_dir}/checkresults" \
            "${icinga_logdir}" \
            "${icinga_logdir}/archives"; do
     if [ ! -d "${d}" ]; then
       install -d -o "${icinga_user}" -g "${icinga_group}" "${d}"
     fi
   done
 
   if [ ! -d "${icingadir}/rw" ]; then
     install -d -o "${icinga_user}" -g "%%WWWGRP%%" "${icinga_dir}"/rw
   fi
 
   if ! icinga_checkconfig; then
     return 1
   fi
 
   if ! icinga_cacheconfig; then
     return 1
   fi
 
   if [ ! -f "${icinga_logfile}" ]; then
     install -o "${icinga_user}" -g "${icinga_group}" -m 644 /dev/null "${icinga_logfile}"
   fi
   if [ ! -f "${icinga_statusfile}" ]; then
     install -o "${icinga_user}" -g "${icinga_group}" -m 644 /dev/null "${icinga_statusfile}"
   fi
   rm -f "${icinga_cmdfile}"
 }
 
 stop_postcmd() {
   rm -f "${icinga_dir}/icinga.tmp" "${icinga_cmdfile}"
 }
 
 start_cmd() {
   ${command} ${command_args}
 }
 
 run_rc_command "$1"
Index: head/net-mgmt/icinga-core/files/ido2db.in
===================================================================
--- head/net-mgmt/icinga-core/files/ido2db.in	(revision 447116)
+++ head/net-mgmt/icinga-core/files/ido2db.in	(revision 447117)
@@ -1,37 +1,38 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: ido2db 
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable ido2db:
 # ido2db_enable (bool):    Set to "NO" by default.
 #                          Set it to "YES" to enable ido2db.
 # ido2db_configfile (str): Set to "%%PREFIX%%/etc/icinga/ido2db.cfg" by default.
 
 . /etc/rc.subr
 
 name="ido2db"
+desc="Icinga 1 database connection daemon"
 rcvar=ido2db_enable
 
 load_rc_config "${name}"
 
 : ${ido2db_enable:="NO"}
 : ${ido2db_configfile="%%PREFIX%%/etc/icinga/ido2db.cfg"}
 
 command="%%PREFIX%%/bin/${name}"
 command_args="-c"
 
 start_cmd="start_cmd"
 
 required_files="${ido2db_configfile}"
 command_args="${command_args} ${ido2db_configfile}"
 
 start_cmd() {
   ${command} ${command_args}
 }
 
 run_rc_command "$1"
Index: head/net-mgmt/icinga2/Makefile
===================================================================
--- head/net-mgmt/icinga2/Makefile	(revision 447116)
+++ head/net-mgmt/icinga2/Makefile	(revision 447117)
@@ -1,109 +1,109 @@
 # $FreeBSD$
 
 PORTNAME=	icinga2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Monitoring and management system for hosts, services and networks
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libyajl.so:devel/yajl
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 BROKEN_powerpc64=	does not build: Your version of GCC (4.2.1) is too old for building Icinga 2 (GCC >= 4.6.0)
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 USES=		alias bison cmake execinfo libedit
 USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	${PORTNAME}
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_GROUP=		BACKEND
 OPTIONS_GROUP_BACKEND=	MYSQL PGSQL
 OPTIONS_RADIO=		PLUGINS
 OPTIONS_RADIO_PLUGINS=	MONPLUGINS NAGPLUGINS
 
 OPTIONS_DEFAULT=	MYSQL PGSQL MONPLUGINS
 
 MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
 NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
 
 MYSQL_CMAKE_ON=	-DICINGA2_WITH_MYSQL:BOOL=true
 PGSQL_CMAKE_ON=	-DICINGA2_WITH_PGSQL:BOOL=true
 
 ICINGA2USER?=	icinga
 ICINGA2GROUP?=	icinga
 USERS=		${ICINGA2USER}
 GROUPS=		${ICINGA2GROUP}
 
 LOCALSTATEDIR?=	/var
 ICINGA2LOGDIR?=	/var/log/${PORTNAME}
 
 CMAKE_ARGS+=	-DICINGA2_USER=${ICINGA2USER} \
 		-DICINGA2_GROUP=${ICINGA2GROUP} \
 		-DICINGA2_COMMAND_USER=${ICINGA2USER} \
 		-DICINGA2_COMMAND_GROUP=${ICINGA2USER} \
 		-DICINGA2_PLUGINDIR=${LOCALBASE}/libexec/nagios \
 		-DICINGA2_RUNDIR=/var/run \
 		-DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/etc \
 		-DCMAKE_INSTALL_LOCALSTATEDIR=${LOCALSTATEDIR} \
 		-DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man \
 		-DCMAKE_EXE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
 		-DCMAKE_MODULE_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
 		-DCMAKE_SHARED_LINKER_FLAGS=${PREFIX}/lib/icinga2 \
 		-DCMAKE_STATIC_LINKER_FLAGS=${PREFIX}/lib/icinga2
 
 SUB_LIST=	ICINGA2LOGDIR=${ICINGA2LOGDIR} \
 		ICINGA2USER=${ICINGA2USER} \
 		ICINGA2GROUP=${ICINGA2GROUP} \
 		WWWGRP=${WWWGRP}
 
 PLIST_SUB=	ICINGA2USER=${ICINGA2USER} \
 		ICINGA2GROUP=${ICINGA2GROUP} \
 		WWWGRP=${WWWGRP}
 
 SUB_FILES=	pkg-message ${PORTNAME}-newsyslog
 
 # Config files with references to "Linux"
 LINUX_CONFIG=	groups.conf services.conf hosts.conf
 
 MYSQL_USES=	mysql
 PGSQL_USES=	pgsql
 
 OPTIONS_SUB=	yes
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL}
 PLIST_SUB+=	DBBACKEND="@comment "
 .else
 PLIST_SUB+=	DBBACKEND=""
 .endif
 
 post-patch:
 .for f in ${LINUX_CONFIG}
 	${REINPLACE_CMD} 's,[Ll]inux,FreeBSD,g' ${WRKSRC}/etc/icinga2/conf.d/${f}
 .endfor
 
 pre-install:
 	${FIND} ${WRKSRC}/etc -type f -name "*.conf" -exec ${MV} {} {}.sample \;
 	${FIND} ${WRKSRC}/etc/icinga2/scripts -type f -name "*.sh" \
 		-exec ${MV} {} {}.sample \;
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/newsyslog/
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-newsyslog ${STAGEDIR}${EXAMPLESDIR}/newsyslog/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	(cd ${WRKSRC}/tools/syntax/vim && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${PREFIX}/share/vim/vimfiles)
 
 .include <bsd.port.mk>
Index: head/net-mgmt/icinga2/files/icinga2.in
===================================================================
--- head/net-mgmt/icinga2/files/icinga2.in	(revision 447116)
+++ head/net-mgmt/icinga2/files/icinga2.in	(revision 447117)
@@ -1,122 +1,123 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: icinga2
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable icinga2:
 # icinga2_enable (bool):    Set to "NO" by default.
 #                           Set it to "YES" to enable icinga2.
 # icinga2_flags (str):      Set to "" by default.
 # icinga2_configfile (str): Set to "%%PREFIX%%/etc/icinga2/icinga2.cfg" by default.
 # icinga2_mkvar (bool):     Set to "NO" by default.
 #                           Set it to "YES" to have the rc script create all
 #                           directories in /var (needed when /var is on a ramdisk)
 #
 
 . /etc/rc.subr
 
 # Add /usr/local/bin to path, so that the notification scripts 
 # can work (#!/usr/bin/env bash)
 export PATH=$PATH:%%LOCALBASE%%/bin:%%PREFIX%%/sbin
 
 name="icinga2"
+desc="Icinga 2 monitoring (core)"
 rcvar=icinga2_enable
 
 load_rc_config "${name}"
 
 : ${icinga2_enable:="NO"}
 : ${icinga2_configfile="%%PREFIX%%/etc/${name}/${name}.conf"}
 : ${icinga2_mkvar:="NO"}
 
 command="%%PREFIX%%/sbin/${name}"
 procname="/usr/local/lib/icinga2/sbin/icinga2"
 extra_commands="reload checkconfig configtest"
 icinga2_user="%%ICINGA2USER%%"
 icinga2_group="%%ICINGA2GROUP%%"
 
 icinga2_cachedir="/var/cache/${name}"
 icinga2_libdir="/var/lib/${name}"
 icinga2_logdir="%%ICINGA2LOGDIR%%"
 icinga2_rundir="/var/run/${name}"
 icinga2_spooldir="/var/spool/${name}"
 
 pidfile="${icinga2_rundir}/${name}.pid"
 icinga2_logfile="${icinga2_logdir}/${name}.log"
 icinga2_errorlogfile="${icinga2_logdir}/error.log"
 
 start_cmd="start_cmd"
 start_precmd="start_precmd"
 restart_precmd="icinga2_checkconfig"
 reload_precmd="reload_precmd"
 checkconfig_cmd="icinga2_checkconfig verbose"
 configtest_cmd="${checkconfig_cmd}"
 sig_reload=HUP
 
 required_files="${icinga2_configfile}"
 command_args="daemon -d -e ${icinga2_errorlogfile} -c ${icinga2_configfile}"
 
 icinga2_checkconfig() {
   echo -n "Performing sanity check of icinga2 configuration: "
 
   if [ "$1" != "verbose" ]; then
     quietredir="2>&1 >/dev/null"
   fi
 
   ${command} daemon -c ${icinga2_configfile} -C
 
   if [ $? -ne 0 ]; then
     echo "FAILED"
     return 1
   else
     echo "OK"
   fi
 }
 
 reload_precmd() {
   if ! icinga2_checkconfig; then
     return 1
   fi
 }
 
 start_precmd() {
   if checkyesno "icinga2_mkvar"; then
     # Create necessary directories / change ownership
     # 
     # While this is also done through pkg-plist, /var might be on a ramdisk,
     # so make sure all needed files and directories are created before starting
     # Icinga.
     for d in "${icinga2_logdir}" "${icinga2_logdir}/compat" \
              "${icinga2_logdir}/compat/archives" "${icinga2_libdir}" \
              "${icinga2_spooldir}" "${icinga2_spooldir}/tmp" \
              "${icinga2_rundir}" "${icinga2_cachedir}"; do
         if [ ! -d "${d}" ]; then
           install -d -o ${icinga2_user} -g ${icinga2_group} "${d}"
         else
           chown ${icinga2_user}:${icinga2_group} "${d}"
         fi
     done
 
     install -d -o ${icinga2_user} -g %%WWWGRP%% "${icinga2_rundir}/cmd" 
 
     chown -R ${icinga2_user}:${icinga2_user} "${icinga2_libdir}"
     chown -R ${icinga2_user}:${icinga2_user} "${icinga2_spooldir}"
   fi
 
   if ! icinga2_checkconfig; then
     return 1
   fi
 
   if [ ! -f "${icinga2_logfile}" ]; then
     install -o "${icinga2_user}" -g "${icinga2_group}" -m 644 /dev/null "${icinga2_logfile}"
   fi
 }
 
 start_cmd() {
   ${command} ${command_args}
 }
 
 run_rc_command "$1"
Index: head/net-mgmt/pnp/Makefile
===================================================================
--- head/net-mgmt/pnp/Makefile	(revision 447116)
+++ head/net-mgmt/pnp/Makefile	(revision 447117)
@@ -1,105 +1,105 @@
 # Created by: rea-fbsd@codelabs.ru
 # $FreeBSD$
 
 PORTNAME=	pnp
 PORTVERSION=	0.6.25
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/pnp4nagios/PNP-0.6
 DISTNAME=	pnp4nagios-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER?=	lme@FreeBSD.org
 COMMENT?=	Nagios / Icinga performance data collector and grapher
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/rrdtool:databases/rrdtool
 RUN_DEPENDS?=	${LOCALBASE}/bin/rrdtool:databases/rrdtool \
 		nagios:net-mgmt/nagios
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		dos2unix perl5 php php:web
 
 OPTIONS_DEFINE=	PDF
 OPTIONS_DEFAULT=	PDF
 PDF_DESC=	Use built-in fpdf library to produce PDF views
 
 .include <bsd.port.options.mk>
 
 USE_PHP=	gd iconv json pcre session simplexml sockets xml zlib
 
 USE_RC_SUBR=	npcd
 
 DOS2UNIX_REGEX=	'.*\.\(php\|js\|txt\)$$'
 
 NAGIOSDIR?=	/var/spool/nagios
 NAGIOSHTMURL?=	/nagios
 NAGIOSUSER?=	nagios
 NAGIOSGROUP?=	nagios
 PNP_STATE=	${NAGIOSDIR}/pnp
 PNP_RRDS=	${PNP_STATE}/rrd
 PNP_SPOOL=	${PNP_STATE}/perfspool
 PNP_URL?=	${NAGIOSHTMURL}/pnp
 FPDF_DIR?=	share/fpdf
 
 PDF_EXTRA_PATCHES_OFF+=	${FILESDIR}/extra-patch-disable-pdf
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
 	--sysconfdir=${ETCDIR} \
 	--datarootdir=${WWWDIR} \
 	--datadir=${WWWDIR} \
 	--localstatedir=/var/log \
 	--with-rrdtool=${LOCALBASE}/bin/rrdtool \
 	--with-perfdata-dir=${PNP_RRDS} \
 	--with-perfdata-spool-dir=${PNP_SPOOL} \
 	--with-nagios-user=${NAGIOSUSER} \
 	--with-nagios-group=${NAGIOSGROUP}
 # Get rid of INSTALL_OPTS that are set by configure --
 # we want the things to be installed with root:wheel and
 # NAGIOSUSER:NAGIOSGROUP are going to the configuration files.
 MAKE_ARGS=	INSTALL_OPTS=
 INSTALL_TARGET=	install install-config
 
 PLIST_SUB+=	NAGIOSDIR=${NAGIOSDIR} \
 		NAGIOSUSER=${NAGIOSUSER} \
 		NAGIOSGROUP=${NAGIOSGROUP} \
 		WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PNP_RRDS=${PNP_RRDS} \
 		PNP_URL=${PNP_URL} \
 		NAGIOSUSER=${NAGIOSUSER} \
 		NAGIOSGROUP=${NAGIOSGROUP}
 
 SAMPLE_CONFIGS=	lighttpd.pnp4nagios.conf nginx.pnp4nagios.conf httpd.conf
 
 .if ${PORT_OPTIONS:MPDF}
 PNP_USE_FPDF=	1
 .else
 PNP_USE_FPDF=	0
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
   -e's|^\$$conf\['\''use_fpdf'\''\] = [[:digit:]];|$$conf['\''use_fpdf'\''] = ${PNP_USE_FPDF};|' \
   -e's|^\$$conf\['\''nagios_base'\''\] = "/nagios/cgi-bin";|$$conf\['\''nagios_base'\''\] = "${NAGIOSHTMURL}/cgi-bin";|' \
   -e's|/usr/local/check_mk/|/usr/local/share/check_mk/|g' \
   -e's|/usr/local/nagios/var/rw/live|/${NAGIOSDIR}/rw/live|' \
   "${WRKSRC}/sample-config/pnp/config.php.in"
 .for f in ${SAMPLE_CONFIGS}
 	@${REINPLACE_CMD} -e 's|@BASE_URL@|${PNP_URL}|g' -e 's|@datarootdir@|${WWWDIR}|g' \
   -e 's|/usr/local/nagios/etc|${PREFIX}/etc/${NAGIOSUSER}|' -e 's|Nagios|${NAGIOSUSER}|' \
   "${WRKSRC}/sample-config/${f}.in"
 .endfor
 	@${LN} -fs ../en_US/dwnld.html ${WRKSRC}/share/pnp/documents/de_DE/dwnld.html
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ${SAMPLE_CONFIGS}
 	${INSTALL_DATA} ${WRKSRC}/sample-config/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/man/npcd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
 
 .include <bsd.port.mk>
Index: head/net-mgmt/pnp/files/npcd.in
===================================================================
--- head/net-mgmt/pnp/files/npcd.in	(revision 447116)
+++ head/net-mgmt/pnp/files/npcd.in	(revision 447117)
@@ -1,36 +1,37 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: npcd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable/tune npcd:
 # npcd_enable (bool):    Set to "NO" by default.
 #                        Set it to "YES" to enable npcd.
 # npcd_flags (str):      Set to "" by default.
 # npcd_configfile (str): Set to "%%PREFIX%%/etc/pnp/npcd.cfg" by default.
 #
 
 . /etc/rc.subr
 
 name="npcd"
+desc="Nagios performance C daemon"
 rcvar=npcd_enable
 
 command="%%PREFIX%%/bin/npcd"
 command_args="-d"
 pidfile=/var/run/${name}.pid
 
 : ${npcd_enable="NO"}
 : ${npcd_configfile:="%%PREFIX%%/etc/pnp/npcd.cfg"}
 
 load_rc_config "${name}"
 
 required_files="${npcd_configfile}"
 command_args="${command_args} -f ${npcd_configfile}"
 
 run_rc_command "$1"
Index: head/www/dhttpd/Makefile
===================================================================
--- head/www/dhttpd/Makefile	(revision 447116)
+++ head/www/dhttpd/Makefile	(revision 447117)
@@ -1,38 +1,39 @@
 # Created by: Gea-Suan Lin <gslin@ccca.nctu.edu.tw>
 # $FreeBSD$
 
 PORTNAME=	dhttpd
 PORTVERSION=	1.02a
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://bsd-geek.de/FreeBSD/distfiles/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Minimal secure webserver. Fast and efficient, no cgi-bin support
 
 LICENSE=	GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.02-4
 BUILD_WRKSRC=	${WRKSRC}/src
 
 PLIST_FILES=	sbin/dhttpd man/man1/dhttpd.1.gz
 
 USE_RC_SUBR=	dhttpd
 
 pre-everything::
 	@${ECHO_MSG} "=============================================================="
 	@${ECHO_MSG} "To change the default document root"
 	@${ECHO_MSG} "${PREFIX}/www/data edit"
 	@${ECHO_MSG} "${FILESDIR}/patch-config.hh"
 	@${ECHO_MSG} "for your needs and re-compile dhhtpd."
 	@${ECHO_MSG} "=============================================================="
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/src/config.hh \
 		${WRKSRC}/dhttpd.1
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
 
 .include <bsd.port.mk>
Index: head/www/dhttpd/files/dhttpd.in
===================================================================
--- head/www/dhttpd/files/dhttpd.in	(revision 447116)
+++ head/www/dhttpd/files/dhttpd.in	(revision 447117)
@@ -1,25 +1,26 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: dhttpd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable dhttpd:
 #
 # dhttpd_enable (bool):	Set it to "YES" to enable dhttpd
 #
 
 . /etc/rc.subr
 
 name="dhttpd"
+desc="Secure and efficient personal HTTP server"
 rcvar=dhttpd_enable
 
 load_rc_config $name
 
 : ${dhttpd_enable="NO"}
 
 command=%%PREFIX%%/sbin/${name}
 
 run_rc_command "$1"