ports/144497: Update: audio/cmus -> 2.3.0

[David E.Thiel]

>Number:         144497
>Category:       ports
>Synopsis:       Update: audio/cmus -> 2.3.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 05 20:20:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     David E. Thiel
>Release:        FreeBSD 8.0-STABLE powerpc
>Organization:
FreeBSD
>Environment:
System: FreeBSD redundancy.redundancy.org 8.0-STABLE FreeBSD 8.0-STABLE #3: Mon Feb 22 09:01:02 PST 2010 root at redundancy.redundancy.org:/usr/obj/usr/src/sys/REDUNDANCY powerpc


>Description:

Updating cmus to 2.3.0.

``Among other things, this release features gapless MP3 playback, native
PulseAudio support, faster startup, and much improved compilations
handling.''

>How-To-Repeat:
>Fix:

diff -ruN cmus.orig/Makefile cmus/Makefile
--- cmus.orig/Makefile	2009-07-06 14:25:29.000000000 -0700
+++ cmus/Makefile	2010-03-05 11:33:01.000000000 -0800
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	cmus
-PORTVERSION=	2.2.0
-PORTREVISION=	4
+PORTVERSION=	2.3.0
 CATEGORIES=	audio
-MASTER_SITES=	http://onion.dynserv.net/~timo/files/ \
-		http://mirror.greaterscope.net/cmus/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	h.skuhra at gmail.com
 COMMENT=	Console-based music player with really cool features
@@ -21,8 +21,6 @@
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man \
 		exampledir=${EXAMPLESDIR}
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
 
 OPTIONS=	FLAC "FLAC (Free Lossless Audio Codec) support" Off \
 		MAD "MPEG Audio Decoder (libmad) support" On \
@@ -36,6 +34,7 @@
 		WAVPACK "Wavpack support" Off \
 		FFMPEG "FFMPEG support" Off \
 		LIBAO "Libao cross-platform audio library" Off \
+		PULSEAUDIO "Pulseaudio support" Off \
 		ARTS "ARTS support" Off
 
 .include <bsd.port.pre.mk>
@@ -148,6 +147,15 @@
 PLIST_SUB+=	AO="@comment "
 .endif
 
+.if defined(WITH_PULSEAUDIO)
+LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
+CONFIGURE_ARGS+=CONFIG_PULSEAUDIO=y
+PLIST_SUB+=	PULSEAUDIO=""
+.else
+CONFIGURE_ARGS+=CONFIG_PULSEAUDIO=n
+PLIST_SUB+=	PULSEAUDIO="@comment "
+.endif
+
 .if defined(WITH_ARTS)
 LIB_DEPENDS+=	artsc:${PORTSDIR}/audio/arts
 CONFIGURE_ARGS+=CONFIG_ARTS=y
@@ -158,6 +166,7 @@
 .endif
 
 MAN1=	cmus.1 cmus-remote.1
+MAN7=	cmus-tutorial.7
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,doc/cmus/examples,examples/cmus,g' \
diff -ruN cmus.orig/distinfo cmus/distinfo
--- cmus.orig/distinfo	2007-07-29 13:20:58.000000000 -0700
+++ cmus/distinfo	2010-03-05 11:23:14.000000000 -0800
@@ -1,3 +1,3 @@
-MD5 (cmus-2.2.0.tar.bz2) = 7a9895ecfc10cd16577c73051436962f
-SHA256 (cmus-2.2.0.tar.bz2) = f18ffafc7161a383ddc79b34cc16a5a38f675454c49799dac5d172bf22d12005
-SIZE (cmus-2.2.0.tar.bz2) = 155448
+MD5 (cmus-v2.3.0.tar.bz2) = 8039df4b08b9cbc2e050ab2922e6d99d
+SHA256 (cmus-v2.3.0.tar.bz2) = 5decc322cd44f86c06473c4c71423dec03156df9bdd8241ef7d484adf3ff64ee
+SIZE (cmus-v2.3.0.tar.bz2) = 166633
diff -ruN cmus.orig/pkg-descr cmus/pkg-descr
--- cmus.orig/pkg-descr	2006-12-22 23:24:59.000000000 -0800
+++ cmus/pkg-descr	2010-03-05 11:36:24.000000000 -0800
@@ -2,5 +2,4 @@
 by output-plugins. It has got completely configurable keybindings and it can be
 controlled from the outside via cmus-remote(1).
 
-Author:	Timo Hirvonen <tihirvon at gmail.com>
-WWW:	http://onion.dynserv.net/~timo/cmus.html
+WWW:	http://cmus.sourceforge.net
diff -ruN cmus.orig/pkg-plist cmus/pkg-plist
--- cmus.orig/pkg-plist	2007-08-02 09:17:31.000000000 -0700
+++ cmus/pkg-plist	2010-03-05 11:26:48.000000000 -0800
@@ -13,6 +13,7 @@
 %%FFMPEG%%lib/cmus/ip/ffmpeg.so
 lib/cmus/op/oss.so
 %%AO%%lib/cmus/op/ao.so
+%%PULSEAUDIO%%lib/cmus/op/pulse.so
 %%ARTS%%lib/cmus/op/arts.so
 %%DATADIR%%/cyan.theme
 %%DATADIR%%/default.theme
>Release-Note:
>Audit-Trail:
>Unformatted: