Fix usage of ${PERL5}.

${PERL5} points to a specific version of perl, say, perl5.22.1, it is
fine to use it in a ports Makefile to do Perly things, but ports using
it must use ${PERL}, that points to /usr/local/bin/perl so that if the
minor version is updated, the shebang keep working.

While there, make some ports use shebangfix, regen a few patches, and
bump PORTREVISION where a shebang went from PERL5 to PERL.

PR:		205367
With hat:	portmgr
Sponsored by:	Absolight

5 files changed, 10 insertions, 13 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index b5cf1d4e6f19..85ce4b137da8 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ImageMagick
 DISTVERSION=	6.9.2-8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
@@ -106,7 +107,7 @@ _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define WITH_THREADS
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-CONFIGURE_ARGS+=	--with-perl=${PERL5} \
+CONFIGURE_ARGS+=	--with-perl=${PERL} \
 			--with-perl-options="MAKE=${MAKE_CMD}"
 PLIST_SUB+=		WITH_PERL=''
 # PerlMagick does not work with threads, if perl is not threaded, and vice versa
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index ed09f0f5cb6d..75e2a816b766 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ImageMagick
 DISTVERSION=	7.0.0-0~beta${DATE}
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
 		http://www.imagemagick.org/download/beta/ \
@@ -112,7 +113,7 @@ _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define WITH_THREADS
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-CONFIGURE_ARGS+=	--with-perl=${PERL5} \
+CONFIGURE_ARGS+=	--with-perl=${PERL} \
 			--with-perl-options="MAKE=${MAKE_CMD}"
 PLIST_SUB+=		WITH_PERL=''
 # PerlMagick does not work with threads, if perl is not threaded, and vice versa
diff --git a/graphics/cadubi/Makefile b/graphics/cadubi/Makefile
index dc1fdbd8bafe..33fdc6b51c90 100644
--- a/graphics/cadubi/Makefile
+++ b/graphics/cadubi/Makefile
@@ -28,10 +28,8 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-do-configure:
-	@${REINPLACE_CMD} -e \
-		's|/usr/local/stow/perl-5.8.x/bin/perl|${PERL}|; \
-		s|$$Bin/help|${DATADIR}/help|' \
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$Bin/help|${DATADIR}/help|' \
 		${WRKSRC}/cadubi
 
 do-install:
diff --git a/graphics/cbview/Makefile b/graphics/cbview/Makefile
index aad0167c3da9..1bff2133c015 100644
--- a/graphics/cbview/Makefile
+++ b/graphics/cbview/Makefile
@@ -19,17 +19,14 @@ RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar \
 		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote
 
 NO_BUILD=	yes
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 
 PORTDOCS=	Changes README TODO
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl -w|${PERL}|' \
-		${WRKSRC}/${PORTNAME}
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
diff --git a/graphics/p5-ming/Makefile b/graphics/p5-ming/Makefile
index 658bde4fc54f..a87e533f20df 100644
--- a/graphics/p5-ming/Makefile
+++ b/graphics/p5-ming/Makefile
@@ -24,7 +24,8 @@ OPTIONS_DEFINE=	EXAMPLES
 
 CONFIGURE_ARGS=	--enable-perl
 GNU_CONFIGURE=	yes
-USES=		autoreconf bison gmake libtool localbase perl5
+USES=		autoreconf bison gmake libtool localbase perl5 shebangfix
+SHEBANG_FILES=	examples/*.cgi
 
 PORTEXAMPLES=	*
 
@@ -39,7 +40,6 @@ post-patch:
 	@${REINPLACE_CMD} -e '/ming_is_compiled()/ s|^|#|; /LIBS/d' ${WRKSRC}/Makefile.PL
 	@${REINPLACE_CMD} -e 's|\.3pm|.3|g' ${WRKSRC}/Makefile.PL ${WRKSRC}/mkdoc
 	@${REINPLACE_CMD} -e 's|GvCV(\(.*\)) = \(.*\);|GvCV_set(\1, \2);|' ${WRKSRC}/Exports.c
-	@${REINPLACE_CMD} -e '1 s|/usr/bin/perl|${PERL}|' ${WRKSRC}/examples/*.cgi
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SWF/SWF.so