audio/cmus: Update to 2.8.0

Major new features:

    multiple playlists support in playlist view
        new :pl-* commands for playlist management
    CoreAudio output plugin
    BASS input plugin
    D-Bus (MPRIS) support

Notable changes:

    use of internal cue parser instead of libcue
    24-bit playback support for
        FLAC
        JACK
        sndio
    plugin ABI versioning checks
    new themes:
        dracula
        gruvbox
        gruvbox-alt
        jellybeans
    new commands:
        :left-view / :right-view
        :player-pause-playback
        :raise-vte
        :rand
        :version
        :win-half-page-down / :win-half-page-up
    new options:
        color_win_cur_attr
        input.*.priority
        lib_add_filter
        start_view
        time_show_leading_zero

6 files changed, 33 insertions, 25 deletions

diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 9b8dd8ba850..5e66f6dfcb3 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.74 2018/07/06 15:06:43 ryoon Exp $
+# $NetBSD: Makefile,v 1.75 2019/02/11 10:07:37 nia Exp $
 
-DISTNAME=		cmus-2.7.1
-PKGREVISION=		11
+DISTNAME=		cmus-2.8.0
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_GITHUB:=cmus/}
 GITHUB_TAG=		v${PKGVERSION_NOREV}
 
 MAINTAINER=		ahoka@NetBSD.org
 HOMEPAGE=		https://cmus.github.io/
-COMMENT=		Cmus is a small, fast and powerful text mode music player
+COMMENT=		Small, fast and powerful text mode music player
 LICENSE=		gnu-gpl-v2
 
+EXTRACT_USING=		bsdtar
 HAS_CONFIGURE=		yes
 USE_TOOLS+=		gmake pkg-config
 
@@ -18,7 +18,7 @@ REPLACE_SH+=		cmus-status-display
 
 CONFIGURE_ARGS+=	prefix=${PREFIX}
 CONFIGURE_ARGS+=	CONFIG_ALSA=n
-CONFIGURE_ARGS+=	mandir=${PREFIX}/${PKGMANDIR}/
+CONFIGURE_ARGS+=	mandir=${PREFIX}/${PKGMANDIR}
 PLIST_VARS+=		sunaudio oss
 
 .include "../../mk/oss.buildlink3.mk"
diff --git a/audio/cmus/PLIST b/audio/cmus/PLIST
index cf8ad00a7dd..035748cd9f7 100644
--- a/audio/cmus/PLIST
+++ b/audio/cmus/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.15 2018/01/01 22:29:16 rillig Exp $
+@comment $NetBSD: PLIST,v 1.16 2019/02/11 10:07:37 nia Exp $
 bin/cmus
 bin/cmus-remote
 ${PLIST.faad}lib/cmus/ip/aac.so
+lib/cmus/ip/cue.so
 ${PLIST.ffmpeg}lib/cmus/ip/ffmpeg.so
 ${PLIST.flac}lib/cmus/ip/flac.so
 ${PLIST.mad}lib/cmus/ip/mad.so
@@ -23,9 +24,13 @@ man/man1/cmus.1
 man/man7/cmus-tutorial.7
 share/cmus/cyan.theme
 share/cmus/default.theme
+share/cmus/dracula.theme
 share/cmus/gray-88.theme
 share/cmus/green-mono-88.theme
 share/cmus/green.theme
+share/cmus/gruvbox-alt.theme
+share/cmus/gruvbox.theme
+share/cmus/jellybeans.theme
 share/cmus/night.theme
 share/cmus/rc
 share/cmus/solarized-dark.theme
diff --git a/audio/cmus/distinfo b/audio/cmus/distinfo
index e7929f818a2..228612fe288 100644
--- a/audio/cmus/distinfo
+++ b/audio/cmus/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.22 2016/08/02 13:57:48 jperkin Exp $
+$NetBSD: distinfo,v 1.23 2019/02/11 10:07:37 nia Exp $
 
-SHA1 (cmus-2.7.1.tar.gz) = e31000f430054f96a0cf5897caef88741992cd32
-RMD160 (cmus-2.7.1.tar.gz) = f15e690243c0ed693f3c2e0e3c68630e0f5a8631
-SHA512 (cmus-2.7.1.tar.gz) = b29ce10bbb61eb41c33c4912be320718fcf005a5797320145b124f048f6be5f5b0cebb67471ef7b062bd6f854849b6aae0e82e9adbf289a44237787932ea1576
-Size (cmus-2.7.1.tar.gz) = 296818 bytes
-SHA1 (patch-mixer__sun.c) = 4a7599fc200157cbd1169125d03ce1e29b26b643
-SHA1 (patch-sun.c) = 1155871f5fcc714e3c26f21ecbd94604fee28a7f
+SHA1 (cmus-2.8.0.tar.gz) = f2ef867a481190f1f1b34dad450a12ae94201d44
+RMD160 (cmus-2.8.0.tar.gz) = 00cb515afa9848db7610771052409d0d3f9d29d7
+SHA512 (cmus-2.8.0.tar.gz) = cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc
+Size (cmus-2.8.0.tar.gz) = 317243 bytes
+SHA1 (patch-op_mixer__sun.c) = 13cb31e8b4aeab487b10af2aceeff9e248eb4b58
+SHA1 (patch-op_sun.c) = d8ab18cf049b05cfa1228483456523e7682d4c55
diff --git a/audio/cmus/options.mk b/audio/cmus/options.mk
index 3d61ae582de..0e8b6809803 100644
--- a/audio/cmus/options.mk
+++ b/audio/cmus/options.mk
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.19 2018/05/11 04:12:47 maya Exp $
+# $NetBSD: options.mk,v 1.20 2019/02/11 10:07:37 nia Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.cmus
-PKG_SUPPORTED_OPTIONS=		flac mad vorbis libao musepack faad wavpack pulseaudio
-PKG_SUPPORTED_OPTIONS+=		ffmpeg opus jack
+PKG_SUPPORTED_OPTIONS=		flac mad vorbis libao musepack faad wavpack \
+				ffmpeg opus jack pulseaudio
 PKG_OPTIONS_OPTIONAL_GROUPS=	mod
 PKG_OPTIONS_GROUP.mod=		modplug mikmod
 PKG_SUGGESTED_OPTIONS=		faad flac libao mad modplug opus vorbis
-PKG_OPTIONS_LEGACY_OPTS=	ao:libao
-PKG_OPTIONS_LEGACY_OPTS=	mpcdec:musepack
+PKG_OPTIONS_LEGACY_OPTS+=	ao:libao
+PKG_OPTIONS_LEGACY_OPTS+=	mpcdec:musepack
 
 .include "../../mk/bsd.options.mk"
 
@@ -49,10 +49,13 @@ CONFIGURE_ARGS+=	CONFIG_PULSE=n
 #
 .if !empty(PKG_OPTIONS:Mjack)
 .include "../../audio/jack/buildlink3.mk"
+.include "../../audio/libsamplerate/buildlink3.mk"
 CONFIGURE_ARGS+=	CONFIG_JACK=y
+CONFIGURE_ARGS+=	CONFIG_SAMPLERATE=y
 PLIST.jack=		yes
 .else
 CONFIGURE_ARGS+=	CONFIG_JACK=n
+CONFIGURE_ARGS+=	CONFIG_SAMPLERATE=n
 .endif
 
 ###
@@ -112,7 +115,7 @@ CONFIGURE_ARGS+=	CONFIG_WAVPACK=n
 # FFMPEG support
 #
 .if !empty(PKG_OPTIONS:Mffmpeg)
-.include "../../multimedia/ffmpeg1/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
 CONFIGURE_ARGS+=	CONFIG_FFMPEG=y
 PLIST.ffmpeg=		yes
 .else
diff --git a/audio/cmus/patches/patch-mixer__sun.c b/audio/cmus/patches/patch-op_mixer__sun.c
index bbfe5081810..ed605c3ca0f 100644
--- a/audio/cmus/patches/patch-mixer__sun.c
+++ b/audio/cmus/patches/patch-op_mixer__sun.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-mixer__sun.c,v 1.2 2014/04/21 09:49:49 wiz Exp $
+$NetBSD: patch-op_mixer__sun.c,v 1.1 2019/02/11 10:07:37 nia Exp $
 
 Fix build on SunOS.
 
---- mixer_sun.c.orig	2011-11-30 09:57:20.000000000 +0100
-+++ mixer_sun.c	2012-02-15 21:12:05.691072986 +0100
+--- op/mixer_sun.c.orig	2011-11-30 09:57:20.000000000 +0100
++++ op/mixer_sun.c	2012-02-15 21:12:05.691072986 +0100
 @@ -55,6 +55,7 @@ static int sun_mixer_get_option(int, cha
  
  static int mixer_open(const char *dev)
diff --git a/audio/cmus/patches/patch-sun.c b/audio/cmus/patches/patch-op_sun.c
index 1e838ca0ed7..e3fb5813e45 100644
--- a/audio/cmus/patches/patch-sun.c
+++ b/audio/cmus/patches/patch-op_sun.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-sun.c,v 1.2 2014/04/21 09:49:49 wiz Exp $
+$NetBSD: patch-op_sun.c,v 1.1 2019/02/11 10:07:37 nia Exp $
 
 Fix build on SunOS.
 
---- sun.c.orig	2011-11-30 09:57:20.000000000 +0100
-+++ sun.c	2012-02-15 21:12:09.658462551 +0100
+--- op/sun.c.orig	2011-11-30 09:57:20.000000000 +0100
++++ op/sun.c	2012-02-15 21:12:09.658462551 +0100
 @@ -32,6 +32,26 @@
  #include "sf.h"
  #include "xmalloc.h"