Attachment #172991 for bug #211288




PORTNAME=	cmus
PORTVERSION=	2.6.0
DISTVERSIONPREFIX=	v
PORTREVISION=	4
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	\
			CUE ROAR PULSE ALSA JACK SAMPLERATE AO ARTS     \
			OSS SUN WAVEOUT
.for opt in ${_CMUS_CONFIGURE_OPTS}
CONFIGURE_ARGS+=	CONFIG_${opt}=n
.endfor

OPTIONS_DEFAULT=	AAC FFMPEG FLAC MAD MP4 OSS 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

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

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

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 zsh completion file
	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
	${INSTALL_DATA} ${WRKSRC}/contrib/_cmus \
		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_cmus

.include <bsd.port.mk>




--- 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)
 
 cdio.so: $(cdio-objs) $(libcmus-y)
@@ -216,10 +216,10 @@
 	$(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 $< $@




--- 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

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/




man/man1/cmus-remote.1.gz
man/man1/cmus.1.gz
man/man7/cmus-tutorial.7.gz
share/zsh/site-functions/_cmus
%%FLAC%%lib/cmus/ip/flac.so
%%MAD%%lib/cmus/ip/mad.so
%%MODPLUG%%lib/cmus/ip/modplug.so
%%MIKMOD%%lib/cmus/ip/mikmod.so
%%MUSEPACK%%lib/cmus/ip/mpc.so
%%OPUS%%lib/cmus/ip/opus.so
%%VORBIS%%lib/cmus/ip/vorbis.so
%%MP4%%lib/cmus/ip/mp4.so

Return to bug 211288

Lines 4-13 Link Here

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

Lines 1-24 Link Here

(-)files/patch-Makefile (-24 lines)
1	--- Makefile.orig 2012-11-11 17:40:55.000000000 +0100
2	+++ Makefile 2012-11-11 17:42:25.000000000 +0100
3	@@ -105,7 +105,7 @@
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	@@ -216,10 +216,10 @@
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 $< $@

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

Lines 5-15 Link Here

(-)pkg-plist (-1 / +2 lines)
5	man/man1/cmus-remote.1.gz	5	man/man1/cmus-remote.1.gz
6	man/man1/cmus.1.gz	6	man/man1/cmus.1.gz
7	man/man7/cmus-tutorial.7.gz	7	man/man7/cmus-tutorial.7.gz
		8	share/zsh/site-functions/_cmus
8	%%FLAC%%lib/cmus/ip/flac.so	9	%%FLAC%%lib/cmus/ip/flac.so
9	%%MAD%%lib/cmus/ip/mad.so	10	%%MAD%%lib/cmus/ip/mad.so
10	%%MODPLUG%%lib/cmus/ip/modplug.so	11	%%MODPLUG%%lib/cmus/ip/modplug.so
11	%%MIKMOD%%lib/cmus/ip/mikmod.so	12	%%MIKMOD%%lib/cmus/ip/mikmod.so
12	%%MPC%%lib/cmus/ip/mpc.so	13	%%MUSEPACK%%lib/cmus/ip/mpc.so
13	%%OPUS%%lib/cmus/ip/opus.so	14	%%OPUS%%lib/cmus/ip/opus.so
14	%%VORBIS%%lib/cmus/ip/vorbis.so	15	%%VORBIS%%lib/cmus/ip/vorbis.so
15	%%MP4%%lib/cmus/ip/mp4.so	16	%%MP4%%lib/cmus/ip/mp4.so