Wed Jul 16 14:04:29 2008 UTC ()
Add wavpack and aac/mp4 support.
Fix PLIST handling with options.
Add dlopen include.
Don't force OSS when not availible.
Handle sun output with more care (including PLIST).
Take maintainership.


(ahoka)
diff -r1.1.1.1 -r1.2 pkgsrc/audio/cmus/DESCR
diff -r1.11 -r1.12 pkgsrc/audio/cmus/Makefile
diff -r1.5 -r1.6 pkgsrc/audio/cmus/PLIST
diff -r1.4 -r1.5 pkgsrc/audio/cmus/options.mk
cvs diff -r1.1.1.1 -r1.2 pkgsrc/audio/cmus/DESCR (expand / switch to unified diff)

--- pkgsrc/audio/cmus/DESCR 2006/07/08 04:31:28 1.1.1.1
+++ pkgsrc/audio/cmus/DESCR 2008/07/16 14:04:29 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1CMus is a small and fast music player using the ncurses library. 1CMus is a small and fast music player using the ncurses library.
2CMus has vi-style command interface, e.g. searching using '/' or 2CMus has vi-style command interface, e.g. searching using '/' or
3'?' and adding files to playlist ':add ~/foo.ogg'. 3'?' and adding files to playlist ':add ~/foo.ogg'.
4 4
5 * Plays FLAC, OGG, MP3, WAV, modules 5 * Plays FLAC, OGG, MP3, MP4, AAC, WAV, WV and modules
6 * MP3 and Ogg streaming (Shoutcast/Icecast) 6 * MP3 and Ogg streaming (Shoutcast/Icecast)
7 * WinAmp / XMMS keys "zxcvb" 7 * WinAmp / XMMS keys "zxcvb"
8 * Can be controlled via UNIX socket 8 * Can be controlled via UNIX socket
9 * Customizable colors 9 * Customizable colors
10 * Nice vi-style interface with tabulator expansion 10 * Nice vi-style interface with tabulator expansion
11 * Background playlist loading 11 * Background playlist loading
12 * Track metadata database makes adding files to playlist very fast. 12 * Track metadata database makes adding files to playlist very fast.
13 * Album/artist modes. Playing within one album or artist. 13 * Album/artist modes. Playing within one album or artist.
14 * Powerful playlist filters 14 * Powerful playlist filters
15 * Can run external commands for the currently selected files 15 * Can run external commands for the currently selected files
16 * Directory browser 16 * Directory browser
17 * Supports 256 colors 17 * Supports 256 colors
18 * Play Queue 18 * Play Queue
cvs diff -r1.11 -r1.12 pkgsrc/audio/cmus/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/cmus/Makefile 2008/05/10 14:56:33 1.11
+++ pkgsrc/audio/cmus/Makefile 2008/07/16 14:04:29 1.12
@@ -1,36 +1,44 @@ @@ -1,36 +1,44 @@
1# $NetBSD: Makefile,v 1.11 2008/05/10 14:56:33 obache Exp $ 1# $NetBSD: Makefile,v 1.12 2008/07/16 14:04:29 ahoka Exp $
2# 2#
3 3
4DISTNAME= cmus-2.2.0 4DISTNAME= cmus-2.2.0
 5PKGREVISION= 1
5CATEGORIES= audio 6CATEGORIES= audio
6MASTER_SITES= http://mirror.greaterscope.net/cmus/ 7MASTER_SITES= http://mirror.greaterscope.net/cmus/
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= webmaster@deepblack24.de 10MAINTAINER= ahoka@NetBSD.org
10HOMEPAGE= http://cmus.sourceforge.net/ 11HOMEPAGE= http://cmus.sourceforge.net/
11COMMENT= Cmus is an ncurses based mp3/ogg player with a lot of features 12COMMENT= Cmus is an ncurses based music player with a lot of features
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
16USE_TOOLS+= gmake pkg-config 17USE_TOOLS+= gmake pkg-config
17 18
18CONFIGURE_ARGS+= prefix=${PREFIX} 19CONFIGURE_ARGS+= prefix=${PREFIX}
19CONFIGURE_ARGS+= CONFIG_ALSA=n 20CONFIGURE_ARGS+= CONFIG_ALSA=n
20CONFIGURE_ARGS+= CONFIG_OSS=y 
21CONFIGURE_ARGS+= mandir=${PREFIX}/${PKGMANDIR}/ 21CONFIGURE_ARGS+= mandir=${PREFIX}/${PKGMANDIR}/
22PLIST_VARS= sunaudio 22PLIST_VARS+= sunaudio oss
23 23
24.if exists(/usr/include/sys/audioio.h) 24.include "../../mk/oss.buildlink3.mk"
25PLIST.sunaudio= yes 25.if ${OSS_TYPE} != "none"
 26PLIST.oss= yes
 27CONFIGURE_ARGS+= CONFIG_OSS=y
 28.else
 29CONFIGURE_ARGS+= CONFIG_OSS=n
