Attachment #173722 for bug #211288




# $FreeBSD$

PORTNAME=	cmus
PORTVERSION=	2.7.1
DISTVERSIONPREFIX=	v
PORTREVISION=	3
CATEGORIES=	audio

MAINTAINER=	t@tobik.me
COMMENT=	Console-based music player with really cool features

LICENSE=	GPLv2


USE_GITHUB=	yes

USES=		gmake iconv ncurses pkgconfig
HAS_CONFIGURE=	yes
CONFIGURE_ARGS=	prefix=${PREFIX} mandir=${MANPREFIX}/man \
		exampledir=${EXAMPLESDIR}
		exampledir=${EXAMPLESDIR} \
		CONFIG_ALSA=n CONFIG_ARTS=n CONFIG_ROAR=n

# So the build does not use gcc for compiling ttman
CONFIGURE_ARGS+=	HOSTCC=${CC}
		VORBIS WAVPACK
OPTIONS_DEFAULT=AAC FFMPEG FLAC MAD MP4 VORBIS

# Verbose build makes it easier to spot problems
MAKE_ARGS=	V=2

# Disable all configure options first.  These will be overwritten by
# enabled port options later.  The args to cmus' configure script
# follow shell value semantics i.e. later assignments overwrite
# previous assignments.  The options here appear in the same order as
# ${WRKSRC}/configure --help.  Please keep it that way.
_CMUS_CONFIGURE_OPTS=	CDDB CDIO DISCID FLAC MAD MODPLUG MIKMOD MPC	\
			VORBIS TREMOR OPUS WAV WAVPACK MP4 AAC FFMPEG	\
			VTX CUE ROAR PULSE ALSA JACK SAMPLERATE AO	\
			ARTS OSS SNDIO SUN WAVEOUT
.for opt in ${_CMUS_CONFIGURE_OPTS}
CONFIGURE_ARGS+=	CONFIG_${opt}=n
.endfor

OPTIONS_DEFAULT=	AAC FFMPEG FLAC MAD MP4 OSS SNDIO VORBIS WAV
OPTIONS_SUB=	yes
CONFIGURE_ARGS+=CONFIG_FLAC=y
PLIST_SUB+=	FLAC=""
.else
CONFIGURE_ARGS+=CONFIG_FLAC=n
PLIST_SUB+=	FLAC="@comment "
.endif

OPTIONS_GROUP=	OUT IN
OPTIONS_GROUP_OUT=	AO JACK OSS PULSEAUDIO SNDIO
OPTIONS_GROUP_IN=	AAC CDDB CDIO CUE DISCID FFMPEG FLAC MAD MIKMOD	\
			MODPLUG MP4 MUSEPACK OPUS SAMPLERATE TREMOR	\
			VORBIS WAV WAVPACK
CONFIGURE_ARGS+=CONFIG_MAD=n
PLIST_SUB+=	MAD="@comment "
.endif

DISCID_DESC=	libdiscid CDDA identification support
IN_DESC=	Input plugins
OUT_DESC=	Output plugins
PLIST_SUB+=	MODPLUG=""
.else
CONFIGURE_ARGS+=CONFIG_MODPLUG=n
PLIST_SUB+=	MODPLUG="@comment "
.endif

AAC_CONFIGURE_ON=	CONFIG_AAC=y
AAC_LIB_DEPENDS=	libfaad.so:audio/faad
CONFIGURE_ARGS+=CONFIG_MIKMOD=y
PLIST_SUB+=	MIKMOD=""
.else
PLIST_SUB+=	MIKMOD="@comment "
.endif

AO_CONFIGURE_ON=	CONFIG_AO=y
AO_LIB_DEPENDS=	libao.so:audio/libao
CONFIGURE_ARGS+=CONFIG_MPC=y
PLIST_SUB+=	MPC=""
.else
CONFIGURE_ARGS+=CONFIG_MPC=n
PLIST_SUB+=	MPC="@comment "
.endif

CDDB_CONFIGURE_ON=	CONFIG_CDDB=y
CDDB_LIB_DEPENDS=	libcddb.so:audio/libcddb
CONFIGURE_ARGS+=CONFIG_OPUS=y
PLIST_SUB+=	OPUS=""
.else
CONFIGURE_ARGS+=CONFIG_OPUS=n
PLIST_SUB+=	OPUS="@comment "
.endif

CDIO_CONFIGURE_ON=	CONFIG_CDIO=y
CDIO_LIB_DEPENDS=	libcdio_cdda.so:sysutils/libcdio-paranoia \
			libcdio.so:sysutils/libcdio
PLIST_SUB+=	VORBIS=""
.else
CONFIGURE_ARGS+=CONFIG_VORBIS=n
PLIST_SUB+=	VORBIS="@comment "
.endif

CUE_CONFIGURE_ON=	CONFIG_CUE=y
CUE_LIB_DEPENDS=	libcue.so:textproc/libcue
CONFIGURE_ARGS+=CONFIG_TREMOR=y
.endif

DISCID_CONFIGURE_ON=	CONFIG_DISCID=y
DISCID_LIB_DEPENDS=	libdiscid.so:audio/libdiscid
LIB_DEPENDS+=	libmp4v2.so:multimedia/mp4v2
CONFIGURE_ARGS+=CONFIG_MP4=y
PLIST_SUB+=	MP4=""
.else
CONFIGURE_ARGS+=CONFIG_MP4=n
PLIST_SUB+=	MP4="@comment "
.endif

FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
FFMPEG_CONFIGURE_ON=	CONFIG_FFMPEG=y
CONFIGURE_ARGS+=CONFIG_AAC=y
PLIST_SUB+=	AAC=""
.else
CONFIGURE_ARGS+=CONFIG_AAC=n
PLIST_SUB+=	AAC="@comment "
.endif

FLAC_CONFIGURE_ON=	CONFIG_FLAC=y
FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
CONFIGURE_ARGS+=CONFIG_WAVPACK=y
PLIST_SUB+=	WAVPACK=""
.else
CONFIGURE_ARGS+=CONFIG_WAVPACK=n
PLIST_SUB+=	WAVPACK="@comment "
.endif

JACK_CONFIGURE_ON=	CONFIG_JACK=y
JACK_LIB_DEPENDS=	libjack.so:audio/jack
RUN_DEPENDS+=	ffmpeg>=2:multimedia/ffmpeg
CONFIGURE_ARGS+=CONFIG_FFMPEG=y
PLIST_SUB+=	FFMPEG=""
.else
CONFIGURE_ARGS+=CONFIG_FFMPEG=n
PLIST_SUB+=	FFMPEG="@comment "
.endif

MAD_CONFIGURE_ON=	CONFIG_MAD=y
MAD_LIB_DEPENDS=	libmad.so:audio/libmad
CONFIGURE_ARGS+=CONFIG_AO=y
PLIST_SUB+=	AO=""
.else
CONFIGURE_ARGS+=CONFIG_AO=n
PLIST_SUB+=	AO="@comment "
.endif

MIKMOD_CONFIGURE_ON=	CONFIG_MIKMOD=y
MIKMOD_LIB_DEPENDS=	libmikmod.so:audio/libmikmod
CONFIGURE_ARGS+=CONFIG_PULSE=y
PLIST_SUB+=	PULSEAUDIO=""
.else
CONFIGURE_ARGS+=CONFIG_PULSE=n
PLIST_SUB+=	PULSEAUDIO="@comment "
.endif

MODPLUG_CONFIGURE_ON=	CONFIG_MODPLUG=y
MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
CONFIGURE_ARGS+=CONFIG_CDDB=y
.else
CONFIGURE_ARGS+=CONFIG_CDDB=n
.endif

MP4_CONFIGURE_ON=	CONFIG_MP4=y
MP4_LIB_DEPENDS=	libfaad.so:audio/faad \
			libmp4v2.so:multimedia/mp4v2
PLIST_SUB+=	CDIO=""
.else
CONFIGURE_ARGS+=CONFIG_CDIO=n
PLIST_SUB+=	CDIO="@comment "
.endif

MUSEPACK_CONFIGURE_ON=	CONFIG_MPC=y
MUSEPACK_LIB_DEPENDS=	libmpcdec.so:audio/musepack
CONFIGURE_ARGS+=CONFIG_CUE=y
PLIST_SUB+=	CUE=""
.else
CONFIGURE_ARGS+=CONFIG_CUE=n
PLIST_SUB+=	CUE="@comment "
.endif

OPUS_CONFIGURE_ON=	CONFIG_OPUS=y
OPUS_LIB_DEPENDS=	libopusfile.so:audio/opusfile
CONFIGURE_ARGS+=CONFIG_DISCID=y
.else
CONFIGURE_ARGS+=CONFIG_DISCID=n
.endif

OSS_CONFIGURE_ON=	CONFIG_OSS=y
LIB_DEPENDS+=	libjack.so:audio/jack
CONFIGURE_ARGS+=CONFIG_JACK=y
PLIST_SUB+=	JACK=""
.else
CONFIGURE_ARGS+=CONFIG_JACK=n
PLIST_SUB+=	JACK="@comment "
.endif

PULSEAUDIO_CONFIGURE_ON=	CONFIG_PULSE=y
PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
CONFIGURE_ARGS+=CONFIG_SAMPLERATE=y
.else
CONFIGURE_ARGS+=CONFIG_SAMPLERATE=n
.endif

# Requires a port of RoarAudio
#ROAR_CONFIGURE_ON=	CONFIG_ROAR=y
#ROAR_LIB_DEPENDS=	????:????

SAMPLERATE_IMPLIES=	JACK
SAMPLERATE_CONFIGURE_ON=	CONFIG_SAMPLERATE=y
SAMPLERATE_LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate

SNDIO_CONFIGURE_ON=	CONFIG_SNDIO=y
SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio

TREMOR_IMPLIES=	VORBIS
TREMOR_CONFIGURE_ON=	CONFIG_TREMOR=y
TREMOR_LIB_DEPENDS=	libvorbisidec.so:audio/libtremor

VORBIS_CONFIGURE_ON=	CONFIG_VORBIS=y
VORBIS_LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis

# VTX requires libayemu which isn't ported yet
#VTX_CONFIGURE_ON=	CONFIG_VTX=y
#VTX_LIB_DEPENDS=	libayemu.so:?????

WAV_CONFIGURE_ON=	CONFIG_WAV=y

WAVPACK_CONFIGURE_ON=	CONFIG_WAVPACK=y
WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack

# Doc/cmus.txt is used to generate the man pages.  Fix paths to point
# to the correct directories.
post-patch:
	@${REINPLACE_CMD} \
		-e 's,/usr/share/doc/cmus/examples,${EXAMPLESDIR},g' \
		-e 's,/usr/share/cmus,${DATADIR},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
