o Update to 2.16.4

o Use both PORT{DOCS,EXAMPLES} instead of PLIST variables.

PR:		ports/149016
Approved by:	maintainer

3 files changed, 15 insertions, 64 deletions

diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index b8467f5d0fd4..e89bc88b47a1 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mrtg
-PORTVERSION=	2.16.2
-PORTREVISION=	6
+PORTVERSION=	2.16.4
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
@@ -67,6 +66,14 @@ SCRIPTS=	cfgmaker indexmaker mrtg mrtg-traffic-sum
 OPTIONS=	IPV6 "Enable IPv6 support" OFF \
 		SNMP "Enable use of SNMPv3" OFF
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
+.if !defined(NOPORTEXAMPLES)
+PORTEXAMPLES=	*
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IPV6)
@@ -92,7 +99,8 @@ do-install:
 	@${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}/
+	@${MKDIR} ${PREFIX}/${SITE_PERL_REL}
+	@${CP} -p ${WRKSRC}/lib/mrtg2/*.pm ${PREFIX}/${SITE_PERL_REL}
 	@${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/bin/,} ${PREFIX}/bin
 
diff --git a/net-mgmt/mrtg/distinfo b/net-mgmt/mrtg/distinfo
index 4465d9dd6e5f..b17eca82ea50 100644
--- a/net-mgmt/mrtg/distinfo
+++ b/net-mgmt/mrtg/distinfo
@@ -1,3 +1,3 @@
-MD5 (mrtg-2.16.2.tar.gz) = 06de09c0ee0d35a0142afed5b275b4cd
-SHA256 (mrtg-2.16.2.tar.gz) = ce9ec97bb6c8f94a8d8bb2d3cfa7e72b73754ed7a1081e7aca1c8cece5ce3385
-SIZE (mrtg-2.16.2.tar.gz) = 1078423
+MD5 (mrtg-2.16.4.tar.gz) = ec298200d239832ff1648fba488e1a9e
+SHA256 (mrtg-2.16.4.tar.gz) = 6d61fad616f6a73b2080a6ed295ec8d2a021a4e1110db42a2d35b9ad6d3037e6
+SIZE (mrtg-2.16.4.tar.gz) = 1089068
diff --git a/net-mgmt/mrtg/pkg-plist b/net-mgmt/mrtg/pkg-plist
index 4985eaba4bbe..1e5747987f90 100644
--- a/net-mgmt/mrtg/pkg-plist
+++ b/net-mgmt/mrtg/pkg-plist
@@ -7,62 +7,5 @@ bin/rateup
 %%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
-%%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 %%SITE_PERL%%
 @dirrmtry %%ETCDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/images
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/doc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%