3 files changed, 42 insertions, 10 deletions

diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index 55d1aeeae799..fc8b84a581d8 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cmus
-PORTVERSION=	2.5.1
-PORTREVISION=	3
+PORTVERSION=	2.6.0
 CATEGORIES=	audio
 
 MAINTAINER=	h.skuhra@gmail.com
@@ -14,7 +13,7 @@ LICENSE=	GPLv2
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME}
 GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	371fb58
+GH_COMMIT=	76421f1
 
 USES=		gmake pkgconfig iconv ncurses
 HAS_CONFIGURE=	yes
@@ -23,8 +22,9 @@ CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man \
 		exampledir=${EXAMPLESDIR} \
 		CONFIG_ALSA=n CONFIG_ARTS=n CONFIG_ROAR=n
 
-OPTIONS_DEFINE=	AAC AO CDDB CDIO CUE DISCID FFMPEG FLAC MAD MIKMOD \
-		MODPLUG MP4 MUSEPACK PULSEAUDIO TREMOR VORBIS WAVPACK
+OPTIONS_DEFINE=	AAC AO CDDB CDIO CUE DISCID FFMPEG FLAC JACK MAD MIKMOD \
+		MODPLUG MP4 MUSEPACK OPUS PULSEAUDIO SAMPLERATE TREMOR \
+		VORBIS WAVPACK
 OPTIONS_DEFAULT=FLAC MAD VORBIS
 DISCID_DESC=	DISCID support
 
@@ -74,6 +74,15 @@ CONFIGURE_ARGS+=CONFIG_MPC=n
 PLIST_SUB+=	MPC="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MOPUS}
+LIB_DEPENDS+=	libopusfile.so:${PORTSDIR}/audio/opusfile
+CONFIGURE_ARGS+=CONFIG_OPUS=y
+PLIST_SUB+=	OPUS=""
+.else
+CONFIGURE_ARGS+=CONFIG_OPUS=n
+PLIST_SUB+=	OPUS="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MVORBIS} || ${PORT_OPTIONS:MTREMOR}
 LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=CONFIG_VORBIS=y
@@ -147,10 +156,8 @@ PLIST_SUB+=	PULSEAUDIO="@comment "
 .if ${PORT_OPTIONS:MCDDB} && ${PORT_OPTIONS:MCDIO}
 LIB_DEPENDS+=	libcddb.so:${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}
@@ -178,9 +185,29 @@ CONFIGURE_ARGS+=CONFIG_DISCID=y
 CONFIGURE_ARGS+=CONFIG_DISCID=n
 .endif
 
+.if ${PORT_OPTIONS:MJACK}
+LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
+CONFIGURE_ARGS+=CONFIG_JACK=y
+PLIST_SUB+=	JACK=""
+.else
+CONFIGURE_ARGS+=CONFIG_JACK=n
+PLIST_SUB+=	JACK="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MSAMPLERATE} && ${PORT_OPTIONS:MJACK}
+LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
+CONFIGURE_ARGS+=CONFIG_SAMPLERATE=y
+.else
+CONFIGURE_ARGS+=CONFIG_SAMPLERATE=n
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,doc/cmus/examples,examples/cmus,g' \
 		${WRKSRC}/Doc/cmus.txt
 	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' ${WRKSRC}/Doc/cmus.txt
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cmus*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cmus/[io]p/*.so
+
 .include <bsd.port.mk>
diff --git a/audio/cmus/distinfo b/audio/cmus/distinfo
index b52542d01008..d6e547116ab2 100644
--- a/audio/cmus/distinfo
+++ b/audio/cmus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cmus-2.5.1.tar.gz) = 14742afc223d8bec2f9fad14b175b58aa686da06b3beaff73dc9e8cbe4d4ceb7
-SIZE (cmus-2.5.1.tar.gz) = 276353
+SHA256 (cmus-2.6.0.tar.gz) = 4c751b55594d098fc9768dfd40c15ac6e7f061ebf02276c8f3e0ef7200383839
+SIZE (cmus-2.6.0.tar.gz) = 287867
diff --git a/audio/cmus/pkg-plist b/audio/cmus/pkg-plist
index 60e793123c55..8affdc1a5eab 100644
--- a/audio/cmus/pkg-plist
+++ b/audio/cmus/pkg-plist
@@ -1,6 +1,7 @@
 bin/cmus
 bin/cmus-remote
 lib/cmus/ip/wav.so
+lib/cmus/op/oss.so
 man/man1/cmus-remote.1.gz
 man/man1/cmus.1.gz
 man/man7/cmus-tutorial.7.gz
@@ -9,6 +10,7 @@ man/man7/cmus-tutorial.7.gz
 %%MODPLUG%%lib/cmus/ip/modplug.so
 %%MIKMOD%%lib/cmus/ip/mikmod.so
 %%MPC%%lib/cmus/ip/mpc.so
+%%OPUS%%lib/cmus/ip/opus.so
 %%VORBIS%%lib/cmus/ip/vorbis.so
 %%MP4%%lib/cmus/ip/mp4.so
 %%AAC%%lib/cmus/ip/aac.so
@@ -16,15 +18,18 @@ man/man7/cmus-tutorial.7.gz
 %%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
+%%JACK%%lib/cmus/op/jack.so
 %%PULSEAUDIO%%lib/cmus/op/pulse.so
 %%DATADIR%%/cyan.theme
 %%DATADIR%%/default.theme
 %%DATADIR%%/gray-88.theme
 %%DATADIR%%/green-mono-88.theme
 %%DATADIR%%/green.theme
+%%DATADIR%%/night.theme
 %%DATADIR%%/rc
+%%DATADIR%%/solarized-dark.theme
+%%DATADIR%%/solarized-light.theme
 %%DATADIR%%/xterm-white.theme
 %%DATADIR%%/zenburn.theme
 %%EXAMPLESDIR%%/cmus-status-display