Index: head/sysutils/munin-contrib/Makefile
===================================================================
--- head/sysutils/munin-contrib/Makefile	(revision 458413)
+++ head/sysutils/munin-contrib/Makefile	(revision 458414)
@@ -1,38 +1,39 @@
 # $FreeBSD$
 
 PORTNAME=	contrib
-DISTVERSION=	git.2017-03-01
+DISTVERSION=	git.2017-10-05
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	munin-
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Contributed plugins and other for munin
 
 RUN_DEPENDS=	munin-node>=0:sysutils/munin-node
 
+USES=	shebangfix uniquefiles:dirs python:env
+SHEBANG_REGEX=	./(${EXAMPLES_DIRS:ts|})/.*
+SHEBANG_LANG=	python3 expect gawk zsh
+ruby_OLD_CMD=	/opt/csw/bin/ruby
+zsh_CMD=	${LOCALBASE}/bin/zsh
+python3_CMD=	${LOCALBASE}/bin/python${PYTHON3_DEFAULT}
 USE_GITHUB=	yes
 GH_ACCOUNT=	munin-monitoring
-GH_TAGNAME=	893c3fa
+GH_TAGNAME=	1bba76b
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-USES=	shebangfix uniquefiles:dirs
-SHEBANG_REGEX=	./(${PORTEXAMPLES:tW:S/ /|/g})/.*
-SHEBANG_LANG=	python3 expect gawk zsh
-ruby_OLD_CMD=	/opt/csw/bin/ruby
-zsh_CMD=	${LOCALBASE}/bin/zsh
-python3_CMD=	${LOCALBASE}/bin/python${PYTHON3_DEFAULT}
-
 # Most of the installed files are scripts, so give them a "correct" mode.
 BINMODE=	755
 
 SUB_FILES=	pkg-message
 
+EXAMPLES_DIRS=	plugins samples templates tools
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${COPYTREE_BIN} 'plugins samples templates tools' ${STAGEDIR}${EXAMPLESDIR}
-	@cd ${STAGEDIR}${PREFIX} && ${FIND} * -type f >> ${TMPPLIST}
+	cd ${WRKSRC} && ${COPYTREE_BIN} ${EXAMPLES_DIRS:Q} ${STAGEDIR}${EXAMPLESDIR}
+	@cd ${STAGEDIR}${PREFIX} && ${FIND} -f * '(' -type f -o -type l ')' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/sysutils/munin-contrib/distinfo
===================================================================
--- head/sysutils/munin-contrib/distinfo	(revision 458413)
+++ head/sysutils/munin-contrib/distinfo	(revision 458414)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488447628
-SHA256 (munin-monitoring-contrib-git.2017-03-01-893c3fa_GH0.tar.gz) = 413344a94db0a63f2f1879ab8e31a0888b985690d33be29905c2cb7159f99353
-SIZE (munin-monitoring-contrib-git.2017-03-01-893c3fa_GH0.tar.gz) = 4051566
+TIMESTAMP = 1515417396
+SHA256 (munin-monitoring-contrib-git.2017-10-05-1bba76b_GH0.tar.gz) = 52aed1565df5cc256110def2f81cc1119a4ae9d33ecc5c5b23635b9c6f1e65f2
+SIZE (munin-monitoring-contrib-git.2017-10-05-1bba76b_GH0.tar.gz) = 4390547