From owner-svn-ports-head@FreeBSD.ORG Tue Jan 8 16:22:40 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 235B2DD7; Tue, 8 Jan 2013 16:22:40 +0000 (UTC) (envelope-from wxs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 07B8AAF0; Tue, 8 Jan 2013 16:22:40 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r08GMdfR024930; Tue, 8 Jan 2013 16:22:39 GMT (envelope-from wxs@svn.freebsd.org) Received: (from wxs@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r08GMd43024928; Tue, 8 Jan 2013 16:22:39 GMT (envelope-from wxs@svn.freebsd.org) Message-Id: <201301081622.r08GMd43024928@svn.freebsd.org> From: Wesley Shields Date: Tue, 8 Jan 2013 16:22:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310097 - head/audio/gnormalize X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2013 16:22:40 -0000 Author: wxs Date: Tue Jan 8 16:22:39 2013 New Revision: 310097 URL: http://svnweb.freebsd.org/changeset/ports/310097 Log: Convert to new options. Trim header. PR: ports/173797 Submitted by: Chris Petrik Approved by: maintainer timeout Modified: head/audio/gnormalize/Makefile (contents, props changed) Modified: head/audio/gnormalize/Makefile ============================================================================== --- head/audio/gnormalize/Makefile Tue Jan 8 16:19:46 2013 (r310096) +++ head/audio/gnormalize/Makefile Tue Jan 8 16:22:39 2013 (r310097) @@ -1,9 +1,6 @@ -# New ports collection makefile for: gnormalize -# Date created: 27 Oct 2007 -# Whom: Denise H. G. +# Created by: Denise H. G. # # $FreeBSD$ -# PORTNAME= gnormalize PORTVERSION= 0.63 @@ -24,58 +21,51 @@ NO_BUILD= yes MAN1= gnormalize.1 -OPTIONS= \ - GNORMALIZE_MP3 "WAV <-> MP3 Support" on \ - GNORMALIZE_OGG "Ogg Encoding and Playback" on \ - GNORMALIZE_MP4 "WAV <-> MP4 Support" on \ - GNORMALIZE_CDRIP "CD Ripping" off \ - GNORMALIZE_CDDB "CDDB Support" off \ - GNORMALIZE_CDPLAY "CD Playback" off \ - GNORMALIZE_FLAC "FLAC Encoding and Playback" off \ - GNORMALIZE_MAC "Monkey's Audio Encoding and Playback" off \ - GNORMALIZE_MPC "MPC (musepack) Audio" off +OPTIONS_DEFINE= MP3 OGG MP4 CDPARANOIA CDDB CDPLAY PLAC MAC MUSEPACK +OPTIONS_DEFAULT= MP3 OGG MP4 + +MAC_DESC= Monkey's Audio Encoding and Playback +CDPLAY_DESC= CD Playback -.include +.include -.if defined(WITH_GNORMALIZE_MP3) +.if ${PORT_OPTIONS:MMP3} RUN_DEPENDS+= lame:${PORTSDIR}/audio/lame \ p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info .endif -.if defined(WITH_GNORMALIZE_OGG) +.if ${PORT_OPTIONS:MOGG} RUN_DEPENDS+= oggenc:${PORTSDIR}/audio/vorbis-tools .endif -.if defined(WITH_GNORMALIZE_MP4) +.if ${PORT_OPTIONS:MMP4} RUN_DEPENDS+= faac:${PORTSDIR}/audio/faac \ faad:${PORTSDIR}/audio/faad .endif -.if defined(WITH_GNORMALIZE_CDRIP) -.if defined(WITH_CDDA2WAV) -RUN_DEPENDS+= cdda2wav:${PORTSDIR}/sysutils/cdrtools +.if ${PORT_OPTIONS:MCDPARANOIA} || ${PORT_OPTIONS:MCDDA2WAV} +USE_CDRTOOLS= yes .else RUN_DEPENDS+= cdparanoia:${PORTSDIR}/audio/cdparanoia .endif -.endif -.if defined(WITH_GNORMALIZE_CDDB) +.if ${PORT_OPTIONS:MCDDB} RUN_DEPENDS+= cddb.pl:${PORTSDIR}/audio/p5-CDDB_get .endif -.if defined(WITH_GNORMALIZE_CDPLAY) +.if ${PORT_OPTIONS:MCDPLAY} RUN_DEPENDS+= p5-Audio-CD>=0:${PORTSDIR}/audio/p5-Audio-CD .endif -.if defined(WITH_GNORMALIZE_FLAC) +.if ${PORT_OPTIONS:MFLAC} RUN_DEPENDS+= flac:${PORTSDIR}/audio/flac .endif -.if defined(WITH_GNORMALIZE_MAC) +.if ${PORT_OPTIONS:MMAC} RUN_DEPENDS+= mac:${PORTSDIR}/audio/mac .endif -.if defined(WITH_GNORMALIZE_MPC) +.if ${PORT_OPTIONS:MMUSEPACK} RUN_DEPENDS+= mppenc:${PORTSDIR}/audio/musepack .endif @@ -91,4 +81,4 @@ post-patch: @${REINPLACE_CMD} -e 's,/usr/share/gnormalize,${DATADIR},' \ ${WRKSRC}/gnormalize -.include +.include