2 files changed, 59 insertions, 59 deletions

diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index 6e102dbf31be..d796ee3fec92 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mrtg
 PORTVERSION=	2.16.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
@@ -15,11 +15,12 @@ MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
 		ftp://ftp.nstu.ru/pub/sources/nettools/monitoring/ \
 		ftp://ftp.chg.ru/pub/networking/monitoring/mrtg/
 
-MAINTAINER=	mrtg@subnets.ru
+MAINTAINER=	ports@subnets.ru
 COMMENT=	The multi-router traffic grapher
 
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
-RUN_DEPENDS=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
+RUN_DEPENDS=	${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser \
+		${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session
 
 CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
 		--with-gd-inc=${LOCALBASE}/include
@@ -63,7 +64,7 @@ EXAMPLES=	cfgmaker.pod indexmaker.pod mrtg-contrib.pod mrtg-faq.pod \
 		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
+SCRIPTS=	cfgmaker indexmaker mrtg mrtg-traffic-sum
 
 OPTIONS=	IPV6 "Enable IPv6 support" OFF \
 		SNMP "Enable use of SNMPv3" OFF
@@ -75,8 +76,6 @@ 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:
diff --git a/net-mgmt/mrtg/pkg-plist b/net-mgmt/mrtg/pkg-plist
index 05c8bd24e9a3..0eab9473824f 100644
--- a/net-mgmt/mrtg/pkg-plist
+++ b/net-mgmt/mrtg/pkg-plist
@@ -1,6 +1,7 @@
 bin/cfgmaker
 bin/indexmaker
 bin/mrtg
+bin/mrtg-traffic-sum
 bin/rateup
 %%SITE_PERL%%/MRTG_lib.pm
 %%SITE_PERL%%/Net_SNMP_util.pm
@@ -10,59 +11,59 @@ bin/rateup
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/MANIFEST
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%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
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/cfgmaker.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/cfgmaker.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/indexmaker.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/indexmaker.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-contrib.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-contrib.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-faq.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-faq.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-forum.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-forum.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-ipv6.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-ipv6.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-l.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-logfile.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-logfile.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-m.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-mibhelp.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-mibhelp.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-nt-guide.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-nt-guide.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-nw-guide.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-nw-guide.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-r.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-reference.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-reference.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-rrd.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-rrd.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-squid.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-squid.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-ti.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-unix-guide.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-unix-guide.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-webserver.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-webserver.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtglib.pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtglib.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-l.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-m.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doc/mrtg-r.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/favicon.ico
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/mrtg-l.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/mrtg-l.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/mrtg-m.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/mrtg-m.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/mrtg-r.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/mrtg-r.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/mrtg-ti.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/images/mrtg-ti.png
 @dirrmtry /var/run/mrtg
 @dirrmtry %%ETCDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/images
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/doc
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/doc
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%