Update to the 2.3.0 RC1 version.

This commit is contained in:
ahoka 2010-03-01 02:58:26 +00:00
parent a1450b13e9
commit 941c27e646
10 changed files with 54 additions and 118 deletions

View file

@ -1,17 +1,46 @@
# $NetBSD: Makefile,v 1.20 2009/08/27 19:44:49 wiz Exp $
# $NetBSD: Makefile,v 1.21 2010/03/01 02:58:26 ahoka Exp $
#
DISTNAME= cmus-2.2.0
PKGREVISION= 6
DISTNAME= cmus-v2.3.0-rc1
PKGNAME= ${DISTNAME:S/-rc/rc/:S/-v/-/}
CATEGORIES= audio
MASTER_SITES= http://mirror.greaterscope.net/cmus/
MASTER_SITES= http://downloads.sourceforge.net/project/cmus/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= ahoka@NetBSD.org
HOMEPAGE= http://cmus.sourceforge.net/
COMMENT= Cmus is a curses based music player with a lot of features
COMMENT= cmus is a small, fast and powerful text mode music player
CONFLICTS+= cmus-unofficial-[0-9]*
PKG_DESTDIR_SUPPORT= user-destdir
HAS_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config
CONFIGURE_ARGS+= prefix=${PREFIX}
CONFIGURE_ARGS+= CONFIG_ALSA=n
CONFIGURE_ARGS+= mandir=${PREFIX}/${PKGMANDIR}/
PLIST_VARS+= sunaudio oss
.include "../../mk/oss.buildlink3.mk"
.if ${OSS_TYPE} != "none"
PLIST.oss= yes
CONFIGURE_ARGS+= CONFIG_OSS=y
.else
CONFIGURE_ARGS+= CONFIG_OSS=n
.endif
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS" || exists(/usr/include/sys/audioio.h)
CONFIGURE_ARGS+= CONFIG_SUN=y
PLIST.sunaudio= yes
.else
CONFIGURE_ARGS+= CONFIG_SUN=n
.endif
.include "options.mk"
.include "../../audio/cmus/Makefile.common"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,34 +0,0 @@
# $NetBSD: Makefile.common,v 1.3 2009/08/27 19:44:49 wiz Exp $
#
# used by audio/cmus/Makefile
# used by audio/cmus-unofficial/Makefile
PKG_DESTDIR_SUPPORT= user-destdir
HAS_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config
CONFIGURE_ARGS+= prefix=${PREFIX}
CONFIGURE_ARGS+= CONFIG_ALSA=n
CONFIGURE_ARGS+= mandir=${PREFIX}/${PKGMANDIR}/
PLIST_VARS+= sunaudio oss
.include "../../mk/oss.buildlink3.mk"
.if ${OSS_TYPE} != "none"
PLIST.oss= yes
CONFIGURE_ARGS+= CONFIG_OSS=y
.else
CONFIGURE_ARGS+= CONFIG_OSS=n
.endif
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS" || exists(/usr/include/sys/audioio.h)
CONFIGURE_ARGS+= CONFIG_SUN=y
PLIST.sunaudio= yes
.else
CONFIGURE_ARGS+= CONFIG_SUN=n
.endif
.include "../../mk/dlopen.buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:32:03 joerg Exp $
@comment $NetBSD: PLIST,v 1.9 2010/03/01 02:58:26 ahoka Exp $
bin/cmus
bin/cmus-remote
${PLIST.flac}lib/cmus/ip/flac.so
@ -17,6 +17,7 @@ ${PLIST.oss}lib/cmus/op/oss.so
${PLIST.sunaudio}lib/cmus/op/sun.so
man/man1/cmus-remote.1
man/man1/cmus.1
man/man7/cmus-tutorial.7
share/cmus/cyan.theme
share/cmus/default.theme
share/cmus/gray-88.theme

View file

