pkg/37856: PATCH: cmus upgrade to 2.2.0 with destdir and ncursesw support

[adam.hoka%gmail.com@localhost]

>Number:         37856
>Category:       pkg
>Synopsis:       PATCH: cmus upgrade to 2.2.0 with destdir and ncursesw support
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Jan 23 20:50:00 +0000 2008
>Originator:     Adam Hoka
>Release:        NetBSD 4.0
>Organization:
>Environment:
>Description:
Patch with ugrade cmus to latest version. Tested on NetBSD 4.0.
Also destdir support and ncursesw option added.
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/cmus/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile    19 Nov 2007 00:10:31 -0000      1.9
+++ Makefile    23 Jan 2008 19:43:49 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.9 2007/11/19 00:10:31 hubertf 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
@@ -11,6 +10,8 @@
 HOMEPAGE=              http://onion.dynserv.net/~timo/files/
 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
 
@@ -32,5 +33,4 @@
 
 .include "options.mk"
 
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/audio/cmus/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST       13 Jan 2007 08:57:56 -0000      1.3
+++ PLIST       23 Jan 2008 19:43:49 -0000
@@ -15,6 +15,7 @@
 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
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/cmus/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo    13 Jan 2007 08:57:56 -0000      1.2
+++ distinfo    23 Jan 2008 19:43:49 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.2 2007/01/13 08:57:56 wiz 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
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/cmus/options.mk,v
retrieving revision 1.2
diff -u -r1.2 options.mk
--- options.mk  16 Dec 2007 21:45:30 -0000      1.2
+++ options.mk  23 Jan 2008 19:43:49 -0000
@@ -2,9 +2,10 @@
 
 PKG_OPTIONS_VAR=                               PKG_OPTIONS.cmus
 PKG_SUPPORTED_OPTIONS=                 flac mad vorbis arts ao mpcdec #faad 
alsa
-PKG_OPTIONS_OPTIONAL_GROUPS=   mod
+PKG_OPTIONS_OPTIONAL_GROUPS=           mod curses
 PKG_OPTIONS_GROUP.mod=                 modplug mikmod
-PKG_SUGGESTED_OPTIONS=                 flac mad ao vorbis modplug
+PKG_OPTIONS_GROUP.curses=              ncurses ncursesw
+PKG_SUGGESTED_OPTIONS=                 flac mad ao vorbis modplug ncurses
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -12,6 +13,12 @@
 
 # Package-specific option-handling
 
+.if !empty(PKG_OPTIONS:Mncurses)
+.  include "../../devel/ncurses/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mncursesw)
+.  include "../../devel/ncursesw/buildlink3.mk"
+.endif
+
 # Backends:
 #