Update cmus to 2.3.1, add Pulseaudio support.

PR:		ports/144497
Submitted by:	lx
Reviewed by:	Herbert J. Skuhra
Approved by:	Herbert J. Skuhra
Feature safe:	yes

4 files changed, 20 insertions, 11 deletions

diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index eedcbb71131c..ba293a223cd6 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	cmus
-PORTVERSION=	2.2.0
-PORTREVISION=	4
+PORTVERSION=	2.3.1
 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@gmail.com
 COMMENT=	Console-based music player with really cool features
@@ -21,8 +21,6 @@ USE_ICONV=	yes
 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 @@ OPTIONS=	FLAC "FLAC (Free Lossless Audio Codec) support" Off \
 		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 @@ CONFIGURE_ARGS+=CONFIG_AO=n
 PLIST_SUB+=	AO="@comment "
 .endif
 
+.if defined(WITH_PULSEAUDIO)
+LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
+CONFIGURE_ARGS+=CONFIG_PULSE=y
+PLIST_SUB+=	PULSEAUDIO=""
+.else
+CONFIGURE_ARGS+=CONFIG_PULSE=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 @@ PLIST_SUB+=	ARTS="@comment "
 .endif
 
 MAN1=	cmus.1 cmus-remote.1
+MAN7=	cmus-tutorial.7
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,doc/cmus/examples,examples/cmus,g' \
diff --git a/audio/cmus/distinfo b/audio/cmus/distinfo
index a5fcded755ff..c9a0fff1697f 100644
--- a/audio/cmus/distinfo
+++ b/audio/cmus/distinfo
@@ -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.1.tar.bz2) = 1b77942c61dd7ddb63d4daf2a42ae58d
+SHA256 (cmus-v2.3.1.tar.bz2) = 9878947796c422e350513d616d93ab0a588f0f0312a96135ad61cd9fee2cdefd
+SIZE (cmus-v2.3.1.tar.bz2) = 166748
diff --git a/audio/cmus/pkg-descr b/audio/cmus/pkg-descr
index 4e3546505983..93b0ffabaa98 100644
--- a/audio/cmus/pkg-descr
+++ b/audio/cmus/pkg-descr
@@ -2,5 +2,4 @@ cmus is a small ncurses based music player. It supports various output methods
 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@gmail.com>
-WWW:	http://onion.dynserv.net/~timo/cmus.html
+WWW:	http://cmus.sourceforge.net
diff --git a/audio/cmus/pkg-plist b/audio/cmus/pkg-plist
index a120c32cbb06..f71ce2a1ab45 100644
--- a/audio/cmus/pkg-plist
+++ b/audio/cmus/pkg-plist
@@ -13,6 +13,7 @@ lib/cmus/ip/wav.so
 %%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