ports/173796: [PATCH] audio/gtkpod optionsng

[Chris Petrik]

>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 <david at dyn-ns.net>
-#
+# Created by:	 David Le Brun <david at dyn-ns.net>
 # $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 <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.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 <bsd.port.post.mk>
+.include <bsd.port.mk>


>Release-Note:
>Audit-Trail:
>Unformatted: