ports/114992: [PATCH] update audio/cmus to version 2.2.0

[Herbert J. Skuhra]

>Number:         114992
>Category:       ports
>Synopsis:       [PATCH] update audio/cmus to version 2.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 28 17:50:05 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Herbert J. Skuhra
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
FreeBSD oslo.ath.cx 6.2-STABLE FreeBSD 6.2-STABLE #0: Sat Jul 14 10:15:17 CEST 2007     herbert at oslo.ath.cx:/usr/obj/usr/src/sys/PC1  i386
>Description:
The attached patch* updates cmus to latest version (2.2.0) which was released yesterday. This version comes with a new input plugin (WAVPACK).

* http://norway.ath.cx/freebsd/cmus.diff
>How-To-Repeat:

>Fix:
# curl -O http://norway.ath.cx/freebsd/cmus.diff
# cp cmus.diff /usr/ports
# patch -p0 < cmus.diff
# portupgrade -aru


Patch attached with submission follows:

diff -ruN audio/cmus.bak/Makefile audio/cmus/Makefile
--- audio/cmus.bak/Makefile	2007-07-28 19:14:26.000000000 +0200
+++ audio/cmus/Makefile	2007-07-28 19:30:05.000000000 +0200
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cmus
-PORTVERSION=	2.1.0
-PORTREVISION=	2
+PORTVERSION=	2.2.0
 CATEGORIES=	audio
 MASTER_SITES=	http://onion.dynserv.net/~timo/files/ \
 		http://mirror.greaterscope.net/cmus/
@@ -20,7 +19,8 @@
 USE_GMAKE=	yes
 USE_ICONV=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=prefix=${TARGETDIR} mandir=${MANPREFIX}/man
+CONFIGURE_ARGS+=prefix=${TARGETDIR} mandir=${MANPREFIX}/man \
+		exampledir=${EXAMPLESDIR}
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -33,6 +33,7 @@
 		TREMOR "Use Tremor as Ogg/Vorbis input plugin" Off \
 		MP4 "MPEG-4 AAC support" Off \
 		AAC "AAC support" Off \
+		WAVPACK "Wavpack support" Off \
 		LIBAO "Libao cross-platform audio library" Off \
 		ARTS "ARTS support" Off
 
@@ -119,6 +120,15 @@
 PLIST_SUB+=	AAC="@comment "
 .endif
 
+.if defined(WITH_WAVPACK)
+LIB_DEPENDS+=	wavpack:${PORTSDIR}/audio/wavpack
+CONFIGURE_ARGS+=CONFIG_WAVPACK=y
+PLIST_SUB+=	WAVPACK=""
+.else
+CONFIGURE_ARGS+=CONFIG_WAVPACK=n
+PLIST_SUB+=     WAVPACK="@comment "
+.endif
+
 .if defined(WITH_LIBAO)
 LIB_DEPENDS+=	ao:${PORTSDIR}/audio/libao
 CONFIGURE_ARGS+=CONFIG_AO=y
diff -ruN audio/cmus.bak/distinfo audio/cmus/distinfo
--- audio/cmus.bak/distinfo	2007-07-28 19:14:26.000000000 +0200
+++ audio/cmus/distinfo	2007-07-28 19:14:57.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (cmus-2.1.0.tar.bz2) = 11ca53a05442ee073b6e790e957b1433
-SHA256 (cmus-2.1.0.tar.bz2) = fe47e258918526b9e1b2cd7081d73654af8c326f0f3b0fabe450b805b78423c0
-SIZE (cmus-2.1.0.tar.bz2) = 146956
+MD5 (cmus-2.2.0.tar.bz2) = 7a9895ecfc10cd16577c73051436962f
+SHA256 (cmus-2.2.0.tar.bz2) = f18ffafc7161a383ddc79b34cc16a5a38f675454c49799dac5d172bf22d12005
+SIZE (cmus-2.2.0.tar.bz2) = 155448
diff -ruN audio/cmus.bak/pkg-plist audio/cmus/pkg-plist
--- audio/cmus.bak/pkg-plist	2007-07-28 19:14:26.000000000 +0200
+++ audio/cmus/pkg-plist	2007-07-28 19:26:05.000000000 +0200
@@ -9,6 +9,7 @@
 %%VORBIS%%lib/cmus/ip/vorbis.so
 %%MP4%%lib/cmus/ip/mp4.so
 %%AAC%%lib/cmus/ip/aac.so
+%%WAVPACK%%lib/cmus/ip/wavpack.so
 lib/cmus/op/oss.so
 %%AO%%lib/cmus/op/ao.so
 %%ARTS%%lib/cmus/op/arts.so
@@ -16,6 +17,7 @@
 %%DATADIR%%/default.theme
 %%DATADIR%%/gray-88.theme
 %%DATADIR%%/green-mono-88.theme
+%%DATADIR%%/green.theme
 %%DATADIR%%/rc
 %%DATADIR%%/xterm-white.theme
 %%EXAMPLESDIR%%/cmus-status-display


>Release-Note:
>Audit-Trail:
>Unformatted: