Date: Sat, 20 Oct 2012 11:24:45 GMT From: Boris Samorodov <bsam@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/172902: [patch] audio/gtkpod: switch to the new options framework Message-ID: <201210201124.q9KBOjo8057098@red.freebsd.org> Resent-Message-ID: <201210201130.q9KBU0W9037147@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172902
>Category: ports
>Synopsis: [patch] audio/gtkpod: switch to the new options framework
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 20 11:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Boris Samorodov
>Release: FreeBSD 9-STABLE
>Organization:
BSDprint
>Environment:
FreeBSD srv.bb.tel.ru 9.1-PRERELEASE FreeBSD 9.1-PRERELEASE #5 r241393: Wed Oct 10 12:27:20 SAMT 2012 bsam@srv.bb.tel.ru:/usr/obj/usr/src/sys/BB i386
>Description:
The port currently do not use the new options framework.
>How-To-Repeat:
>Fix:
. switch the new options framework;
. use two line style headers.
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 306133)
+++ Makefile (working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: gtkpod
-# Date created: 28 January 2003
-# Whom: David Le Brun <david@dyn-ns.net>
-#
+# Created by: David Le Brun <david@dyn-ns.net>
# $FreeBSD$
-#
PORTNAME= gtkpod
PORTVERSION= 1.0.0
@@ -30,25 +26,24 @@
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= CURL FLAC VORBIS
+OPTIONS_DEFAULT=CURL FLAC VORBIS
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_VORBIS)
+.if ${PORT_OPTIONS:MVORBIS}
LIB_DEPENDS+= vorbisfile.6:${PORTSDIR}/audio/libvorbis
.else
CONFIGURE_ARGS+= --without-ogg
.endif
-.if defined(WITH_FLAC)
+.if ${PORT_OPTIONS:MFLAC}
LIB_DEPENDS+= FLAC.10:${PORTSDIR}/audio/flac
.else
CONFIGURE_ARGS+= --without-flac
.endif
-.if defined(WITH_CURL)
+.if ${PORT_OPTIONS:MCURL}
LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
.else
CONFIGURE_ARGS+= --without-curl
@@ -65,9 +60,9 @@
${WRKSRC}/src/mp4file.c
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210201124.q9KBOjo8057098>