Date: Wed, 21 Nov 2012 22:27:12 GMT From: Chris Petrik <c.petrik.sosa@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/173799: [PATCH] audio/herrice optionsng Message-ID: <201211212227.qALMRCFE078617@red.freebsd.org> Resent-Message-ID: <201211212230.qALMU149041104@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 173799
>Category: ports
>Synopsis: [PATCH] audio/herrice 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:01 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: herrie/Makefile
===================================================================
--- herrie/Makefile (revision 305743)
+++ herrie/Makefile (working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: herrie
-# Date created: 01 August 2006
-# Whom: Ed Schouten <ed@fxq.nl>
-#
+# Created by: Ed Schouten <ed@fxq.nl>
# $FreeBSD$
-#
PORTNAME= herrie
PORTVERSION= 2.2
@@ -22,64 +18,62 @@
USE_BZIP2= yes
USE_GNOME= glib20
-OPTIONS= MAD "MAD MP3 support" on \
- VORBIS "Ogg Vorbis support" on \
- SNDFILE "libsndfile support" off \
- MODPLUG "libmodplug support" off \
- HTTP "HTTP streams and AudioScrobbler support" on \
- LIBAO "LibAO support (breaks chroot)" off \
- XCURSES "Build XCurses version" off \
- XSPF "Support for XSPF playlists" on
+OPTIONS_DEFINE= MAD VORBIS SNDFILE MODPLUG HTTP LIBAO XCURSES XSPF
+OPTIONS_DEFAULT= MAD VORBIS HTTP XSPF
+HTTP_DESC= HTTP streams and AudioScrobbler support
+LIBAO_DESC= LibAO support (breaks chroot)
+XCURSES_DESC= Build XCurses version
+
MAN1= herrie.1
MANCOMPRESSED= yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${OSVERSION} < 700033
CONFIGURE_ARGS+=ncurses
.endif
-.if !defined(WITHOUT_MAD)
-LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/mad \
- id3tag.0:${PORTSDIR}/audio/libid3tag
+.if ${PORT_OPTIONS:MMAD}
+LIB_DEPENDS+= mad:${PORTSDIR}/audio/mad \
+ id3tag:${PORTSDIR}/audio/libid3tag
.else
CONFIGURE_ARGS+=no_mp3
.endif
-.if !defined(WITHOUT_VORBIS)
-LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis
+.if ${PORT_OPTIONS:MVORBIS}
+LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis
.else
CONFIGURE_ARGS+=no_vorbis
.endif
-.if !defined(WITHOUT_SNDFILE)
-LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile
+.if ${PORT_OPTIONS:MSNDFILE}
+LIB_DEPENDS+= sndfile:${PORTSDIR}/audio/libsndfile
.else
CONFIGURE_ARGS+=no_sndfile
.endif
-.if !defined(WITHOUT_MODPLUG)
+.if ${PORT_OPTIONS:MMODPLUG}
LIB_DEPENDS+= modplug:${PORTSDIR}/audio/libmodplug
.else
CONFIGURE_ARGS+=no_modplug
.endif
-.if !defined(WITHOUT_HTTP)
+.if ${PORT_OPTIONS:MHTTP}
LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
.else
CONFIGURE_ARGS+=no_http no_scrobbler
.endif
-.if !defined(WITHOUT_LIBAO)
-LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao
+.if ${PORT_OPTIONS:MLIBAO}
+LIB_DEPENDS+= ao:${PORTSDIR}/audio/libao
CONFIGURE_ARGS+=ao
.endif
-.if !defined(WITHOUT_XCURSES)
-LIB_DEPENDS+= XCurses.2:${PORTSDIR}/devel/pdcurses
+.if ${PORT_OPTIONS:MXCURSES}
+LIB_DEPENDS+= XCurses:${PORTSDIR}/devel/pdcurses
CONFIGURE_ARGS+=xcurses
.endif
-.if !defined(WITHOUT_XSPF)
-LIB_DEPENDS+= xspf.4:${PORTSDIR}/multimedia/libxspf
+.if ${PORT_OPTIONS:MXSPF}
+LIB_DEPENDS+= xspf:${PORTSDIR}/multimedia/libxspf
.else
CONFIGURE_ARGS+=no_xspf
.endif
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
PLIST_SUB+= NLS=""
USE_GETTEXT= yes
.else
@@ -87,4 +81,4 @@
CONFIGURE_ARGS+=no_nls
.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?201211212227.qALMRCFE078617>