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

2 files changed, 2 insertions, 6 deletions

diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index d4cc5e434f0a..c757fcd412cc 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -137,8 +137,6 @@ post-patch:
 	router.xml s2s.xml sm.xml templates/roster.xml
 	@${MV} ${WRKSRC}/etc/${FILE}.dist.in ${WRKSRC}/etc/${FILE}.sample.in
 .endfor
-	@${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|g' \
-		${WRKSRC}/tools/jabberd.in
 #.if ${PORT_OPTIONS:MCYRUS}
 #	@${REINPLACE_CMD} -e '/^#error /d' \
 #		${WRKSRC}/sx/sasl_cyrus.c
diff --git a/net-im/ttytter/Makefile b/net-im/ttytter/Makefile
index d335f3186cb1..b8277ba5986a 100644
--- a/net-im/ttytter/Makefile
+++ b/net-im/ttytter/Makefile
@@ -22,8 +22,9 @@ RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
 
 NO_BUILD=	yes
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	run
+SHEBANG_FILES=	${PORTVERSION}.txt
 
 OPTIONS_DEFINE=	READLINE RLTTYTTER
 OPTIONS_DEFAULT=READLINE
@@ -47,9 +48,6 @@ do-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${PORTVERSION}.txt ${WRKSRC}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/license.txt ${WRKSRC}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|^\#!/usr/bin/perl|\#!${PERL}|' ${WRKSRC}/${PORTVERSION}.txt
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTVERSION}.txt ${STAGEDIR}${PREFIX}/bin/${PORTNAME}