Update to 2.9.1.

- Update to 2.9.1 and not 2.9.0
- Sorted pkg-plist
- Remove whatis.* files that weren't installed

MAINTAINER unreachable

PR:		21787
Submitted by:	Dmitry S. Sivachenko <dima@Chg.RU>

3 files changed, 83 insertions, 39 deletions

diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index e240f0fba91d..e08b33c6cf48 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mrtg
-PORTVERSION=	2.8.12
+PORTVERSION=	2.9.1
 CATEGORIES=	net
 MASTER_SITES=	http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/
 
@@ -19,34 +19,35 @@ MAKE_ENV+=	PERL=${PERL}
 
 GNU_CONFIGURE=	YES
 
-CONFIGURE_ARGS=	--with-gd-lib=${PREFIX}/lib \
-		--with-gd-inc=${PREFIX}/include/gd
+CONFIGURE_ARGS=	--with-gd-lib=${LOCALBASE}/lib \
+		--with-gd-inc=${LOCALBASE}/include/gd
 
 CONFIGURE_ENV=	PERL=${PERL}
 
+MAN1=		cfgmaker.1 contrib.1 faq.1 forum.1 indexmaker.1 logfile.1 \
+		mibhelp.1 mrtg-rrd.1 nt-guide.1 reference.1 squid.1 \
+		unix-guide.1 webserver.1 mrtg.1
+
 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 ${PREFIX}/share/mrtg
 .if !defined(NOPORTDOCS)
 		${MKDIR} -m 755 ${PREFIX}/share/doc/mrtg