26.endif 30.endif
27 31
28.include "../../mk/bsd.prefs.mk" 32.include "../../mk/bsd.prefs.mk"
29.if ${OPSYS} == "SunOS" 33.if ${OPSYS} == "SunOS" || exists(/usr/include/sys/audioio.h)
30CONFIGURE_ARGS+= CONFIG_SUN=y 34CONFIGURE_ARGS+= CONFIG_SUN=y
 35PLIST.sunaudio= yes
 36.else
 37CONFIGURE_ARGS+= CONFIG_SUN=n
31.endif 38.endif
32 39
33.include "options.mk" 40.include "options.mk"
34 41
 42.include "../../mk/dlopen.buildlink3.mk"
35.include "../../converters/libiconv/buildlink3.mk" 43.include "../../converters/libiconv/buildlink3.mk"
36.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/audio/cmus/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/cmus/PLIST 2008/05/10 14:56:33 1.5
+++ pkgsrc/audio/cmus/PLIST 2008/07/16 14:04:29 1.6
@@ -1,23 +1,29 @@ @@ -1,23 +1,29 @@
1@comment $NetBSD: PLIST,v 1.5 2008/05/10 14:56:33 obache Exp $ 1@comment $NetBSD: PLIST,v 1.6 2008/07/16 14:04:29 ahoka Exp $
2bin/cmus 2bin/cmus
3bin/cmus-remote 3bin/cmus-remote
4lib/cmus/ip/flac.so 4${PLIST.flac}lib/cmus/ip/flac.so
5lib/cmus/ip/mad.so 5${PLIST.mad}lib/cmus/ip/mad.so
6lib/cmus/ip/modplug.so 6${PLIST.modplug}lib/cmus/ip/modplug.so
7lib/cmus/ip/vorbis.so 7${PLIST.mikmod}lib/cmus/ip/mikmod.so
 8${PLIST.vorbis}lib/cmus/ip/vorbis.so
 9${PLIST.faad}lib/cmus/ip/aac.so
 10${PLIST.faad}lib/cmus/ip/mp4.so
 11${PLIST.mpcdec}lib/cmus/ip/mpc.so
8lib/cmus/ip/wav.so 12lib/cmus/ip/wav.so
9lib/cmus/op/ao.so 13${PLIST.wavpack}lib/cmus/ip/wavpack.so
10lib/cmus/op/oss.so 14${PLIST.arts}lib/cmus/op/arts.so
 15${PLIST.ao}lib/cmus/op/ao.so
 16${PLIST.oss}lib/cmus/op/oss.so
11${PLIST.sunaudio}lib/cmus/op/sun.so 17${PLIST.sunaudio}lib/cmus/op/sun.so
12man/man1/cmus-remote.1 18man/man1/cmus-remote.1
13man/man1/cmus.1 19man/man1/cmus.1
14share/cmus/cyan.theme 20share/cmus/cyan.theme
15share/cmus/default.theme 21share/cmus/default.theme
16share/cmus/gray-88.theme 22share/cmus/gray-88.theme
17share/cmus/green-mono-88.theme 23share/cmus/green-mono-88.theme
18share/cmus/green.theme 24share/cmus/green.theme
19share/cmus/rc 25share/cmus/rc
20share/cmus/xterm-white.theme 26share/cmus/xterm-white.theme
21share/doc/cmus/examples/cmus-status-display 27share/doc/cmus/examples/cmus-status-display
22@dirrm share/doc/cmus/examples 28@dirrm share/doc/cmus/examples
23@dirrm share/cmus 29@dirrm share/cmus
cvs diff -r1.4 -r1.5 pkgsrc/audio/cmus/options.mk (expand / switch to unified diff)

