From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 21 22:30:01 2012 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5A0FE2EF for ; Wed, 21 Nov 2012 22:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 2F8C18FC17 for ; Wed, 21 Nov 2012 22:30:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qALMU1C1041061 for ; Wed, 21 Nov 2012 22:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qALMU1fq041056; Wed, 21 Nov 2012 22:30:01 GMT (envelope-from gnats) Resent-Date: Wed, 21 Nov 2012 22:30:01 GMT Resent-Message-Id: <201211212230.qALMU1fq041056@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chris Petrik Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4F3FF102 for ; Wed, 21 Nov 2012 22:25:14 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 1D4FE8FC08 for ; Wed, 21 Nov 2012 22:25:14 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qALMPEep078533 for ; Wed, 21 Nov 2012 22:25:14 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id qALMPEnT078532; Wed, 21 Nov 2012 22:25:14 GMT (envelope-from nobody) Message-Id: <201211212225.qALMPEnT078532@red.freebsd.org> Date: Wed, 21 Nov 2012 22:25:14 GMT From: Chris Petrik To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/173796: [PATCH] audio/gtkpod optionsng X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2012 22:30:01 -0000 >Number: 173796 >Category: ports >Synopsis: [PATCH] audio/gtkpod optionsng >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Nov 21 22:30:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Chris Petrik >Release: >Organization: na >Environment: >Description: OptionsNG Changes >How-To-Repeat: >Fix: Patch attached with submission follows: Index: gtkpod/Makefile =================================================================== --- gtkpod/Makefile (revision 305743) +++ gtkpod/Makefile (working copy) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gtkpod -# Date created: 28 January 2003 -# Whom: David Le Brun -# +# Created by: David Le Brun # $FreeBSD$ -# PORTNAME= gtkpod PORTVERSION= 1.0.0 @@ -16,8 +12,8 @@ LICENSE= GPLv2 -LIB_DEPENDS= id3tag.0:${PORTSDIR}/audio/libid3tag \ - gpod.7:${PORTSDIR}/audio/libgpod +LIB_DEPENDS= id3tag:${PORTSDIR}/audio/libid3tag \ + gpod:${PORTSDIR}/audio/libgpod USE_GETTEXT= yes USE_GMAKE= yes @@ -30,26 +26,25 @@ PORTDOCS= ChangeLog NEWS README TODOandBUGS.txt TROUBLESHOOTING -OPTIONS= VORBIS "Enable Ogg/Vorbis support" on \ - FLAC "Enable FLAC support" on \ - CURL "Enable coverart download support" on +OPTIONS_DEFINE= VORBIS FLAC CURL +OPTIONS_DEFAULT= VORBIS FLAC CURL -.include +.include -.if defined(WITH_VORBIS) -LIB_DEPENDS+= vorbisfile.6:${PORTSDIR}/audio/libvorbis +.if ${PORT_OPTIONS:MVORBIS} +LIB_DEPENDS+= vorbisfile:${PORTSDIR}/audio/libvorbis .else CONFIGURE_ARGS+= --without-ogg .endif -.if defined(WITH_FLAC) -LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac +.if ${PORT_OPTIONS:MFLAC} +LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac .else CONFIGURE_ARGS+= --without-flac .endif -.if defined(WITH_CURL) -LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl +.if ${PORT_OPTIONS:MCURL} +LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl .else CONFIGURE_ARGS+= --without-curl .endif @@ -70,4 +65,4 @@ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif -.include +.include >Release-Note: >Audit-Trail: >Unformatted: