Update cmus to 2.2.0.

Based on patch provided by Adam Hoka in PR 37856.

This release adds replaygain support (with help from Johannes Weißl).
To enable replaygain do ":set replaygain=true".

New commands:
    prev-view - switch to the previously used view
    tqueue    - add random tracks to the play-queue
    lqueue    - add random albums to the play-queue

New plugins:
    ffmpeg    - .wma files, could extend to support more
    wavpack   - .wv files
    waveout   - output plugin for Windows

There's also Cygwin support, many bug fixes, a new theme (green.theme)
and status scripts for Gaim and Pidgin in the contrib directory.

Changes
-------

Aaron Lehmann (2):
      Date sorting
      Filter: handle yyyy-mm-dd dates

Andrew Fuller (1):
      browse: Keep ".." sorted on top

David Thiel (1):
      Status script for pidgin

Frank Terbeck (2):
      mail address update
      added :prev-view command.

Johannes Weißl (5):
      mpc: Tag reading fixes
      mpc: Tag reading fixes (part 2)
      Convert "album artist" tag to albumartist (hydrogenaudio suggestion)
      Support artistsort and albumartistsort tags
      Added wavpack plugin, added ape-support for mp3s.

Joshua Kwan (1):
      Status script for Gaim

Kevin Ko (3):
      ffmpeg plugin
      Fix seeking with recent version of ffmpeg
      ffmpeg: Fix deprecated warning and remove audio/x-ms-wma MIME type

Rob Wilson (1):
      Another green theme

Sven Wegener (1):
      Set window hardstatus instead of window alias

Thomas Nordlander (1):
      Display selected line in the settings view as active

Timo Hirvonen (66):
      Close unused fds after fork()
      Simplify tab completion code by removing nr_tails variable
      Simplify tab completion code
      Fix typo in cmus.1
      Sort playlist file for library views in same order as view 2
      Remove simple_track_cmp()
      Add albumartist to valid sort keys
      Use albumartist tag instead of <Compilations> when possible
      Convert album_artist tag to albumartist
      aac/mp4: Fix incompatible type warnings
      Improve searching URLs
      Indent ffmpeg.c
      Collect REPLAYGAIN_* tags
      ID3: Parse replay gain tags
      Pass struct track_info to player functions instead of filename
      Remove cur_track_info hack
      cmus_play_file: Treat URLs specially
      AAC: Detect corrupted stream
      Replaygain support
      Make replaygain limiting optional
      Add helper functions for allocating struct keyval arrays
      mpc: Get replaygain info
      mad: Simplify tag reading somewhat
      Simplify tag reading code in plugins
      Don't add duplicate tags
      flac: Fix metadata reading
      wavpack: Fix "FALSE undeclared" error
      Link ape.o to cmus instead wavpack, mpc and mad plugins
      Rename struct APE to struct apetag and make it public
      wavpack: Pass correct sample count to format_samples()
      wavpack: Get file size only once, use ip_data->remote to see if we can seek
      ID3: Rename struct ID3 to struct id3tag and make it public
      Link id3.o and utf8_encode.o to cmus instead of aac, mad and wavpack plugins
      Make sorting by albumartist fall back to artist
      Some documentation for settings view
      Rename shuffle_list_add_track() to list_add_rand()
      Add tqueue command
      Add lqueue command
      lqueue/tqueue: Lock editable
      configure: Add exampledir variable
      audio/x-mpegurl is playlist, not mpeg stream
      Always write MIME type to the debug file
      Write error messages to the debug file
      Make error_msg() display errors at init time
      Use error_msg() instead of warn() and warn_errno()
      ALSA: Override default error handler
      Always display errors
      Lower minimum error display time to two seconds
      Start playing on :seek if stopped
      seek: Ceil position to duration - 5s
      Document lqueue, tqueue and prev-view commands
      Don't allow saving if tracks are being added
      Remove useless function quit()
      Confirm quit if loading playlist
      Build system: Remove .NOTPARALLEL
      Fix libmikmod 3.1.10 check
      Fix some includes
      mad: Move some code to a separate function
      mad: More code reorganization
      mad: Move XING debug code
      mad: Remove nomad.header
      mad: Avoid calling mad_timer_add() twice
      mad: Fix duration calculation
      Add warnings about insecurity of using TCP/IP
      Document Replay Gain
      2.2.0