--- pkgsrc/audio/cmus/options.mk 2008/05/10 14:56:33 1.4
+++ pkgsrc/audio/cmus/options.mk 2008/07/16 14:04:29 1.5
@@ -1,115 +1,136 @@ @@ -1,115 +1,136 @@
1# $NetBSD: options.mk,v 1.4 2008/05/10 14:56:33 obache Exp $ 1# $NetBSD: options.mk,v 1.5 2008/07/16 14:04:29 ahoka Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.cmus 3PKG_OPTIONS_VAR= PKG_OPTIONS.cmus
4PKG_SUPPORTED_OPTIONS= flac mad vorbis arts ao mpcdec #faad alsa 4PKG_SUPPORTED_OPTIONS= flac mad vorbis arts ao mpcdec faad wavpack #alsa
5PKG_SUPPORTED_OPTIONS+= wide-curses 5PKG_SUPPORTED_OPTIONS+= wide-curses
6PKG_OPTIONS_OPTIONAL_GROUPS= mod 6PKG_OPTIONS_OPTIONAL_GROUPS= mod
7PKG_OPTIONS_GROUP.mod= modplug mikmod 7PKG_OPTIONS_GROUP.mod= modplug mikmod
8PKG_SUGGESTED_OPTIONS= flac mad ao vorbis modplug 8PKG_SUGGESTED_OPTIONS= flac mad ao vorbis modplug
9 9
10.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
11 11
 12PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
 13
12### 14###
13### Backends 15### Backends
14### 16###
15 17
16# AO support 18# AO support
17# 19#
18.if !empty(PKG_OPTIONS:Mao) 20.if !empty(PKG_OPTIONS:Mao)
19. include "../../audio/libao/buildlink3.mk" 21. include "../../audio/libao/buildlink3.mk"
20CONFIGURE_ARGS+= CONFIG_AO=y 22CONFIGURE_ARGS+= CONFIG_AO=y
 23PLIST.ao= yes
21.else 24.else
22CONFIGURE_ARGS+= CONFIG_AO=n 25CONFIGURE_ARGS+= CONFIG_AO=n
23.endif 26.endif
24 27
25# ARTS support 28# ARTS support
26# 29#
27.if !empty(PKG_OPTIONS:Marts) 30.if !empty(PKG_OPTIONS:Marts)
28. include "../../audio/arts/buildlink3.mk" 31. include "../../audio/arts/buildlink3.mk"
29CONFIGURE_ARGS+= CONFIG_ARTS=y 32CONFIGURE_ARGS+= CONFIG_ARTS=y
 33PLIST.arts= yes
30.else 34.else
31CONFIGURE_ARGS+= CONFIG_ARTS=n 35CONFIGURE_ARGS+= CONFIG_ARTS=n
32.endif 36.endif
33 37
34# ALSA support 38# ALSA support
35# 39#
36# UNTESTED 40# UNTESTED
37#.if !empty(PKG_OPTIONS:Malsa) 41#.if !empty(PKG_OPTIONS:Malsa)
38#ONLY_FOR_PLATFORM= Linux-*-* # Alsa is Linux only 42#ONLY_FOR_PLATFORM= Linux-*-* # Alsa is Linux only
39#CONFIGURE_ARGS+= CONFIG_ALSA=y 43#CONFIGURE_ARGS+= CONFIG_ALSA=y
40#.endif 44#.endif
41 45
42### 46###
43### Codecs 47### Codecs
44### 48###
45 49
46# MAD support 50# MAD support
47# 51#
48.if !empty(PKG_OPTIONS:Mmad) 52.if !empty(PKG_OPTIONS:Mmad)
49.include "../../audio/libmad/buildlink3.mk" 53.include "../../audio/libmad/buildlink3.mk"
50CONFIGURE_ARGS+= CONFIG_MAD=y 54CONFIGURE_ARGS+= CONFIG_MAD=y
 55PLIST.mad= yes
51.else 56.else
52CONFIGURE_ARGS+= CONFIG_MAD=n 57CONFIGURE_ARGS+= CONFIG_MAD=n
53.endif 58.endif
54 59
55# VORBIS support 60# VORBIS support
56# 61#
57.if !empty(PKG_OPTIONS:Mvorbis) 62.if !empty(PKG_OPTIONS:Mvorbis)
58.include "../../audio/libvorbis/buildlink3.mk" 63.include "../../audio/libvorbis/buildlink3.mk"
59CONFIGURE_ARGS+= CONFIG_VORBIS=y 64CONFIGURE_ARGS+= CONFIG_VORBIS=y
 65PLIST.vorbis= yes
60.else 66.else
61CONFIGURE_ARGS+= CONFIG_VORBIS=n 67CONFIGURE_ARGS+= CONFIG_VORBIS=n
62.endif 68.endif
63 69
64# FLAC support 70# FLAC support
65# 71#
66.if !empty(PKG_OPTIONS:Mflac) 72.if !empty(PKG_OPTIONS:Mflac)
67.include "../../audio/flac/buildlink3.mk" 73.include "../../audio/flac/buildlink3.mk"
68CONFIGURE_ARGS+= CONFIG_FLAC=y 74CONFIGURE_ARGS+= CONFIG_FLAC=y
 75PLIST.flac= yes
