Update to version 2.10.13.

3 files changed, 39 insertions, 47 deletions

diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index d48b5569ffa3..847199c1ddd5 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mrtg
-PORTVERSION=	2.10.5
-PORTREVISION=	1
+PORTVERSION=	2.10.13
 PORTEPOCH=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/mrtg/pub/ \
@@ -22,6 +21,7 @@ MAINTAINER=	demon@FreeBSD.org
 COMMENT=	The multi-router traffic grapher
 
 RUN_DEPENDS=	${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net/p5-SNMP_Session \
+		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \
 		${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-INET6
 
 .if defined(WITH_GD1)
@@ -41,9 +41,10 @@ GNU_CONFIGURE=	YES
 
 CONFIGURE_ENV=	PERL=${PERL}
 
-MAN1=		cfgmaker.1 contrib.1 faq.1 forum.1 indexmaker.1 logfile.1 \
-		mibhelp.1 mrtg.1 mrtg-ipv6.1 mrtg-rrd.1 mrtglib.1 nt-guide.1 \
-		reference.1 squid.1 unix-guide.1 webserver.1
+MAN1=		cfgmaker.1 indexmaker.1 mrtg-contrib.1 mrtg-faq.1 mrtg-forum.1 \
+		mrtg-ipv6.1 mrtg-logfile.1 mrtg-mibhelp.1 mrtg-nt-guide.1 \
+		mrtg-reference.1 mrtg-rrd.1 mrtg-squid.1 mrtg-unix-guide.1 \
+		mrtg-webserver.1 mrtg.1 mrtglib.1
 
 post-patch:
 	${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm
@@ -55,8 +56,6 @@ post-patch:
 
 do-install:
 		${MKDIR} -m 755 ${PREFIX}/etc/mrtg
-		${MKDIR} -m 755 ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
-		${MKDIR} -m 755 ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Pod
 		${MKDIR} -m 755 ${DATADIR}
 .if !defined(NOPORTDOCS)
 		${MKDIR} -m 755 ${DOCSDIR}
@@ -68,8 +67,7 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${PREFIX}/etc/mrtg/mrtg.cfg.sample
 		${INSTALL_DATA} ${WRKSRC}/images/* ${DATADIR}
 		${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
-		${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/*.pm ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
-		${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/Pod/*.pm ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Pod
+		${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/; \
@@ -79,7 +77,7 @@ post-install:
 .if !defined(BATCH)
 	@${ECHO} ""
 	@${ECHO} "############################################################################"
-	@${ECHO} "# Please create a MRTG config file in ${PREFIX}/etc/mrtg                   #"
+	@${ECHO} "# Please create a MRTG config file in ${PREFIX}/etc/mrtg                  #"
 	@${ECHO} "# A configuration file can be automatically generated with cfgmaker        #"
 	@${ECHO} "# A sample configuration file is installed as mrtg.cfg.sample              #"
 	@${ECHO} "############################################################################"
diff --git a/net/mrtg/distinfo b/net/mrtg/distinfo
index b9f385f4e86f..4b0119a6ffe7 100644
--- a/net/mrtg/distinfo
+++ b/net/mrtg/distinfo
@@ -1 +1 @@
-MD5 (mrtg-2.10.5.tar.gz) = 5657edcdc3ca0af2d4e063867dbd1529
+MD5 (mrtg-2.10.13.tar.gz) = 978f2b55d74e6485662c9bd9a65c2f23
diff --git a/net/mrtg/pkg-plist b/net/mrtg/pkg-plist
index 949875428795..29c6865542c7 100644
--- a/net/mrtg/pkg-plist
+++ b/net/mrtg/pkg-plist
@@ -4,11 +4,6 @@ bin/mrtg
 bin/rateup
 etc/mrtg/mrtg.cfg.sample
 %%SITE_PERL%%/MRTG_lib.pm
-%%SITE_PERL%%/Pod/InputObjects.pm
-%%SITE_PERL%%/Pod/Parser.pm
-%%SITE_PERL%%/Pod/PlainText.pm
-%%SITE_PERL%%/Pod/Select.pm
-%%SITE_PERL%%/Pod/Usage.pm
 %%SITE_PERL%%/locales_mrtg.pm
 %%PORTDOCS%%share/doc/mrtg/ANNOUNCE
 %%PORTDOCS%%share/doc/mrtg/CHANGES
@@ -18,58 +13,58 @@ etc/mrtg/mrtg.cfg.sample
 %%PORTDOCS%%share/doc/mrtg/cfgmaker.html
 %%PORTDOCS%%share/doc/mrtg/cfgmaker.pod
 %%PORTDOCS%%share/doc/mrtg/cfgmaker.txt
-%%PORTDOCS%%share/doc/mrtg/contrib.html
-%%PORTDOCS%%share/doc/mrtg/contrib.pod
-%%PORTDOCS%%share/doc/mrtg/contrib.txt
-%%PORTDOCS%%share/doc/mrtg/faq.html
-%%PORTDOCS%%share/doc/mrtg/faq.pod
-%%PORTDOCS%%share/doc/mrtg/faq.txt
-%%PORTDOCS%%share/doc/mrtg/forum.html
-%%PORTDOCS%%share/doc/mrtg/forum.pod
-%%PORTDOCS%%share/doc/mrtg/forum.txt
 %%PORTDOCS%%share/doc/mrtg/index.html
 %%PORTDOCS%%share/doc/mrtg/index.txt
 %%PORTDOCS%%share/doc/mrtg/index.wml
 %%PORTDOCS%%share/doc/mrtg/indexmaker.html
 %%PORTDOCS%%share/doc/mrtg/indexmaker.pod
 %%PORTDOCS%%share/doc/mrtg/indexmaker.txt
-%%PORTDOCS%%share/doc/mrtg/logfile.html
-%%PORTDOCS%%share/doc/mrtg/logfile.pod
-%%PORTDOCS%%share/doc/mrtg/logfile.txt
-%%PORTDOCS%%share/doc/mrtg/mibhelp.html
-%%PORTDOCS%%share/doc/mrtg/mibhelp.pod
-%%PORTDOCS%%share/doc/mrtg/mibhelp.txt
+%%PORTDOCS%%share/doc/mrtg/mrtg-contrib.html
+%%PORTDOCS%%share/doc/mrtg/mrtg-contrib.pod
+%%PORTDOCS%%share/doc/mrtg/mrtg-contrib.txt
+%%PORTDOCS%%share/doc/mrtg/mrtg-faq.html
+%%PORTDOCS%%share/doc/mrtg/mrtg-faq.pod
+%%PORTDOCS%%share/doc/mrtg/mrtg-faq.txt
+%%PORTDOCS%%share/doc/mrtg/mrtg-forum.html
+%%PORTDOCS%%share/doc/mrtg/mrtg-forum.pod
+%%PORTDOCS%%share/doc/mrtg/mrtg-forum.txt
 %%PORTDOCS%%share/doc/mrtg/mrtg-ipv6.html
 %%PORTDOCS%%share/doc/mrtg/mrtg-ipv6.pod
 %%PORTDOCS%%share/doc/mrtg/mrtg-ipv6.txt
 %%PORTDOCS%%share/doc/mrtg/mrtg-l.png
+%%PORTDOCS%%share/doc/mrtg/mrtg-logfile.html
+%%PORTDOCS%%share/doc/mrtg/mrtg-logfile.pod
+%%PORTDOCS%%share/doc/mrtg/mrtg-logfile.txt
 %%PORTDOCS%%share/doc/mrtg/mrtg-m.png
+%%PORTDOCS%%share/doc/mrtg/mrtg-mibhelp.html
+%%PORTDOCS%%share/doc/mrtg/mrtg-mibhelp.pod
+%%PORTDOCS%%share/doc/mrtg/mrtg-mibhelp.txt
+%%PORTDOCS%%share/doc/mrtg/mrtg-nt-guide.html
+%%PORTDOCS%%share/doc/mrtg/mrtg-nt-guide.pod
+%%PORTDOCS%%share/doc/mrtg/mrtg-nt-guide.txt
 %%PORTDOCS%%share/doc/mrtg/mrtg-r.png
+%%PORTDOCS%%share/doc/mrtg/mrtg-reference.html
+%%PORTDOCS%%share/doc/mrtg/mrtg-reference.pod
+%%PORTDOCS%%share/doc/mrtg/mrtg-reference.txt
 %%PORTDOCS%%share/doc/mrtg/mrtg-rrd.html
 %%PORTDOCS%%share/doc/mrtg/mrtg-rrd.pod
 %%PORTDOCS%%share/doc/mrtg/mrtg-rrd.txt
+%%PORTDOCS%%share/doc/mrtg/mrtg-squid.html
+%%PORTDOCS%%share/doc/mrtg/mrtg-squid.pod
+%%PORTDOCS%%share/doc/mrtg/mrtg-squid.txt
 %%PORTDOCS%%share/doc/mrtg/mrtg-ti.png
+%%PORTDOCS%%share/doc/mrtg/mrtg-unix-guide.html
+%%PORTDOCS%%share/doc/mrtg/mrtg-unix-guide.pod
+%%PORTDOCS%%share/doc/mrtg/mrtg-unix-guide.txt
+%%PORTDOCS%%share/doc/mrtg/mrtg-webserver.html
+%%PORTDOCS%%share/doc/mrtg/mrtg-webserver.pod
+%%PORTDOCS%%share/doc/mrtg/mrtg-webserver.txt
 %%PORTDOCS%%share/doc/mrtg/mrtg.html
 %%PORTDOCS%%share/doc/mrtg/mrtg.pod
 %%PORTDOCS%%share/doc/mrtg/mrtg.txt
 %%PORTDOCS%%share/doc/mrtg/mrtglib.html
 %%PORTDOCS%%share/doc/mrtg/mrtglib.pod
 %%PORTDOCS%%share/doc/mrtg/mrtglib.txt
-%%PORTDOCS%%share/doc/mrtg/nt-guide.html
-%%PORTDOCS%%share/doc/mrtg/nt-guide.pod
-%%PORTDOCS%%share/doc/mrtg/nt-guide.txt
-%%PORTDOCS%%share/doc/mrtg/reference.html
-%%PORTDOCS%%share/doc/mrtg/reference.pod
-%%PORTDOCS%%share/doc/mrtg/reference.txt
-%%PORTDOCS%%share/doc/mrtg/squid.html
-%%PORTDOCS%%share/doc/mrtg/squid.pod
-%%PORTDOCS%%share/doc/mrtg/squid.txt
-%%PORTDOCS%%share/doc/mrtg/unix-guide.html
-%%PORTDOCS%%share/doc/mrtg/unix-guide.pod
-%%PORTDOCS%%share/doc/mrtg/unix-guide.txt
-%%PORTDOCS%%share/doc/mrtg/webserver.html
-%%PORTDOCS%%share/doc/mrtg/webserver.pod
-%%PORTDOCS%%share/doc/mrtg/webserver.txt
 share/mrtg/favicon.ico
 share/mrtg/mrtg-l.gif
 share/mrtg/mrtg-l.png
@@ -80,6 +75,5 @@ share/mrtg/mrtg-r.png
 share/mrtg/mrtg-ti.gif
 share/mrtg/mrtg-ti.png
 @dirrm etc/mrtg
-@dirrm %%SITE_PERL%%/Pod
 %%PORTDOCS%%@dirrm share/doc/mrtg
 @dirrm share/mrtg