Update to 2.5.0.

Detailed release notes:
  http://article.gmane.org/gmane.comp.audio.cmus.devel/799

PR:		ports/173562
Submitted by:	"Herbert J. Skuhra" <h.skuhra@gmail.com> (maintainer)
Feature safe:	yes

4 files changed, 49 insertions, 11 deletions

diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 40689a942c03..c32014f168ec 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmus
-PORTVERSION=	2.4.3
+PORTVERSION=	2.5.0
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
@@ -20,9 +20,10 @@ CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man \
 		exampledir=${EXAMPLESDIR} \
 		CONFIG_ALSA=n CONFIG_ROAR=n
 
-OPTIONS_DEFINE=	AAC AO ARTS FFMPEG FLAC MAD MIKMOD MODPLUG MP4 \
-		MUSEPACK PULSEAUDIO TREMOR VORBIS WAVPACK
+OPTIONS_DEFINE=	AAC AO ARTS CDDB CDIO CUE DISCID FFMPEG FLAC MAD MIKMOD \
+		MODPLUG MP4 MUSEPACK PULSEAUDIO TREMOR VORBIS WAVPACK
 OPTIONS_DEFAULT=FLAC MAD VORBIS
+DISCID_DESC=	DISCID support
 
 .include <bsd.port.options.mk>
 
@@ -150,6 +151,40 @@ CONFIGURE_ARGS+=CONFIG_ARTS=n
 PLIST_SUB+=	ARTS="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MCDDB} && ${PORT_OPTIONS:MCDIO}
+LIB_DEPENDS+=	cddb:${PORTSDIR}/audio/libcddb
+CONFIGURE_ARGS+=CONFIG_CDDB=y
+PLIST_SUB+=	CDDB=""
+.else
+CONFIGURE_ARGS+=CONFIG_CDDB=n
+PLIST_SUB+=	CDDB="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MCDIO}
+LIB_DEPENDS+=	cdio:${PORTSDIR}/sysutils/libcdio
+CONFIGURE_ARGS+=CONFIG_CDIO=y
+PLIST_SUB+=	CDIO=""
+.else
+CONFIGURE_ARGS+=CONFIG_CDIO=n
+PLIST_SUB+=	CDIO="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MCUE}
+LIB_DEPENDS+=	cue:${PORTSDIR}/textproc/libcue
+CONFIGURE_ARGS+=CONFIG_CUE=y
+PLIST_SUB+=	CUE=""
+.else
+CONFIGURE_ARGS+=CONFIG_CUE=n
+PLIST_SUB+=	CUE="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MDISCID}
+LIB_DEPENDS+=	discid:${PORTSDIR}/audio/libdiscid
+CONFIGURE_ARGS+=CONFIG_DISCID=y
+.else
+CONFIGURE_ARGS+=CONFIG_DISCID=n
+.endif
+
 MAN1=	cmus.1 cmus-remote.1
 MAN7=	cmus-tutorial.7
 
diff --git a/audio/cmus/distinfo b/audio/cmus/distinfo
index 472b3cd52b32..f431a932ffc5 100644
--- a/audio/cmus/distinfo
+++ b/audio/cmus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cmus-v2.4.3.tar.bz2) = c8b853d6cc4de6cc628fe1cf48f5a841ab230d818bdbf39131b69d88844bcffe
-SIZE (cmus-v2.4.3.tar.bz2) = 204508
+SHA256 (cmus-v2.5.0.tar.bz2) = 2021fab64088898d62d1439525ec345e219f58d91a9e933dc85e84eda21c8ddf
+SIZE (cmus-v2.5.0.tar.bz2) = 224675
diff --git a/audio/cmus/files/patch-Makefile b/audio/cmus/files/patch-Makefile
index 0913dc0c81dd..c988b9658a0b 100644
--- a/audio/cmus/files/patch-Makefile
+++ b/audio/cmus/files/patch-Makefile
@@ -1,15 +1,15 @@
---- ./Makefile.orig	2011-11-30 03:57:20.000000000 -0500
-+++ ./Makefile	2012-10-14 20:42:11.000000000 -0400
-@@ -96,7 +96,7 @@
+--- Makefile.orig	2012-11-11 17:40:55.000000000 +0100
++++ Makefile	2012-11-11 17:42:25.000000000 +0100
+@@ -105,7 +105,7 @@
  $(wavpack-objs):	CFLAGS += $(WAVPACK_CFLAGS)
  $(mp4-objs):		CFLAGS += $(MP4_CFLAGS)
  $(aac-objs):		CFLAGS += $(AAC_CFLAGS)
 -$(ffmpeg-objs):		CFLAGS += $(FFMPEG_CFLAGS)
 +$(ffmpeg-objs):		CFLAGS := $(FFMPEG_CFLAGS) $(CFLAGS)
+ $(cue-objs):		CFLAGS += $(CUE_CFLAGS)
  
- flac.so: $(flac-objs) $(libcmus-y)
- 	$(call cmd,ld_dl,$(FLAC_LIBS))
-@@ -200,10 +200,10 @@
+ cdio.so: $(cdio-objs) $(libcmus-y)
+@@ -216,10 +216,10 @@
  	$(call cmd,ttman)
  
  Doc/ttman.o: Doc/ttman.c
diff --git a/audio/cmus/pkg-plist b/audio/cmus/pkg-plist
index f71ce2a1ab45..6778e10e3486 100644
--- a/audio/cmus/pkg-plist
+++ b/audio/cmus/pkg-plist
@@ -11,6 +11,8 @@ lib/cmus/ip/wav.so
 %%AAC%%lib/cmus/ip/aac.so
 %%WAVPACK%%lib/cmus/ip/wavpack.so
 %%FFMPEG%%lib/cmus/ip/ffmpeg.so
+%%CDIO%%lib/cmus/ip/cdio.so
+%%CUE%%lib/cmus/ip/cue.so
 lib/cmus/op/oss.so
 %%AO%%lib/cmus/op/ao.so
 %%PULSEAUDIO%%lib/cmus/op/pulse.so
@@ -22,6 +24,7 @@ lib/cmus/op/oss.so
 %%DATADIR%%/green.theme
 %%DATADIR%%/rc
 %%DATADIR%%/xterm-white.theme
+%%DATADIR%%/zenburn.theme
 %%EXAMPLESDIR%%/cmus-status-display
 @dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%