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 /multimedia | |
| 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 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/ffmpeg0/Makefile | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 885eedb790e1..d641123f66ac 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 2.8.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -19,9 +19,10 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ HAS_CONFIGURE= yes CONFIGURE_LOG= config.err -USES= compiler cpe gmake perl5 pkgconfig tar:bzip2 +USES= compiler cpe gmake perl5 pkgconfig tar:bzip2 shebangfix USE_LDCONFIG= yes USE_PERL5= build +SHEBANG_FILES= doc/texi2pod.pl OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT DC1394 \ DEBUG DOCS FAAC FDK_AAC FFSERVER FLITE FONTCONFIG \ @@ -448,8 +449,6 @@ post-patch: -e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \ -e 's|freetype/freetype.h|freetype.h|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \ - ${WRKSRC}/doc/texi2pod.pl post-patch-SDL-on: @${REINPLACE_CMD} -E \ diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile index 563ee4d6d830..1d35314d5009 100644 --- a/multimedia/ffmpeg0/Makefile +++ b/multimedia/ffmpeg0/Makefile @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.7.17 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -23,9 +23,10 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ PORTSCOUT= limit:^0\.7.* -USES= cpe gmake perl5 pkgconfig tar:bzip2 +USES= cpe gmake perl5 pkgconfig tar:bzip2 shebangfix USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX} USE_PERL5= build +SHEBANG_FILES= doc/texi2pod.pl FFMPEG_SUFFIX= 0 HAS_CONFIGURE= yes @@ -323,8 +324,6 @@ post-patch: -e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \ -e 's|check_ldflags -Wl,--as-needed||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \ - ${WRKSRC}/doc/texi2pod.pl .if ${PORT_OPTIONS:MSDL} @${REINPLACE_CMD} -E \ -e 's|sdl-config|${SDL_CONFIG}|g' \ |