From cb63337d07b29893489718ed68d0459db9b004ad Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 27 Feb 2011 11:01:04 +0000
Subject: Update to 0.16.1. Use more standard option names.

ver 0.16.1 (2010/01/09)
* audio_check: fix parameter in prototype
* add void casts to suppress "result unused" warnings (clang)
* input:
  - ffado: disable by default
* decoder:
  - mad: work around build failure on Solaris
  - resolve modplug vs. libsndfile cflags/headers conflict
* output:
  - solaris: add missing parameter to open_cloexec() cal
  - osx: fix up audio format first, then apply it to device
* player_thread: discard empty chunks while cross-fading
* player_thread: fix assertion failure due to early seek
* output_thread: fix double lock
---
 audio/musicpd/Makefile   |  4 ++--
 audio/musicpd/distinfo   |  8 ++++----
 audio/musicpd/options.mk | 13 ++++++++-----
 3 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'audio')

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index f67c206d0e6..44a64ae9cc0 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2011/02/27 10:43:18 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2011/02/27 11:01:04 wiz Exp $
 
-DISTNAME=		mpd-0.16
+DISTNAME=		mpd-0.16.1
 PKGNAME=		${DISTNAME:S/mpd/musicpd/}
 CATEGORIES=		audio
 #MASTER_SITES=		http://musicpd.org/uploads/files/
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index cb1314169f3..cb8aa844032 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2011/02/27 10:42:13 wiz Exp $
+$NetBSD: distinfo,v 1.31 2011/02/27 11:01:04 wiz Exp $
 
-SHA1 (mpd-0.16.tar.bz2) = ab2fc09474501b5b9396a359027ca4f1ebbd4aa5
-RMD160 (mpd-0.16.tar.bz2) = acc2f53f160dedb5222c0dea75afbffad95d46c2
-Size (mpd-0.16.tar.bz2) = 479757 bytes
+SHA1 (mpd-0.16.1.tar.bz2) = 328d6d1e118e7d0029535559b2ae87ac10b79d6e
+RMD160 (mpd-0.16.1.tar.bz2) = f96ecb6a337043ea4982a2fa609d026b0d571647
+Size (mpd-0.16.1.tar.bz2) = 480244 bytes
 SHA1 (patch-ac) = 573d8a07a12d56036a938323e387d62d4d21448f
 SHA1 (patch-configure) = 4858fb0fce6a73b951b6c196838c5876330b3fcc
diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk
index 3225d2f6ccb..00fca8c6b04 100644
--- a/audio/musicpd/options.mk
+++ b/audio/musicpd/options.mk
@@ -1,12 +1,15 @@
-# $NetBSD: options.mk,v 1.15 2011/02/27 10:42:13 wiz Exp $
+# $NetBSD: options.mk,v 1.16 2011/02/27 11:01:04 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.musicpd
-PKG_SUPPORTED_OPTIONS=	aac audiofile curl ffmpeg flac id3 inet6 libao jack libmikmod musepack ogg shout sidplay
-PKG_SUGGESTED_OPTIONS=	aac audiofile curl flac id3 libao musepack ogg
+PKG_SUPPORTED_OPTIONS=	audiofile curl faad ffmpeg flac id3 inet6 libao jack mikmod musepack ogg shout sidplay
+PKG_SUGGESTED_OPTIONS=	audiofile curl faad flac id3 libao musepack ogg
+
+PKG_OPTIONS_LEGACY_OPTS=	libmikmod:mikmod
+PKG_OPTIONS_LEGACY_OPTS=	aac:faad
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Maac)
+.if !empty(PKG_OPTIONS:Mfaad)
 .  include "../../audio/faad2/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-faad=${BUILDLINK_PREFIX.faad2}
 .else
@@ -58,7 +61,7 @@ CONFIGURE_ARGS+=	--enable-jack
 CONFIGURE_ARGS+=	--disable-jack
 .endif
 
-.if !empty(PKG_OPTIONS:Mlibmikmod)
+.if !empty(PKG_OPTIONS:Mmikmod)
 .  include "../../audio/libmikmod/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-mikmod
 .else
-- 
cgit v1.2.3