-		for file in ANNOUNCE CHANGES COPYING COPYRIGHT MANIFEST README \
-			doc/config.html doc/config.pod doc/config.txt doc/htaccess.txt \
-			doc/logfile-format.txt doc/manual.html doc/manual.txt \
-			doc/mibhelp.txt doc/squid.txt UPGRADING ; do \
+		for file in ANNOUNCE CHANGES COPYRIGHT MANIFEST README \
+			doc/*.html doc/*.pod doc/*.txt doc/*wml doc/*.png ; do \
 			${INSTALL_DATA} ${WRKSRC}/$$file ${PREFIX}/share/doc/mrtg/; \
 		done
 .endif
-		${INSTALL_DATA} ${WRKSRC}/doc/sample-mrtg.cfg ${PREFIX}/etc/mrtg
-		for file in ${WRKSRC}/images/*; do \
-			${INSTALL_DATA} $$file ${PREFIX}/share/mrtg/; \
-		done
-		for file in SNMP_Session.pm SNMP_util.pm BER.pm locales_mrtg.pm; do \
-			${INSTALL_DATA} ${WRKSRC}/run/$$file ${PREFIX}/lib/perl5/site_perl/${PERL_VER}; \
-		done
-		${INSTALL_PROGRAM} ${WRKSRC}/run/rateup ${PREFIX}/bin/
-		for file in mrtg cfgmaker cfgmaker_ip cfgmaker_phys indexmaker; do \
-			${INSTALL_SCRIPT} ${WRKSRC}/run/$$file ${PREFIX}/bin/; \
+		${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${PREFIX}/etc/mrtg/mrtg.cfg.sample
+		${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/share/mrtg
+		${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_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/bin/
+		for file in mrtg cfgmaker indexmaker; do \
+			${INSTALL_SCRIPT} ${WRKSRC}/bin/$$file ${PREFIX}/bin/; \
 		done
 
 post-install:
@@ -55,7 +56,7 @@ post-install:
 	@${ECHO} "############################################################################"
 	@${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 sample-mrtg.cfg              #"
+	@${ECHO} "# A sample configuration file is installed as mrtg.cfg.sample              #"
 	@${ECHO} "############################################################################"
 .endif
 
diff --git a/net-mgmt/mrtg/distinfo b/net-mgmt/mrtg/distinfo
index 83bcf8785fdd..a753e071e34e 100644
--- a/net-mgmt/mrtg/distinfo
+++ b/net-mgmt/mrtg/distinfo
@@ -1 +1 @@
-MD5 (mrtg-2.8.12.tar.gz) = 1279ae12c85c458cb5b3111fe5e01341
+MD5 (mrtg-2.9.1.tar.gz) = 78cb2e57d98ce1d16a240ad97100bd8f
diff --git a/net-mgmt/mrtg/pkg-plist b/net-mgmt/mrtg/pkg-plist
index c049dccca06f..20861e0e162f 100644
--- a/net-mgmt/mrtg/pkg-plist
+++ b/net-mgmt/mrtg/pkg-plist
@@ -1,38 +1,81 @@
 bin/cfgmaker
-bin/cfgmaker_ip
-bin/cfgmaker_phys
 bin/indexmaker
 bin/mrtg
 bin/rateup
-etc/mrtg/sample-mrtg.cfg
+etc/mrtg/mrtg.cfg.sample
 lib/perl5/site_perl/%%PERL_VER%%/BER.pm
+lib/perl5/site_perl/%%PERL_VER%%/MRTG_lib.pm
+lib/perl5/site_perl/%%PERL_VER%%/Pod/InputObjects.pm
+lib/perl5/site_perl/%%PERL_VER%%/Pod/Parser.pm
+lib/perl5/site_perl/%%PERL_VER%%/Pod/PlainText.pm
+lib/perl5/site_perl/%%PERL_VER%%/Pod/Select.pm
+lib/perl5/site_perl/%%PERL_VER%%/Pod/Usage.pm
 lib/perl5/site_perl/%%PERL_VER%%/SNMP_Session.pm
 lib/perl5/site_perl/%%PERL_VER%%/SNMP_util.pm
 lib/perl5/site_perl/%%PERL_VER%%/locales_mrtg.pm
-share/mrtg/mrtg-l.gif
-share/mrtg/mrtg-m.gif
-share/mrtg/mrtg-r.gif
-share/mrtg/mrtg-ti.gif
-share/mrtg/mrtg-l.png
-share/mrtg/mrtg-m.png
-share/mrtg/mrtg-r.png
-share/mrtg/mrtg-ti.png
 share/doc/mrtg/ANNOUNCE
 share/doc/mrtg/CHANGES
-share/doc/mrtg/COPYING
 share/doc/mrtg/COPYRIGHT
 share/doc/mrtg/MANIFEST
 share/doc/mrtg/README
-share/doc/mrtg/UPGRADING
-share/doc/mrtg/config.html
-share/doc/mrtg/config.pod
-share/doc/mrtg/config.txt
-share/doc/mrtg/htaccess.txt
-share/doc/mrtg/logfile-format.txt
-share/doc/mrtg/manual.html
-share/doc/mrtg/manual.txt
+share/doc/mrtg/cfgmaker.html
+share/doc/mrtg/cfgmaker.pod
+share/doc/mrtg/cfgmaker.txt
+share/doc/mrtg/contrib.html
+share/doc/mrtg/contrib.pod
+share/doc/mrtg/contrib.txt
+share/doc/mrtg/faq.html
+share/doc/mrtg/faq.pod
+share/doc/mrtg/faq.txt
+share/doc/mrtg/forum.html
+share/doc/mrtg/forum.pod
+share/doc/mrtg/forum.txt
+share/doc/mrtg/index.html
+share/doc/mrtg/index.txt
+share/doc/mrtg/index.wml
+share/doc/mrtg/indexmaker.html
+share/doc/mrtg/indexmaker.pod
+share/doc/mrtg/indexmaker.txt
+share/doc/mrtg/logfile.html
+share/doc/mrtg/logfile.pod
+share/doc/mrtg/logfile.txt
+share/doc/mrtg/mibhelp.html
+share/doc/mrtg/mibhelp.pod
 share/doc/mrtg/mibhelp.txt
+share/doc/mrtg/mrtg-l.png
+share/doc/mrtg/mrtg-m.png
+share/doc/mrtg/mrtg-r.png
+share/doc/mrtg/mrtg-rrd.html
+share/doc/mrtg/mrtg-rrd.pod
+share/doc/mrtg/mrtg-rrd.txt
+share/doc/mrtg/mrtg-ti.png
+share/doc/mrtg/mrtg.html

+share/doc/mrtg/mrtg.pod

+share/doc/mrtg/mrtg.txt

+share/doc/mrtg/nt-guide.html
+share/doc/mrtg/nt-guide.pod
+share/doc/mrtg/nt-guide.txt
+share/doc/mrtg/reference.html
+share/doc/mrtg/reference.pod
+share/doc/mrtg/reference.txt
+share/doc/mrtg/squid.html
+share/doc/mrtg/squid.pod
 share/doc/mrtg/squid.txt
+share/doc/mrtg/unix-guide.html
+share/doc/mrtg/unix-guide.pod
+share/doc/mrtg/unix-guide.txt
+share/doc/mrtg/webserver.html
+share/doc/mrtg/webserver.pod
+share/doc/mrtg/webserver.txt
+share/mrtg/mrtg-l.gif
+share/mrtg/mrtg-l.png
+share/mrtg/mrtg-m.gif
+share/mrtg/mrtg-m.png
+share/mrtg/mrtg-r.gif
+share/mrtg/mrtg-r.png
+share/mrtg/mrtg-ti.gif
+share/mrtg/mrtg-ti.png
 @dirrm etc/mrtg
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Pod
 @dirrm share/doc/mrtg
 @dirrm share/mrtg