svn commit: r331898 - head/audio/cmus

[William Grzybowski]

Author: wg
Date: Mon Oct 28 21:28:54 2013
New Revision: 331898
URL: http://svnweb.freebsd.org/changeset/ports/331898

Log:
  audio/cmus: remove FFMPEG option for now
  
  Submitted by:	Herbert J. Skuhra <h.skuhra gmail.com> (maintainer, via email)

Modified:
  head/audio/cmus/Makefile

Modified: head/audio/cmus/Makefile
==============================================================================
--- head/audio/cmus/Makefile	Mon Oct 28 21:26:33 2013	(r331897)
+++ head/audio/cmus/Makefile	Mon Oct 28 21:28:54 2013	(r331898)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cmus
 PORTVERSION=	2.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=prefix=${PREFIX} mandir=
 		exampledir=${EXAMPLESDIR} \
 		CONFIG_ALSA=n CONFIG_ARTS=n CONFIG_ROAR=n
 
-OPTIONS_DEFINE=	AAC AO CDDB CDIO CUE DISCID FFMPEG FLAC MAD MIKMOD \
+OPTIONS_DEFINE=	AAC AO CDDB CDIO CUE DISCID FLAC MAD MIKMOD \
 		MODPLUG MP4 MUSEPACK PULSEAUDIO TREMOR VORBIS WAVPACK
 OPTIONS_DEFAULT=FLAC MAD VORBIS
 DISCID_DESC=	DISCID support
@@ -113,16 +113,15 @@ CONFIGURE_ARGS+=CONFIG_WAVPACK=n
 PLIST_SUB+=	WAVPACK="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MFFMPEG}
-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
+#.if ${PORT_OPTIONS:MFFMPEG}
+#BUILD_DEPENDS+=	ffmpeg>=2:${PORTSDIR}/multimedia/ffmpeg
+#RUN_DEPENDS+=	ffmpeg>=2:${PORTSDIR}/multimedia/ffmpeg
+#CONFIGURE_ARGS+=CONFIG_FFMPEG=y
+#PLIST_SUB+=	FFMPEG=""
+#.else
 CONFIGURE_ARGS+=CONFIG_FFMPEG=n
 PLIST_SUB+=	FFMPEG="@comment "
-.endif
+#.endif
 
 .if ${PORT_OPTIONS:MAO}
 LIB_DEPENDS+=	ao:${PORTSDIR}/audio/libao
@@ -183,9 +182,5 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,doc/cmus/examples,examples/cmus,g' \
 		${WRKSRC}/Doc/cmus.txt
 	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' ${WRKSRC}/Doc/cmus.txt
-.if ${PORT_OPTIONS:MFFMPEG}
-	@${REINPLACE_CMD} -e 's,libavformat,libavformat${FFMPEG_SUFFIX},g' \
-		${WRKSRC}/configure
-.endif
 
 .include <bsd.port.mk>