dnk000@gmail.com (5):
      Cygwin support
      Waveout plugin
      Waveout fixes
      waveout: Fix buffer space calculation
      aac/mp4: Use faad 2.0 instead of 2.5 due to license issues

4 files changed, 23 insertions, 11 deletions

diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index a2489a72fc5..36535fdfc83 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.10 2008/04/12 22:42:58 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2008/05/10 14:56:33 obache Exp $
 #
 
-DISTNAME=		cmus-2.1.0
-PKGREVISION=		1
+DISTNAME=		cmus-2.2.0
 CATEGORIES=		audio
 MASTER_SITES=		http://mirror.greaterscope.net/cmus/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		webmaster@deepblack24.de
-HOMEPAGE=		http://onion.dynserv.net/~timo/files/
+HOMEPAGE=		http://cmus.sourceforge.net/
 COMMENT=		Cmus is an ncurses based mp3/ogg player with a lot of features
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 HAS_CONFIGURE=		yes
 USE_TOOLS+=		gmake pkg-config
 
@@ -31,5 +32,5 @@ CONFIGURE_ARGS+=	CONFIG_SUN=y
 
 .include "options.mk"
 
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/cmus/PLIST b/audio/cmus/PLIST
index 8f0c5270b16..d96673f5f6f 100644
--- a/audio/cmus/PLIST
+++ b/audio/cmus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/04/12 22:42:58 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/05/10 14:56:33 obache Exp $
 bin/cmus
 bin/cmus-remote
 lib/cmus/ip/flac.so
@@ -15,6 +15,7 @@ share/cmus/cyan.theme
 share/cmus/default.theme
 share/cmus/gray-88.theme
 share/cmus/green-mono-88.theme
+share/cmus/green.theme
 share/cmus/rc
 share/cmus/xterm-white.theme
 share/doc/cmus/examples/cmus-status-display
diff --git a/audio/cmus/distinfo b/audio/cmus/distinfo
index 5f68cf0532f..c9ef8436f95 100644
--- a/audio/cmus/distinfo
+++ b/audio/cmus/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2007/01/13 08:57:56 wiz Exp $
+$NetBSD: distinfo,v 1.3 2008/05/10 14:56:33 obache Exp $
 
-SHA1 (cmus-2.1.0.tar.bz2) = 961d4bd1446c9499aeaac5a280761e5d98ca514f
-RMD160 (cmus-2.1.0.tar.bz2) = f359c8929dd616855aedbe2c4d1d2e252a8946ca
-Size (cmus-2.1.0.tar.bz2) = 146956 bytes
+SHA1 (cmus-2.2.0.tar.bz2) = a6472633ac55660eb3aec5d2ae0296da86903bb2
+RMD160 (cmus-2.2.0.tar.bz2) = 1287666c16332ad34222461e29d8355ef607e7b5
+Size (cmus-2.2.0.tar.bz2) = 155448 bytes
diff --git a/audio/cmus/options.mk b/audio/cmus/options.mk
index b89b58e93aa..176b0500f60 100644
--- a/audio/cmus/options.mk
+++ b/audio/cmus/options.mk
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2008/02/28 17:15:48 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2008/05/10 14:56:33 obache Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.cmus
 PKG_SUPPORTED_OPTIONS=		flac mad vorbis arts ao mpcdec	#faad alsa
+PKG_SUPPORTED_OPTIONS+=		wide-curses
 PKG_OPTIONS_OPTIONAL_GROUPS=	mod
 PKG_OPTIONS_GROUP.mod=		modplug mikmod
 PKG_SUGGESTED_OPTIONS=		flac mad ao vorbis modplug
@@ -103,3 +104,12 @@ CONFIGURE_ARGS+=	CONFIG_MIKMOD=n
 #CONFIGURE_ARGS+=	CONFIG_AAC=n
 #CONFIGURE_ARGS+=	CONFIG_MP4=n
 #.endif
+
+###
+### Wide curses support; otherwise, default to using narrow curses.
+###
+.if !empty(PKG_OPTIONS:Mwide-curses)
+.  include "../../devel/ncursesw/buildlink3.mk"
+.else
+.  include "../../devel/ncurses/buildlink3.mk"
+.endif