# Install bash and zsh completion files
	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
	${INSTALL_DATA} ${WRKSRC}/contrib/cmus.bash-completion \
		${STAGEDIR}${PREFIX}/etc/bash_completion.d/_cmus.bash
	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
	${INSTALL_DATA} ${WRKSRC}/contrib/_cmus \
		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_cmus

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (cmus-cmus-v2.6.0_GH0.tar.gz) = 0c53c072432e026d682d1749bbe89777507b31107ca04afad21a9bf375208e8e	1	TIMESTAMP = 1469160686
2	SIZE (cmus-cmus-v2.6.0_GH0.tar.gz) = 287834	2	SHA256 (cmus-cmus-v2.7.1_GH0.tar.gz) = 8179a7a843d257ddb585f4c65599844bc0e516fe85e97f6f87a7ceade4eb5165
		3	SIZE (cmus-cmus-v2.7.1_GH0.tar.gz) = 296818




--- Makefile.orig	2014-08-11 07:48:28 UTC
+++ Makefile
@@ -111,7 +111,7 @@ $(opus-objs):		CFLAGS += $(OPUS_CFLAGS)
 $(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)
 
 cdio.so: $(cdio-objs) $(libcmus-y)
@@ -231,10 +231,10 @@ $(man7): Doc/ttman
 	$(call cmd,ttman)
 
 Doc/ttman.o: Doc/ttman.c
-	$(call cmd,hostcc,)
+	$(call cmd,cc,)
 
 Doc/ttman: Doc/ttman.o
-	$(call cmd,hostld,)
+	$(call cmd,ld,)
 
 quiet_cmd_ttman = MAN    $@
       cmd_ttman = Doc/ttman $< $@




Upstreamed in https://github.com/cmus/cmus/commit/37f4daaea4d2724cd2b4d66984cf72b012ef5d48 
--- configure.orig	2016-08-03 15:18:16 UTC
+++ configure
@@ -21,7 +21,7 @@ check_cflags()
 check_sndio()
 {
 	case `uname -s` in
-	OpenBSD)
+	OpenBSD|FreeBSD)
 		check_library SNDIO "" "-lsndio"
 		return $?
 	esac




This patch is needed because multimedia/mp4v2 doesn't currently have
MP4LogSetLevel.  It requires mp4v2 >= 2.0.0.

