diff options
| author | mat <mat@FreeBSD.org> | 2015-12-18 01:19:48 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2015-12-18 01:19:48 +0800 |
| commit | 9e7703aff1c96dce4c11180df6bfd80c536b777a (patch) | |
| tree | cc6e929ebf67eee2cc8ce1692ea0663387b3a559 /irc | |
| parent | fbcb74cea8547a229eabdb6530aecdeb2689cf82 (diff) | |
| download | freebsd-ports-gnome-9e7703aff1c96dce4c11180df6bfd80c536b777a.tar.gz freebsd-ports-gnome-9e7703aff1c96dce4c11180df6bfd80c536b777a.tar.zst freebsd-ports-gnome-9e7703aff1c96dce4c11180df6bfd80c536b777a.zip | |
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
Diffstat (limited to 'irc')
| -rw-r--r-- | irc/pisg/Makefile | 4 | ||||
| -rw-r--r-- | irc/xchat-mircryption/Makefile | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/irc/pisg/Makefile b/irc/pisg/Makefile index f62412f395b0..3685293e78b5 100644 --- a/irc/pisg/Makefile +++ b/irc/pisg/Makefile @@ -10,7 +10,8 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Perl IRC Statistics Generator -USES= perl5 +USES= perl5 shebangfix +SHEBANG_FILES= pisg NO_BUILD= YES OPTIONS_DEFINE= LOGCHARSET DOCS @@ -28,7 +29,6 @@ pre-patch: @${REINPLACE_CMD} -e 's|lang.txt|${PREFIX}/share/pisg/lang.txt|; \ s|layout/|${PREFIX}/share/pisg/layout/|' \ ${WRKSRC}/modules/Pisg.pm - @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/pisg do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/pisg diff --git a/irc/xchat-mircryption/Makefile b/irc/xchat-mircryption/Makefile index 85b26a842497..c6f6525e679b 100644 --- a/irc/xchat-mircryption/Makefile +++ b/irc/xchat-mircryption/Makefile @@ -4,7 +4,7 @@ PORTNAME= mircryption DISTVERSION= 0.3.3 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= irc security MASTER_SITES= http://mircryption.sourceforge.net/Downloads/ @@ -16,7 +16,8 @@ COMMENT= Free encryption add-on for the popular XChat irc client RUN_DEPENDS= xchat:${PORTSDIR}/irc/xchat -USES= zip dos2unix +USES= zip dos2unix shebangfix +SHEBANG_FILES= extras/mcps_masterkey_on_start.pl ALL_TARGET= freebsd CFLAGS+= -fPIC USE_LDCONFIG= yes @@ -40,9 +41,6 @@ post-patch: -e 's|^(LDFLAGS.+)"$$|\1 ${LDFLAGS}"|' \ -e 's|^(LOAD).*$$|LOAD=${CXX}|' \ ${WRKSRC}/${MAKEFILE} - ${REINPLACE_CMD} -E \ - -e 's|/usr/bin/perl|${PERL5}|' \ - ${WRKSRC}/extras/mcps_masterkey_on_start.pl do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/xchat/plugins |