7 files changed, 160 insertions, 160 deletions

diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index c328a1b5d568..3d36f9df5a26 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mrtg
-PORTVERSION=	2.15.2
+PORTVERSION=	2.16.0
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
@@ -18,20 +18,29 @@ MAINTAINER=	demon@FreeBSD.org
 COMMENT=	The multi-router traffic grapher
 
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
-RUN_DEPENDS=	${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
-		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
+RUN_DEPENDS=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
 
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
 		--with-gd-inc=${LOCALBASE}/include
 
 USE_PERL5=	YES
 MAKE_ENV+=	PERL=${PERL}
+MRTG_USER?=	mrtg
+MRTG_GROUP?=	mrtg
+MRTG_UID?=	279
+MRTG_GID?=	279
+MRTG_RUNDIR?=   /var/run/mrtg
 
 USE_RC_SUBR=	mrtg_daemon.sh
-SUB_LIST+=	PERL=${PERL}
+SUB_FILES=	pkg-install pkg-message
+SUB_LIST=	ETCDIR=${ETCDIR} \
+		MRTG_USER=${MRTG_USER} \
+		MRTG_GROUP=${MRTG_GROUP} \
+		MRTG_UID=${MRTG_UID} \
+		MRTG_GID=${MRTG_GID} \
+		MRTG_RUNDIR=${MRTG_RUNDIR}
 
 GNU_CONFIGURE=	YES
-
 CONFIGURE_ENV=	PERL=${PERL}
 
 MAN1=		cfgmaker.1 indexmaker.1 mrtg-contrib.1 mrtg-faq.1 mrtg-forum.1 \
@@ -39,52 +48,66 @@ MAN1=		cfgmaker.1 indexmaker.1 mrtg-contrib.1 mrtg-faq.1 mrtg-forum.1 \
 		mrtg-nw-guide.1 mrtg-reference.1 mrtg-rrd.1 mrtg-squid.1 \
 		mrtg-unix-guide.1 mrtg-webserver.1 mrtg.1 mrtglib.1
 
-OPTIONS=	IPV6 "Enable IPv6 support" OFF
+DOCS=		CHANGES COPYRIGHT MANIFEST README
+EXAMPLES=	cfgmaker.pod indexmaker.pod mrtg-contrib.pod mrtg-faq.pod \
+		mrtg-forum.pod mrtg-ipv6.pod mrtg-logfile.pod mrtg-mibhelp.pod \
+		mrtg-nt-guide.pod mrtg-nw-guide.pod mrtg-reference.pod \
+		mrtg-rrd.pod mrtg-squid.pod mrtg-unix-guide.pod mrtg.pod \
+		mrtg-webserver.pod mrtglib.pod cfgmaker.txt indexmaker.txt \
+		mrtg-contrib.txt mrtg-faq.txt mrtg-forum.txt mrtg-ipv6.txt \
+		mrtg-logfile.txt mrtg-mibhelp.txt mrtg-nt-guide.txt \
+		mrtg-nw-guide.txt mrtg-reference.txt mrtg-rrd.txt \
+		mrtg-squid.txt mrtg-unix-guide.txt mrtg-webserver.txt \
+		mrtg.txt mrtglib.txt mrtg-l.png mrtg-m.png mrtg-r.png \
+		mrtg-ti.png mrtg-l.gif mrtg-m.gif mrtg-r.gif
+IMAGES=		favicon.ico mrtg-l.gif mrtg-l.png mrtg-m.gif mrtg-m.png \
+		mrtg-r.gif mrtg-r.png mrtg-ti.gif mrtg-ti.png
+SCRIPTS=	cfgmaker indexmaker mrtg
+
+OPTIONS=	IPV6 "Enable IPv6 support" OFF \
+		SNMP "Enable use of SNMPv3" OFF
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IPV6)
 RUN_DEPENDS+=	${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6
 .endif
+.if defined(WITH_SNMP)
+RUN_DEPENDS+=	${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP
+.else
+RUN_DEPENDS+=	${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session
+.endif
 
 post-patch:
 	${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm
 
-pre-install:
-		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+pre-configure:
+	${SED} -e 's,%%MRTG_USER%%,${MRTG_USER},g;' \
+		-e 's,%%MRTG_GROUP%%,${MRTG_GROUP},g;' \
+		-e 's,%%MRTG_UID%%,${MRTG_UID},g;' \
+		-e 's,%%MRTG_GID%%,${MRTG_GID},g;' \
+		-e 's,%%MRTG_RUNDIR%%,${MRTG_RUNDIR},g;' \
+		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
+	${SETENV} @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \
+		PRE-INSTALL
 
 do-install:
-		${MKDIR} -m 755 ${ETCDIR}
-		${MKDIR} -m 755 ${DATADIR}
 .if !defined(NOPORTDOCS)
-		${MKDIR} -m 755 ${DOCSDIR}
-		for file in CHANGES COPYRIGHT MANIFEST README \
-			doc/*.pod doc/*.txt doc/*.png ; do \
-			${INSTALL_DATA} ${WRKSRC}/$$file ${DOCSDIR}; \
-		done
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	@${MKDIR} ${EXAMPLESDIR}/doc ${EXAMPLESDIR}/images
+	@${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR}/doc/
+	@${INSTALL_DATA} ${IMAGES:S,^,${WRKSRC}/images/,} ${EXAMPLESDIR}/images/
 .endif
-		${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${ETCDIR}/mrtg.cfg.sample
-		${INSTALL_DATA} ${WRKSRC}/images/* ${DATADIR}
-		${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
-		${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/*.pm ${SITE_PERL}
-		${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/bin/
-		for file in mrtg cfgmaker indexmaker; do \
-			${INSTALL_SCRIPT} ${WRKSRC}/bin/$$file ${PREFIX}/bin/; \
-		done
+	@${MKDIR} ${ETCDIR}
+	@${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${ETCDIR}/mrtg.cfg.sample
+	@${INSTALL_DATA} ${MAN1:S,^,${WRKSRC}/doc/,} ${MAN1PREFIX}/man/man1
+	@${CP} -p ${WRKSRC}/lib/mrtg2/*.pm ${SITE_PERL}/
+	@${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/bin/,} ${PREFIX}/bin
 
 post-install:
-		@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if !defined(BATCH)
-	@${ECHO} ""
-	@${ECHO} "############################################################################"
-	@${ECHO} "# Please create a MRTG config file in ${ETCDIR}                  #"
-	@${ECHO} "# A configuration file can be automatically generated with cfgmaker        #"
-	@${ECHO} "# A sample configuration file is installed as mrtg.cfg.sample              #"
-	@${ECHO} "#                                                                          #"
-	@${ECHO} "# To enable MRTG in daemon mode, put the following to your /etc/rc.conf or #"
-	@${ECHO} "# /etc/rc.conf.local file:                                                 #"
-	@${ECHO} "#      mrtg_daemon_enable=\"YES\"                                            #"
-	@${ECHO} "############################################################################"
-.endif
+	@${SETENV} @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/mrtg/distinfo b/net-mgmt/mrtg/distinfo
index af2eed8187ed..fab57856175d 100644
--- a/net-mgmt/mrtg/distinfo
+++ b/net-mgmt/mrtg/distinfo
@@ -1,3 +1,3 @@
-MD5 (mrtg-2.15.2.tar.gz) = 5827175dd5ee941c2ae894369f0c9071
-SHA256 (mrtg-2.15.2.tar.gz) = 3456f358c1ea5ae5182153169c3effd2cd4b071c4d12f36e03947a62372f87ab
-SIZE (mrtg-2.15.2.tar.gz) = 1070900
+MD5 (mrtg-2.16.0.tar.gz) = 568c8f3d7eca2d20607aa7ea7281f897
+SHA256 (mrtg-2.16.0.tar.gz) = 97b2788b82d67960260ee9366fc3f84794442fdb3d111480218c6b1560c50fa1
+SIZE (mrtg-2.16.0.tar.gz) = 1078505
diff --git a/net-mgmt/mrtg/files/patch-bin_mrtg b/net-mgmt/mrtg/files/patch-bin_mrtg
deleted file mode 100644
index 1632c4dd6ba9..000000000000
--- a/net-mgmt/mrtg/files/patch-bin_mrtg
+++ /dev/null
@@ -1,22 +0,0 @@
---- bin/mrtg.old	Fri Aug 18 13:02:42 2006
-+++ bin/mrtg	Fri Aug 18 13:04:08 2006
-@@ -174,11 +174,17 @@
-     my $gid = $(;
- 
-     if (defined $opts{group}) {
--        $gid = getgrnam($opts{group}) or die "$NOW: ERROR: Unknown Group: $opts{group})\n";
-+	$gid = getgrnam($opts{group});
-+	if( $gid =~ /^$/ ) {
-+		die "ERROR: Unknown Group: $opts{group}\n";
-+	}
-     }
- 
-     if (defined $opts{user}) {
--        $uid = getpwnam($opts{user}) or die "$NOW: ERROR: Unknown User: $opts{user})\n";
-+	$uid = getpwnam($opts{user});
-+	if( $uid =~ /^$/ ) {
-+		die "ERROR: Unknown User: $opts{user}\n";
-+	}
-     }
- 
-     # If we've specified using FHS (http://www.pathname.com/fhs/) on the command line,
diff --git a/net-mgmt/mrtg/files/pkg-install.in b/net-mgmt/mrtg/files/pkg-install.in
new file mode 100644
index 000000000000..3fd67ec9d604
--- /dev/null
+++ b/net-mgmt/mrtg/files/pkg-install.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+# $FreeBSD$
+#
+
+PW="/usr/sbin/pw"
+CHOWN="/usr/sbin/chown"
+CHMOD="/bin/chmod"
+MKDIR="/bin/mkdir -p"
+NOLOGIN="/usr/sbin/nologin"
+
+MRTG_USER=%%MRTG_USER%%
+MRTG_GROUP=%%MRTG_GROUP%%
+MRTG_UID=%%MRTG_UID%%
+MRTG_GID=%%MRTG_GID%%
+MRTG_RUNDIR=%%MRTG_RUNDIR%%
+
+case "$2" in
+	
+PRE-INSTALL)
+  ${PW} groupshow -n ${MRTG_GROUP} >/dev/null 2>&1 \
+    || ${PW} groupadd -n ${MRTG_GROUP} -g ${MRTG_GID}
+  ${PW} usershow -n ${MRTG_USER} >/dev/null 2>&1 \
+    || ${PW} useradd ${MRTG_USER} -g ${MRTG_GROUP} -u ${MRTG_UID} -s ${NOLOGIN}
+  ;;
+
+POST-INSTALL)
+	if [ ! -d "$MRTG_RUNDIR" ]; then
+		${MKDIR} $MRTG_RUNDIR
+	fi
+
+	${CHOWN} -R ${MRTG_USER}:${MRTG_USER} ${MRTG_RUNDIR}
+	${CHMOD} 0700 ${MRTG_RUNDIR}
+	;;
+esac
+exit 0
diff --git a/net-mgmt/mrtg/files/pkg-message.in b/net-mgmt/mrtg/files/pkg-message.in
new file mode 100644
index 000000000000..7dffc34d53db
--- /dev/null
+++ b/net-mgmt/mrtg/files/pkg-message.in
@@ -0,0 +1,8 @@
+############################################################################
+# Please create a MRTG config file in %%ETCDIR%%                  #
+# A configuration file can be automatically generated with cfgmaker        #
+# A sample configuration file is installed as mrtg.cfg.sample              #
+#                                                                          #
+# To enable MRTG in daemon mode, put the following to your /etc/rc.conf:   #
+#      mrtg_daemon_enable="YES"                                            #
+############################################################################
diff --git a/net-mgmt/mrtg/pkg-install b/net-mgmt/mrtg/pkg-install
deleted file mode 100644
index 5aee623c9c0e..000000000000
--- a/net-mgmt/mrtg/pkg-install
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#
-
-case "$2" in
-	
-PRE-INSTALL)
-	USER=mrtg
-	GROUP=${USER}
-	UID=279
-	GID=${UID}
-
-	if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
-		if pw groupadd ${GROUP} -g ${GID}; then
-			echo "Added group \"${GROUP}\"."
-		else
-			echo "Adding group \"${GROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
-		if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-			-s "/sbin/nologin" -d "/nonexistent" \
-			-c "MRTG daemon"; \
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-	;;
-
-POST-INSTALL)
-	rundir=/var/run/mrtg
-
-	if [ ! -d "$rundir" ]; then
-		mkdir -p $rundir
-		echo "Created directory: ${rundir}"
-	fi
-
-	chown -R mrtg:mrtg $rundir
-	chmod 0700 $rundir
-	;;
-	
-esac
-
-exit 0
diff --git a/net-mgmt/mrtg/pkg-plist b/net-mgmt/mrtg/pkg-plist
index 96b6f2701e80..05c8bd24e9a3 100644
--- a/net-mgmt/mrtg/pkg-plist
+++ b/net-mgmt/mrtg/pkg-plist
@@ -2,62 +2,67 @@ bin/cfgmaker
 bin/indexmaker
 bin/mrtg
 bin/rateup
-%%ETCDIR%%/mrtg.cfg.sample
 %%SITE_PERL%%/MRTG_lib.pm
 %%SITE_PERL%%/Net_SNMP_util.pm
 %%SITE_PERL%%/locales_mrtg.pm
+%%ETCDIR%%/mrtg.cfg.sample
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/MANIFEST
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/cfgmaker.pod
-%%PORTDOCS%%%%DOCSDIR%%/cfgmaker.txt
-%%PORTDOCS%%%%DOCSDIR%%/indexmaker.pod
-%%PORTDOCS%%%%DOCSDIR%%/indexmaker.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-contrib.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-contrib.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-faq.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-faq.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-forum.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-forum.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-ipv6.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-ipv6.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-l.png
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-logfile.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-logfile.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-m.png
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-mibhelp.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-mibhelp.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-nt-guide.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-nt-guide.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-nw-guide.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-nw-guide.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-r.png
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-reference.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-reference.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-rrd.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-rrd.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-squid.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-squid.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-ti.png
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-unix-guide.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-unix-guide.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-webserver.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtg-webserver.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtg.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtg.txt
-%%PORTDOCS%%%%DOCSDIR%%/mrtglib.pod
-%%PORTDOCS%%%%DOCSDIR%%/mrtglib.txt
-%%DATADIR%%/favicon.ico
-%%DATADIR%%/mrtg-l.gif
-%%DATADIR%%/mrtg-l.png
-%%DATADIR%%/mrtg-m.gif
-%%DATADIR%%/mrtg-m.png
-%%DATADIR%%/mrtg-r.gif
-%%DATADIR%%/mrtg-r.png
-%%DATADIR%%/mrtg-ti.gif
-%%DATADIR%%/mrtg-ti.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/cfgmaker.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/cfgmaker.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/indexmaker.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/indexmaker.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-contrib.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-contrib.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-faq.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-faq.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-forum.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-forum.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-ipv6.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-ipv6.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-l.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-logfile.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-logfile.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-m.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-mibhelp.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-mibhelp.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-nt-guide.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-nt-guide.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-nw-guide.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-nw-guide.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-r.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-reference.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-reference.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-rrd.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-rrd.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-squid.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-squid.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-ti.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-unix-guide.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-unix-guide.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-webserver.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-webserver.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtglib.pod
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtglib.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-l.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-m.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/doc/mrtg-r.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/images/favicon.ico
+%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-l.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-l.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-m.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-m.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-r.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-r.png
+%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-ti.gif
+%%PORTDOCS%%%%EXAMPLESDIR%%/images/mrtg-ti.png
+@dirrmtry /var/run/mrtg
 @dirrmtry %%ETCDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%
-@dirrmtry /var/run/mrtg
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/images
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/doc
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%