--- mp4.c.orig	2015-07-13 10:00:56 UTC
+++ mp4.c
@@ -155,7 +155,7 @@ static int mp4_open(struct input_plugin_
 		return -IP_ERROR_FUNCTION_NOT_SUPPORTED;
 
 	/* kindly ask mp4v2 to not spam stderr */
-	MP4LogSetLevel(MP4_LOG_NONE);
+	//MP4LogSetLevel(MP4_LOG_NONE);
 
 	/* init private struct */
 	priv = xnew(struct mp4_private, 1);




--- scripts/checks.sh.orig	2014-08-11 07:48:28 UTC
+++ scripts/checks.sh
@@ -677,11 +677,15 @@ check_dl()
 check_iconv()
 {
 	HAVE_ICONV=n
-	if check_library ICONV "" "-liconv"
+	if check_function iconv
+	then
+		echo "libc contains iconv"
+		makefile_var ICONV_CFLAGS ""
+		makefile_var ICONV_LIBS ""
+	elif check_library ICONV "" "-liconv"
 	then
 		echo "taking iconv from libiconv"
 	else
-		echo "assuming libc contains iconv"
 		makefile_var ICONV_CFLAGS ""
 		makefile_var ICONV_LIBS ""
 	fi




Upstreamed in https://github.com/cmus/cmus/commit/37f4daaea4d2724cd2b4d66984cf72b012ef5d48 
--- sndio.c.orig	2015-07-13 10:00:56 UTC
+++ sndio.c
@@ -20,7 +20,6 @@
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/audioio.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -82,6 +81,12 @@ static int sndio_set_sf(sample_format_t 
 		par.le = 1;
 
 	switch (sf_get_bits(sndio_sf)) {
+	case 32:
+		par.bits = 32;
+		break;
+	case 24:
+		par.bits = 24;
+		break;
 	case 16:
 		par.bits = 16;
 		break;

Lines 2-5 Link Here

(-)pkg-descr (-1 / +1 lines)
2	by output-plugins. It has got completely configurable keybindings and it can be	2	by output-plugins. It has got completely configurable keybindings and it can be
3	controlled from the outside via cmus-remote(1).	3	controlled from the outside via cmus-remote(1).
4		4
5	WWW: http://cmus.sourceforge.net	5	WWW: https://cmus.github.io/




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
%%FLAC%%lib/cmus/ip/flac.so
%%MAD%%lib/cmus/ip/mad.so
%%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
%%AO%%lib/cmus/op/ao.so
%%FFMPEG%%lib/cmus/ip/ffmpeg.so
%%CDIO%%lib/cmus/ip/cdio.so
%%CUE%%lib/cmus/ip/cue.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%%/solarized-light.theme
%%DATADIR%%/xterm-white.theme
%%DATADIR%%/zenburn.theme
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cmus-status-display
%%FFMPEG%%lib/cmus/ip/ffmpeg.so
%%FLAC%%lib/cmus/ip/flac.so
%%JACK%%lib/cmus/op/jack.so
%%MAD%%lib/cmus/ip/mad.so
%%MIKMOD%%lib/cmus/ip/mikmod.so
%%MODPLUG%%lib/cmus/ip/modplug.so
%%MP4%%lib/cmus/ip/mp4.so
%%MUSEPACK%%lib/cmus/ip/mpc.so
%%OPUS%%lib/cmus/ip/opus.so
%%OSS%%lib/cmus/op/oss.so
%%PULSEAUDIO%%lib/cmus/op/pulse.so
@comment %%ROAR%%lib/cmus/op/roar.so
%%SNDIO%%lib/cmus/op/sndio.so
%%VORBIS%%lib/cmus/ip/vorbis.so
@comment %%VTX%%lib/cmus/ip/vtx.so
%%WAV%%lib/cmus/ip/wav.so
%%WAVPACK%%lib/cmus/ip/wavpack.so
bin/cmus
bin/cmus-remote
etc/bash_completion.d/_cmus.bash
man/man1/cmus-remote.1.gz
man/man1/cmus.1.gz
man/man7/cmus-tutorial.7.gz
share/zsh/site-functions/_cmus

Return to bug 211288

Lines 2-13 Link Here

(-)Makefile (-167 / +105 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cmus	4	PORTNAME= cmus
5	PORTVERSION= 2.6.0	5	PORTVERSION= 2.7.1
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	PORTREVISION= 3
8	CATEGORIES= audio	7	CATEGORIES= audio
9		8
10	MAINTAINER= h.skuhra@gmail.com	9	MAINTAINER= t@tobik.me
11	COMMENT= Console-based music player with really cool features	10	COMMENT= Console-based music player with really cool features
12		11
13	LICENSE= GPLv2	12	LICENSE= GPLv2
Lines 15-214 Link Here
15		14
16	USE_GITHUB= yes	15	USE_GITHUB= yes
17		16
18	USES= gmake pkgconfig iconv ncurses	17	USES= gmake iconv ncurses pkgconfig
19	HAS_CONFIGURE= yes	18	HAS_CONFIGURE= yes
20	CONFIGURE_ENV+= HOSTCC=${CC}	19	CONFIGURE_ARGS= prefix=${PREFIX} mandir=${MANPREFIX}/man \
21	CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man \	20	exampledir=${EXAMPLESDIR}
22	exampledir=${EXAMPLESDIR} \
23	CONFIG_ALSA=n CONFIG_ARTS=n CONFIG_ROAR=n
24		21
25	OPTIONS_DEFINE= AAC AO CDDB CDIO CUE DISCID FFMPEG FLAC JACK MAD MIKMOD \	22	# So the build does not use gcc for compiling ttman
26	MODPLUG MP4 MUSEPACK OPUS PULSEAUDIO SAMPLERATE TREMOR \	23	CONFIGURE_ARGS+= HOSTCC=${CC}
27	VORBIS WAVPACK
28	OPTIONS_DEFAULT=AAC FFMPEG FLAC MAD MP4 VORBIS
29		24
30	DISCID_DESC= DISCID support	25	# Verbose build makes it easier to spot problems
		26	MAKE_ARGS= V=2
31		27
32	.include <bsd.port.options.mk>	28	# Disable all configure options first. These will be overwritten by
		29	# enabled port options later. The args to cmus' configure script
		30	# follow shell value semantics i.e. later assignments overwrite
		31	# previous assignments. The options here appear in the same order as
		32	# ${WRKSRC}/configure --help. Please keep it that way.
		33	_CMUS_CONFIGURE_OPTS= CDDB CDIO DISCID FLAC MAD MODPLUG MIKMOD MPC \
		34	VORBIS TREMOR OPUS WAV WAVPACK MP4 AAC FFMPEG \
		35	VTX CUE ROAR PULSE ALSA JACK SAMPLERATE AO \
		36	ARTS OSS SNDIO SUN WAVEOUT
		37	.for opt in ${_CMUS_CONFIGURE_OPTS}
		38	CONFIGURE_ARGS+= CONFIG_${opt}=n
		39	.endfor
33		40
34	.if ${PORT_OPTIONS:MFLAC}	41	OPTIONS_DEFAULT= AAC FFMPEG FLAC MAD MP4 OSS SNDIO VORBIS WAV
35	LIB_DEPENDS+= libFLAC.so:audio/flac	42	OPTIONS_SUB= yes
36	CONFIGURE_ARGS+=CONFIG_FLAC=y
37	PLIST_SUB+= FLAC=""
38	.else
39	CONFIGURE_ARGS+=CONFIG_FLAC=n
40	PLIST_SUB+= FLAC="@comment "
41	.endif
42		43
43	.if ${PORT_OPTIONS:MMAD}	44	OPTIONS_GROUP= OUT IN
44	LIB_DEPENDS+= libmad.so:audio/libmad	45	OPTIONS_GROUP_OUT= AO JACK OSS PULSEAUDIO SNDIO
45	CONFIGURE_ARGS+=CONFIG_MAD=y	46	OPTIONS_GROUP_IN= AAC CDDB CDIO CUE DISCID FFMPEG FLAC MAD MIKMOD \
46	PLIST_SUB+= MAD=""	47	MODPLUG MP4 MUSEPACK OPUS SAMPLERATE TREMOR \
47	.else	48	VORBIS WAV WAVPACK
48	CONFIGURE_ARGS+=CONFIG_MAD=n
49	PLIST_SUB+= MAD="@comment "
50	.endif
51		49
52	.if ${PORT_OPTIONS:MMODPLUG}	50	DISCID_DESC= libdiscid CDDA identification support
53	LIB_DEPENDS+= libmodplug.so:audio/libmodplug	51	IN_DESC= Input plugins
54	CONFIGURE_ARGS+=CONFIG_MODPLUG=y	52	OUT_DESC= Output plugins
55	PLIST_SUB+= MODPLUG=""
56	.else
57	CONFIGURE_ARGS+=CONFIG_MODPLUG=n
58	PLIST_SUB+= MODPLUG="@comment "
59	.endif
60		53
61	.if ${PORT_OPTIONS:MMIKMOD}	54	AAC_CONFIGURE_ON= CONFIG_AAC=y
62	LIB_DEPENDS+= libmikmod.so:audio/libmikmod	55	AAC_LIB_DEPENDS= libfaad.so:audio/faad
63	CONFIGURE_ARGS+=CONFIG_MIKMOD=y
64	PLIST_SUB+= MIKMOD=""
65	.else
66	PLIST_SUB+= MIKMOD="@comment "
67	.endif
68		56
69	.if ${PORT_OPTIONS:MMUSEPACK}	57	AO_CONFIGURE_ON= CONFIG_AO=y
70	LIB_DEPENDS+= libmpcdec.so:audio/musepack	58	AO_LIB_DEPENDS= libao.so:audio/libao
71	CONFIGURE_ARGS+=CONFIG_MPC=y
72	PLIST_SUB+= MPC=""
73	.else
74	CONFIGURE_ARGS+=CONFIG_MPC=n
75	PLIST_SUB+= MPC="@comment "
76	.endif
77		59
78	.if ${PORT_OPTIONS:MOPUS}	60	CDDB_CONFIGURE_ON= CONFIG_CDDB=y
79	LIB_DEPENDS+= libopusfile.so:audio/opusfile	61	CDDB_LIB_DEPENDS= libcddb.so:audio/libcddb
80	CONFIGURE_ARGS+=CONFIG_OPUS=y
81	PLIST_SUB+= OPUS=""
82	.else
83	CONFIGURE_ARGS+=CONFIG_OPUS=n
84	PLIST_SUB+= OPUS="@comment "
85	.endif
86		62
87	.if ${PORT_OPTIONS:MVORBIS} \|\| ${PORT_OPTIONS:MTREMOR}	63	CDIO_CONFIGURE_ON= CONFIG_CDIO=y
88	LIB_DEPENDS+= libvorbisfile.so:audio/libvorbis	64	CDIO_LIB_DEPENDS= libcdio_cdda.so:sysutils/libcdio-paranoia \
89	CONFIGURE_ARGS+=CONFIG_VORBIS=y	65	libcdio.so:sysutils/libcdio
90	PLIST_SUB+= VORBIS=""
91	.else
92	CONFIGURE_ARGS+=CONFIG_VORBIS=n
93	PLIST_SUB+= VORBIS="@comment "
94	.endif
95		66
96	.if ${PORT_OPTIONS:MTREMOR}	67	CUE_CONFIGURE_ON= CONFIG_CUE=y
97	LIB_DEPENDS+= libvorbisidec.so:audio/libtremor	68	CUE_LIB_DEPENDS= libcue.so:textproc/libcue
98	CONFIGURE_ARGS+=CONFIG_TREMOR=y
99	.endif
100		69
101	.if ${PORT_OPTIONS:MMP4}	70	DISCID_CONFIGURE_ON= CONFIG_DISCID=y
102	LIB_DEPENDS+= libfaad.so:audio/faad	71	DISCID_LIB_DEPENDS= libdiscid.so:audio/libdiscid
103	LIB_DEPENDS+= libmp4v2.so:multimedia/mp4v2
104	CONFIGURE_ARGS+=CONFIG_MP4=y
105	PLIST_SUB+= MP4=""
106	.else
107	CONFIGURE_ARGS+=CONFIG_MP4=n
108	PLIST_SUB+= MP4="@comment "
109	.endif
110		72
111	.if ${PORT_OPTIONS:MAAC}	73	FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg
112	LIB_DEPENDS+= libfaad.so:audio/faad	74	FFMPEG_CONFIGURE_ON= CONFIG_FFMPEG=y
113	CONFIGURE_ARGS+=CONFIG_AAC=y
114	PLIST_SUB+= AAC=""
115	.else
116	CONFIGURE_ARGS+=CONFIG_AAC=n
117	PLIST_SUB+= AAC="@comment "
118	.endif
119		75
120	.if ${PORT_OPTIONS:MWAVPACK}	76	FLAC_CONFIGURE_ON= CONFIG_FLAC=y
121	LIB_DEPENDS+= libwavpack.so:audio/wavpack	77	FLAC_LIB_DEPENDS= libFLAC.so:audio/flac
122	CONFIGURE_ARGS+=CONFIG_WAVPACK=y
123	PLIST_SUB+= WAVPACK=""
124	.else
125	CONFIGURE_ARGS+=CONFIG_WAVPACK=n
126	PLIST_SUB+= WAVPACK="@comment "
127	.endif
128		78
129	.if ${PORT_OPTIONS:MFFMPEG}	79	JACK_CONFIGURE_ON= CONFIG_JACK=y
130	BUILD_DEPENDS+= ffmpeg>=2:multimedia/ffmpeg	80	JACK_LIB_DEPENDS= libjack.so:audio/jack
131	RUN_DEPENDS+= ffmpeg>=2:multimedia/ffmpeg
132	CONFIGURE_ARGS+=CONFIG_FFMPEG=y
133	PLIST_SUB+= FFMPEG=""
134	.else
135	CONFIGURE_ARGS+=CONFIG_FFMPEG=n
136	PLIST_SUB+= FFMPEG="@comment "
137	.endif
138		81
139	.if ${PORT_OPTIONS:MAO}	82	MAD_CONFIGURE_ON= CONFIG_MAD=y
140	LIB_DEPENDS+= libao.so:audio/libao	83	MAD_LIB_DEPENDS= libmad.so:audio/libmad
141	CONFIGURE_ARGS+=CONFIG_AO=y
142	PLIST_SUB+= AO=""
143	.else
144	CONFIGURE_ARGS+=CONFIG_AO=n
145	PLIST_SUB+= AO="@comment "
146	.endif
147		84
148	.if ${PORT_OPTIONS:MPULSEAUDIO}	85	MIKMOD_CONFIGURE_ON= CONFIG_MIKMOD=y
149	LIB_DEPENDS+= libpulse.so:audio/pulseaudio	86	MIKMOD_LIB_DEPENDS= libmikmod.so:audio/libmikmod
150	CONFIGURE_ARGS+=CONFIG_PULSE=y
151	PLIST_SUB+= PULSEAUDIO=""
152	.else
153	CONFIGURE_ARGS+=CONFIG_PULSE=n
154	PLIST_SUB+= PULSEAUDIO="@comment "
155	.endif
156		87
157	.if ${PORT_OPTIONS:MCDDB} && ${PORT_OPTIONS:MCDIO}	88	MODPLUG_CONFIGURE_ON= CONFIG_MODPLUG=y
158	LIB_DEPENDS+= libcddb.so:audio/libcddb	89	MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug
159	CONFIGURE_ARGS+=CONFIG_CDDB=y
160	.else
161	CONFIGURE_ARGS+=CONFIG_CDDB=n
162	.endif
163		90
164	.if ${PORT_OPTIONS:MCDIO}	91	MP4_CONFIGURE_ON= CONFIG_MP4=y
165	LIB_DEPENDS+= libcdio_cdda.so:sysutils/libcdio-paranoia	92	MP4_LIB_DEPENDS= libfaad.so:audio/faad \
166	CONFIGURE_ARGS+=CONFIG_CDIO=y	93	libmp4v2.so:multimedia/mp4v2
167	PLIST_SUB+= CDIO=""
168	.else
169	CONFIGURE_ARGS+=CONFIG_CDIO=n
170	PLIST_SUB+= CDIO="@comment "
171	.endif
172		94
173	.if ${PORT_OPTIONS:MCUE}	95	MUSEPACK_CONFIGURE_ON= CONFIG_MPC=y
174	LIB_DEPENDS+= libcue.so:textproc/libcue	96	MUSEPACK_LIB_DEPENDS= libmpcdec.so:audio/musepack
175	CONFIGURE_ARGS+=CONFIG_CUE=y
176	PLIST_SUB+= CUE=""
177	.else
178	CONFIGURE_ARGS+=CONFIG_CUE=n
179	PLIST_SUB+= CUE="@comment "
180	.endif
181		97
182	.if ${PORT_OPTIONS:MDISCID}	98	OPUS_CONFIGURE_ON= CONFIG_OPUS=y
183	LIB_DEPENDS+= libdiscid.so:audio/libdiscid	99	OPUS_LIB_DEPENDS= libopusfile.so:audio/opusfile
184	CONFIGURE_ARGS+=CONFIG_DISCID=y
185	.else
186	CONFIGURE_ARGS+=CONFIG_DISCID=n
187	.endif
188		100
189	.if ${PORT_OPTIONS:MJACK}	101	OSS_CONFIGURE_ON= CONFIG_OSS=y
190	LIB_DEPENDS+= libjack.so:audio/jack
191	CONFIGURE_ARGS+=CONFIG_JACK=y
192	PLIST_SUB+= JACK=""
193	.else
194	CONFIGURE_ARGS+=CONFIG_JACK=n
195	PLIST_SUB+= JACK="@comment "
196	.endif
197		102
198	.if ${PORT_OPTIONS:MSAMPLERATE} && ${PORT_OPTIONS:MJACK}	103	PULSEAUDIO_CONFIGURE_ON= CONFIG_PULSE=y
199	LIB_DEPENDS+= libsamplerate.so:audio/libsamplerate	104	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
200	CONFIGURE_ARGS+=CONFIG_SAMPLERATE=y
201	.else
202	CONFIGURE_ARGS+=CONFIG_SAMPLERATE=n
203	.endif
204		105
		106	# Requires a port of RoarAudio
		107	#ROAR_CONFIGURE_ON= CONFIG_ROAR=y
		108	#ROAR_LIB_DEPENDS= ????:????
		109
		110	SAMPLERATE_IMPLIES= JACK
		111	SAMPLERATE_CONFIGURE_ON= CONFIG_SAMPLERATE=y
		112	SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate
		113
		114	SNDIO_CONFIGURE_ON= CONFIG_SNDIO=y
		115	SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
		116
		117	TREMOR_IMPLIES= VORBIS
		118	TREMOR_CONFIGURE_ON= CONFIG_TREMOR=y
		119	TREMOR_LIB_DEPENDS= libvorbisidec.so:audio/libtremor
		120
		121	VORBIS_CONFIGURE_ON= CONFIG_VORBIS=y
		122	VORBIS_LIB_DEPENDS= libvorbisfile.so:audio/libvorbis
		123
		124	# VTX requires libayemu which isn't ported yet
		125	#VTX_CONFIGURE_ON= CONFIG_VTX=y
		126	#VTX_LIB_DEPENDS= libayemu.so:?????
		127
		128	WAV_CONFIGURE_ON= CONFIG_WAV=y
		129
		130	WAVPACK_CONFIGURE_ON= CONFIG_WAVPACK=y
		131	WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack
		132
		133	# Doc/cmus.txt is used to generate the man pages. Fix paths to point
		134	# to the correct directories.
205	post-patch:	135	post-patch:
206	@${REINPLACE_CMD} -e 's,doc/cmus/examples,examples/cmus,g' \	136	@${REINPLACE_CMD} \
		137	-e 's,/usr/share/doc/cmus/examples,${EXAMPLESDIR},g' \
		138	-e 's,/usr/share/cmus,${DATADIR},g' \
207	${WRKSRC}/Doc/cmus.txt	139	${WRKSRC}/Doc/cmus.txt
208	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' ${WRKSRC}/Doc/cmus.txt
209		140
210	post-install:	141	post-install:
211	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cmus*	142	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cmus*
212	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cmus/[io]p/*.so	143	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cmus/[io]p/*.so
		144	# Install bash and zsh completion files
		145	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
		146	${INSTALL_DATA} ${WRKSRC}/contrib/cmus.bash-completion \
		147	${STAGEDIR}${PREFIX}/etc/bash_completion.d/_cmus.bash
		148	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
		149	${INSTALL_DATA} ${WRKSRC}/contrib/_cmus \
		150	${STAGEDIR}${PREFIX}/share/zsh/site-functions/_cmus
213		151
214	.include <bsd.port.mk>	152	.include <bsd.port.mk>

Lines 1-24 Link Here

(-)files/patch-Makefile (-24 lines)
1	--- Makefile.orig 2014-08-11 07:48:28 UTC
2	+++ Makefile
3	@@ -111,7 +111,7 @@ $(opus-objs): CFLAGS += $(OPUS_CFLAGS)
4	$(wavpack-objs): CFLAGS += $(WAVPACK_CFLAGS)
5	$(mp4-objs): CFLAGS += $(MP4_CFLAGS)
6	$(aac-objs): CFLAGS += $(AAC_CFLAGS)
7	-$(ffmpeg-objs): CFLAGS += $(FFMPEG_CFLAGS)
8	+$(ffmpeg-objs): CFLAGS := $(FFMPEG_CFLAGS) $(CFLAGS)
9	$(cue-objs): CFLAGS += $(CUE_CFLAGS)
10
11	cdio.so: $(cdio-objs) $(libcmus-y)
12	@@ -231,10 +231,10 @@ $(man7): Doc/ttman
13	$(call cmd,ttman)
14
15	Doc/ttman.o: Doc/ttman.c
16	- $(call cmd,hostcc,)
17	+ $(call cmd,cc,)
18
19	Doc/ttman: Doc/ttman.o
20	- $(call cmd,hostld,)
21	+ $(call cmd,ld,)
22
23	quiet_cmd_ttman = MAN $@
24	cmd_ttman = Doc/ttman $< $@

Line 0 Link Here

(-)files/patch-configure (+12 lines)
	1	Upstreamed in https://github.com/cmus/cmus/commit/37f4daaea4d2724cd2b4d66984cf72b012ef5d48
	2	--- configure.orig 2016-08-03 15:18:16 UTC
	3	+++ configure
	4	@@ -21,7 +21,7 @@ check_cflags()
	5	check_sndio()
	6	{
	7	case `uname -s` in
	8	- OpenBSD)
	9	+ OpenBSD\|FreeBSD)
	10	check_library SNDIO "" "-lsndio"
	11	return $?
	12	esac

Line 0 Link Here

(-)files/patch-mp4.c (+14 lines)
	1	This patch is needed because multimedia/mp4v2 doesn't currently have
	2	MP4LogSetLevel. It requires mp4v2 >= 2.0.0.
	3
	4	--- mp4.c.orig 2015-07-13 10:00:56 UTC
	5	+++ mp4.c
	6	@@ -155,7 +155,7 @@ static int mp4_open(struct input_plugin_
	7	return -IP_ERROR_FUNCTION_NOT_SUPPORTED;
	8
	9	/* kindly ask mp4v2 to not spam stderr */
	10	- MP4LogSetLevel(MP4_LOG_NONE);
	11	+ //MP4LogSetLevel(MP4_LOG_NONE);
	12
	13	/* init private struct */
	14	priv = xnew(struct mp4_private, 1);

Lines 1-20 Link Here

(-)files/patch-scripts_checks.sh (-20 lines)
1	--- scripts/checks.sh.orig 2014-08-11 07:48:28 UTC
2	+++ scripts/checks.sh
3	@@ -677,11 +677,15 @@ check_dl()
4	check_iconv()
5	{
6	HAVE_ICONV=n
7	- if check_library ICONV "" "-liconv"
8	+ if check_function iconv
9	+ then
10	+ echo "libc contains iconv"
11	+ makefile_var ICONV_CFLAGS ""
12	+ makefile_var ICONV_LIBS ""
13	+ elif check_library ICONV "" "-liconv"
14	then
15	echo "taking iconv from libiconv"
16	else
17	- echo "assuming libc contains iconv"
18	makefile_var ICONV_CFLAGS ""
19	makefile_var ICONV_LIBS ""
20	fi

Line 0 Link Here

(-)files/patch-sndio.c (+24 lines)
	1	Upstreamed in https://github.com/cmus/cmus/commit/37f4daaea4d2724cd2b4d66984cf72b012ef5d48
	2	--- sndio.c.orig 2015-07-13 10:00:56 UTC
	3	+++ sndio.c
	4	@@ -20,7 +20,6 @@
	5
	6	#include <sys/types.h>
	7	#include <sys/ioctl.h>
	8	-#include <sys/audioio.h>
	9	#include <sys/stat.h>
	10	#include <errno.h>
	11	#include <fcntl.h>
	12	@@ -82,6 +81,12 @@ static int sndio_set_sf(sample_format_t
	13	par.le = 1;
	14
	15	switch (sf_get_bits(sndio_sf)) {
	16	+ case 32:
	17	+ par.bits = 32;
	18	+ break;
	19	+ case 24:
	20	+ par.bits = 24;
	21	+ break;
	22	case 16:
	23	par.bits = 16;
	24	break;

Lines 1-26 Link Here

(-)pkg-plist (-21 / +26 lines)
1	bin/cmus
2	bin/cmus-remote
3	lib/cmus/ip/wav.so
4	lib/cmus/op/oss.so
5	man/man1/cmus-remote.1.gz
6	man/man1/cmus.1.gz
7	man/man7/cmus-tutorial.7.gz
8	%%FLAC%%lib/cmus/ip/flac.so
9	%%MAD%%lib/cmus/ip/mad.so
10	%%MODPLUG%%lib/cmus/ip/modplug.so
11	%%MIKMOD%%lib/cmus/ip/mikmod.so
12	%%MPC%%lib/cmus/ip/mpc.so
13	%%OPUS%%lib/cmus/ip/opus.so
14	%%VORBIS%%lib/cmus/ip/vorbis.so
15	%%MP4%%lib/cmus/ip/mp4.so
16	%%AAC%%lib/cmus/ip/aac.so	1	%%AAC%%lib/cmus/ip/aac.so
17	%%WAVPACK%%lib/cmus/ip/wavpack.so	2	%%AO%%lib/cmus/op/ao.so
18	%%FFMPEG%%lib/cmus/ip/ffmpeg.so
19	%%CDIO%%lib/cmus/ip/cdio.so	3	%%CDIO%%lib/cmus/ip/cdio.so
20	%%CUE%%lib/cmus/ip/cue.so	4	%%CUE%%lib/cmus/ip/cue.so
21	%%AO%%lib/cmus/op/ao.so
22	%%JACK%%lib/cmus/op/jack.so
23	%%PULSEAUDIO%%lib/cmus/op/pulse.so
24	%%DATADIR%%/cyan.theme	5	%%DATADIR%%/cyan.theme
25	%%DATADIR%%/default.theme	6	%%DATADIR%%/default.theme
26	%%DATADIR%%/gray-88.theme	7	%%DATADIR%%/gray-88.theme
Lines 32-35 Link Here
32	%%DATADIR%%/solarized-light.theme	13	%%DATADIR%%/solarized-light.theme
33	%%DATADIR%%/xterm-white.theme	14	%%DATADIR%%/xterm-white.theme
34	%%DATADIR%%/zenburn.theme	15	%%DATADIR%%/zenburn.theme
35	%%EXAMPLESDIR%%/cmus-status-display	16	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cmus-status-display
		17	%%FFMPEG%%lib/cmus/ip/ffmpeg.so
		18	%%FLAC%%lib/cmus/ip/flac.so
		19	%%JACK%%lib/cmus/op/jack.so
		20	%%MAD%%lib/cmus/ip/mad.so
		21	%%MIKMOD%%lib/cmus/ip/mikmod.so
		22	%%MODPLUG%%lib/cmus/ip/modplug.so
		23	%%MP4%%lib/cmus/ip/mp4.so
		24	%%MUSEPACK%%lib/cmus/ip/mpc.so
		25	%%OPUS%%lib/cmus/ip/opus.so
		26	%%OSS%%lib/cmus/op/oss.so
		27	%%PULSEAUDIO%%lib/cmus/op/pulse.so
		28	@comment %%ROAR%%lib/cmus/op/roar.so
		29	%%SNDIO%%lib/cmus/op/sndio.so
		30	%%VORBIS%%lib/cmus/ip/vorbis.so
		31	@comment %%VTX%%lib/cmus/ip/vtx.so
		32	%%WAV%%lib/cmus/ip/wav.so
		33	%%WAVPACK%%lib/cmus/ip/wavpack.so
		34	bin/cmus
		35	bin/cmus-remote
		36	etc/bash_completion.d/_cmus.bash
		37	man/man1/cmus-remote.1.gz
		38	man/man1/cmus.1.gz
		39	man/man7/cmus-tutorial.7.gz
		40	share/zsh/site-functions/_cmus