From 3a779bb834644f6373d2a546ec14060ad69856ae Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Fri, 18 Apr 2014 14:12:51 +0000
Subject: Switch to musepack. Remove modplug from default options since it
 doesn't find the header during compilation. Bump PKGREVISION.

---
 audio/cmus/Makefile   | 5 ++---
 audio/cmus/options.mk | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'audio')

diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 82d80707337..069f45b199e 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2014/04/16 11:22:01 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.47 2014/04/18 14:12:51 wiz Exp $
 
 DISTNAME=		cmus-v2.5.0
 PKGNAME=		${DISTNAME:S/-v/-/}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cmus/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/cmus/options.mk b/audio/cmus/options.mk
index 8d8daf9805c..e76d09faf85 100644
--- a/audio/cmus/options.mk
+++ b/audio/cmus/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.10 2011/02/27 10:51:51 wiz Exp $
+# $NetBSD: options.mk,v 1.11 2014/04/18 14:12:51 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.cmus
 PKG_SUPPORTED_OPTIONS=		flac mad vorbis arts libao musepack faad wavpack pulseaudio
 PKG_SUPPORTED_OPTIONS+=		wide-curses ffmpeg
 PKG_OPTIONS_OPTIONAL_GROUPS=	mod
 PKG_OPTIONS_GROUP.mod=		modplug mikmod
-PKG_SUGGESTED_OPTIONS=		flac mad libao vorbis modplug
+PKG_SUGGESTED_OPTIONS=		flac mad libao vorbis
 PKG_OPTIONS_LEGACY_OPTS=	ao:libao
 PKG_OPTIONS_LEGACY_OPTS=	mpcdec:musepack
 
@@ -92,7 +92,7 @@ CONFIGURE_ARGS+=	CONFIG_FLAC=n
 # MPCDEC support
 #
 .if !empty(PKG_OPTIONS:Mmusepack)
-.include "../../audio/libmpcdec/buildlink3.mk"
+.include "../../audio/musepack/buildlink3.mk"
 CONFIGURE_ARGS+=	CONFIG_MPC=y
 PLIST.musepack=		yes
 .else
-- 
cgit v1.2.3