diff options
| author | mm <mm@FreeBSD.org> | 2011-12-21 23:49:00 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2011-12-21 23:49:00 +0000 |
| commit | fdb2f1a3af56ad71687acf3ecbb05fe29b4a9eef (patch) | |
| tree | f738307a738eb49e8f2cc75372e2c80c4aab4666 | |
| parent | b28b0817f0ae0bcef2e1fb34acdfdaeaf47a949b (diff) | |
| download | FreeBSD-ports-fdb2f1a3af56ad71687acf3ecbb05fe29b4a9eef.zip FreeBSD-ports-fdb2f1a3af56ad71687acf3ecbb05fe29b4a9eef.tar.gz | |
Add shells/bash to BUILD_DEPENDS and use bash to properly configure
as it uses constructs unsupported by /bin/sh.
| -rw-r--r-- | multimedia/x264-devel/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/x264/Makefile | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index f3e5e21..2384a91 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -19,7 +19,8 @@ MAINTAINER= mm@FreeBSD.org COMMENT= Library and tool for encoding H.264/AVC video streams BUILD_DEPENDS= yasm>=0.6.0:${PORTSDIR}/devel/yasm \ - ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils + ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \ + ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash CONFLICTS= x264-0.* @@ -111,7 +112,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \ s|-lpthread|${PTHREAD_LIBS}|g; \ - s|bash|sh|; \ + s|/bin/bash|${LOCALBASE}/bin/bash|; \ s|gpac_static|gpac|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/version.sh diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index b4ed6aa..d32c6c5 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -17,7 +17,8 @@ EXTRACT_ONLY= ${PORTNAME}-snapshot-${X264_SNAP}-2245-stable${EXTRACT_SUFX} MAINTAINER= mm@FreeBSD.org COMMENT?= Library and tool for encoding H.264/AVC video streams -BUILD_DEPENDS= yasm>=0.6.0:${PORTSDIR}/devel/yasm +BUILD_DEPENDS= yasm>=0.6.0:${PORTSDIR}/devel/yasm \ + ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING @@ -110,7 +111,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \ s|-lpthread|${PTHREAD_LIBS}|g; \ - s|bash|sh|; \ + s|/bin/bash|${LOCALBASE}/bin/bash|; \ s|gpac_static|gpac|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/version.sh |