69.else 76.else
70CONFIGURE_ARGS+= CONFIG_FLAC=n 77CONFIGURE_ARGS+= CONFIG_FLAC=n
71.endif 78.endif
72 79
73# MPCDEC support 80# MPCDEC support
74# 81#
75.if !empty(PKG_OPTIONS:Mmpcdec) 82.if !empty(PKG_OPTIONS:Mmpcdec)
76.include "../../audio/libmpcdec/buildlink3.mk" 83.include "../../audio/libmpcdec/buildlink3.mk"
77CONFIGURE_ARGS+= CONFIG_MPC=y 84CONFIGURE_ARGS+= CONFIG_MPC=y
 85PLIST.mpcdec= yes
78.else 86.else
79CONFIGURE_ARGS+= CONFIG_MPC=n 87CONFIGURE_ARGS+= CONFIG_MPC=n
80.endif 88.endif
81 89
 90# VAWPACK support
 91#
 92.if !empty(PKG_OPTIONS:Mwavpack)
 93.include "../../audio/wavpack/buildlink3.mk"
 94CONFIGURE_ARGS+= CONFIG_WAVPACK=y
 95PLIST.wavpack= yes
 96.else
 97CONFIGURE_ARGS+= CONFIG_WAVPACK=n
 98.endif
 99
82# modplay support 100# modplay support
83# 101#
84.if !empty(PKG_OPTIONS:Mmikmod) 102.if !empty(PKG_OPTIONS:Mmikmod)
85.include "../../audio/libmikmod/buildlink3.mk" 103.include "../../audio/libmikmod/buildlink3.mk"
 104.include "../../audio/libaudiofile/buildlink3.mk"
86CONFIGURE_ARGS+= CONFIG_MODPLUG=n 105CONFIGURE_ARGS+= CONFIG_MODPLUG=n
87CONFIGURE_ARGS+= CONFIG_MIKMOD=y 106CONFIGURE_ARGS+= CONFIG_MIKMOD=y
 107PLIST.mikmod= yes
88.endif 108.endif
89.if !empty(PKG_OPTIONS:Mmodplug) 109.if !empty(PKG_OPTIONS:Mmodplug)
90.include "../../audio/libmodplug/buildlink3.mk" 110.include "../../audio/libmodplug/buildlink3.mk"
91CONFIGURE_ARGS+= CONFIG_MODPLUG=y 111CONFIGURE_ARGS+= CONFIG_MODPLUG=y
92CONFIGURE_ARGS+= CONFIG_MIKMOD=n 112CONFIGURE_ARGS+= CONFIG_MIKMOD=n
 113PLIST.modplug= yes
93.endif 114.endif
94 115
95# FAAD support 116# FAAD support
96# 117#
97# XXX: faad2 in pkgsrc is heavily outdated as of 2007Q3, cmus needs newer. 118.if !empty(PKG_OPTIONS:Mfaad)
98# 119.include "../../audio/faad2/buildlink3.mk"
99#.if !empty(PKG_OPTIONS:Mfaad) 120.include "../../multimedia/libmp4v2/buildlink3.mk"
100#.include "../../audio/faad2/buildlink3.mk" 121CONFIGURE_ARGS+= CONFIG_AAC=y
101#CONFIGURE_ARGS+= CONFIG_AAC=y 122CONFIGURE_ARGS+= CONFIG_MP4=y
102#CONFIGURE_ARGS+= CONFIG_MP4=y 123PLIST.faad= yes
103#.else 124.else
104#CONFIGURE_ARGS+= CONFIG_AAC=n 125CONFIGURE_ARGS+= CONFIG_AAC=n
105#CONFIGURE_ARGS+= CONFIG_MP4=n 126CONFIGURE_ARGS+= CONFIG_MP4=n
106#.endif 127.endif
107 128
108### 129###
109### Wide curses support; otherwise, default to using narrow curses. 130### Wide curses support; otherwise, default to using narrow curses.
110### 131###
111.if !empty(PKG_OPTIONS:Mwide-curses) 132.if !empty(PKG_OPTIONS:Mwide-curses)
112. include "../../devel/ncursesw/buildlink3.mk" 133. include "../../devel/ncursesw/buildlink3.mk"
113.else 134.else
114. include "../../devel/ncurses/buildlink3.mk" 135. include "../../devel/ncurses/buildlink3.mk"
115.endif 136.endif