From cb7e833c12cfc8f4ab3a724586a3e2b6294ea01f Mon Sep 17 00:00:00 2001 From: Beech Rintoul Date: Wed, 6 Mar 2013 23:21:55 +0000 Subject: - Fix configure with ffmpeg - Fix build with clang PR: ports/176592 Submitted by: Hon-Yu Lawrence Cheung Approved by: "Herbert J. Skuhra" (maintainer) --- audio/cmus/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index c32014f168ec..9f91f4f88530 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -16,6 +16,7 @@ USE_ICONV= yes USE_NCURSES= yes USE_PKGCONFIG= build HAS_CONFIGURE= yes +CONFIGURE_ENV+= HOSTCC=${CC} CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man \ exampledir=${EXAMPLESDIR} \ CONFIG_ALSA=n CONFIG_ROAR=n @@ -114,9 +115,9 @@ PLIST_SUB+= WAVPACK="@comment " .endif .if ${PORT_OPTIONS:MFFMPEG} -FFMPEG_SUFFIX= -011 -BUILD_DEPENDS+= ffmpeg${FFMPEG_SUFFIX}>0.11:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} -RUN_DEPENDS+= ffmpeg${FFMPEG_SUFFIX}>0.11:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} +FFMPEG_SUFFIX= 1 +BUILD_DEPENDS+= ffmpeg${FFMPEG_SUFFIX}>=1:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} +RUN_DEPENDS+= ffmpeg${FFMPEG_SUFFIX}>=1:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} CONFIGURE_ARGS+=CONFIG_FFMPEG=y PLIST_SUB+= FFMPEG="" .else -- cgit