From owner-svn-ports-all@FreeBSD.ORG Mon Oct 28 21:28:55 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9056FBE5; Mon, 28 Oct 2013 21:28:55 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 63CBD2FCA; Mon, 28 Oct 2013 21:28:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9SLStgd043543; Mon, 28 Oct 2013 21:28:55 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9SLStQo043542; Mon, 28 Oct 2013 21:28:55 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201310282128.r9SLStQo043542@svn.freebsd.org> From: William Grzybowski Date: Mon, 28 Oct 2013 21:28:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331898 - head/audio/cmus X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Oct 2013 21:28:55 -0000 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 (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