@ -1,10 +1,5 @@
$NetBSD: distinfo,v 1.6 2008/12/19 15:14:20 ahoka Exp $
$NetBSD: distinfo,v 1.7 2010/03/01 02:58:26 ahoka Exp $
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
SHA1 (patch-aa) = b5cd6e9c799ea581bfecd242130274c869ed2103
SHA1 (patch-ab) = 1288149006ce37bd0ed69c020ae6e1992cb84743
SHA1 (patch-ac) = 76f346d0338f38c3657f29851d717c62b89d0791
SHA1 (patch-ad) = 8f750a81966d83839f7ca2d66728ce4a48072d73
SHA1 (patch-ae) = af34210b72c07f4673f34b23174852d5b388ed05
SHA1 (cmus-v2.3.0-rc1.tar.bz2) = da167298f45119bcff63223fb021eb7de0558b16
RMD160 (cmus-v2.3.0-rc1.tar.bz2) = 7e03581c0235608b91c95785b08440b97ee70dcb
Size (cmus-v2.3.0-rc1.tar.bz2) = 306054 bytes

View file

@ -1,12 +1,12 @@
# $NetBSD: options.mk,v 1.7 2009/01/01 21:46:58 hubertf Exp $
# $NetBSD: options.mk,v 1.8 2010/03/01 02:58:26 ahoka Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.cmus
PKG_SUPPORTED_OPTIONS= flac mad vorbis arts libao mpcdec faad wavpack #alsa
PKG_SUPPORTED_OPTIONS+= wide-curses
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_OPTIONS_LEGACY_OPTS=ao:libao
PKG_OPTIONS_LEGACY_OPTS= ao:libao
.include "../../mk/bsd.options.mk"
@ -98,6 +98,16 @@ PLIST.wavpack= yes
CONFIGURE_ARGS+= CONFIG_WAVPACK=n
.endif
# FFMPEG support
#
.if !empty(PKG_OPTIONS:Mffmpeg)
.include "../../multimedia/ffmpeg/buildlink3.mk"
CONFIGURE_ARGS+= CONFIG_FFMPEG=y
PLIST.ffmpeg= yes
.else
CONFIGURE_ARGS+= CONFIG_FFMPEG=n
.endif
# modplay support
#
.if !empty(PKG_OPTIONS:Mmikmod)

View file

@ -1,13 +0,0 @@
$NetBSD: patch-aa,v 1.1 2008/11/17 13:30:34 ahoka Exp $
--- Doc/ttman.c.orig 2007-07-27 16:52:13.000000000 +0200
+++ Doc/ttman.c
@@ -175,7 +175,7 @@ static int emit_keyword(const char *buf,
int i, len;
for (len = 0; len < size; len++) {
- if (!isalnum(buf[len]))
+ if (!isalnum((unsigned char)buf[len]))
break;
}

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ab,v 1.1 2008/11/17 13:30:34 ahoka Exp $
--- cmus.c.orig 2007-07-27 16:52:13.000000000 +0200
+++ cmus.c
@@ -560,7 +560,7 @@ static int pl_handle_line(void *data, co
struct pl_data *d = data;
int i = 0;
- while (isspace(line[i]))
+ while (isspace((unsigned char)line[i]))
i++;
if (line[i] == 0)
return 0;

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ac,v 1.1 2008/11/17 13:30:34 ahoka Exp $
--- command_mode.c.orig 2007-07-27 16:52:13.000000000 +0200
+++ command_mode.c
@@ -495,7 +495,7 @@ inside:
goto err;
if (count == 1) {
- switch (tolower(*arg)) {
+ switch (tolower((unsigned char)*arg)) {
case 'h':
seek *= 60;
case 'm':

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ad,v 1.1 2008/11/17 13:30:34 ahoka Exp $
--- filters.c.orig 2007-07-27 16:52:13.000000000 +0200
+++ filters.c
@@ -272,7 +272,7 @@ static int validate_filter_name(const ch
int i;
for (i = 0; name[i]; i++) {
- if (isalnum(name[i]))
+ if (isalnum((unsigned char)name[i]))
continue;
if (name[i] == '_' || name[i] == '-')
continue;

View file

@ -1,13 +0,0 @@
$NetBSD: patch-ae,v 1.2 2008/12/19 15:14:20 ahoka Exp $
--- cmus-status-display.orig 2007-07-27 16:52:13.000000000 +0200
+++ cmus-status-display
@@ -19,7 +19,7 @@
output()
{
# write status to /tmp/cmus-status (not very useful though)
- echo "$*" >> /tmp/cmus-status 2>&1
+ echo "$*" >> $HOME/.cmus-status 2>&1
# WMI (http://wmi.modprobe.de/)
#wmiremote -t "$*" &> /dev/null