Attachment #126719 for bug #170476




# Created by: Adam Weinberger
# Date created:				14 October 2005
# Whom:					Adam Weinberger
#
# $FreeBSD$
#

PORTNAME=	cmus
PORTVERSION=	2.4.3
PORTREVISION=	2
CATEGORIES=	audio
MASTER_SITES=	SF/${PORTNAME}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}-v${PORTVERSION}

MAINTAINER=	h.skuhra@gmail.com

USE_GMAKE=	yes
USE_ICONV=	yes
USE_NCURSES=	yes
USE_PKGCONFIG=	build
HAS_CONFIGURE=	yes
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_DEFAULT=FLAC MAD VORBIS
		MIKMOD "libmikmod (mod, x3m, ...) support" Off \
		MUSEPACK "libmpcdec (Musepack .mpc) support" Off \
		VORBIS "Ogg/Vorbis support" On \
		TREMOR "Use Tremor as Ogg/Vorbis input plugin" Off \
		MP4 "MPEG-4 AAC support" Off \
		AAC "AAC 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.options.mk>

.if ${PORT_OPTIONS:MFLAC}
LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
CONFIGURE_ARGS+=CONFIG_FLAC=y
PLIST_SUB+=	FLAC=""

PLIST_SUB+=	FLAC="@comment "
.endif

.if ${PORT_OPTIONS:MMAD}
LIB_DEPENDS+=	mad:${PORTSDIR}/audio/libmad
CONFIGURE_ARGS+=CONFIG_MAD=y
PLIST_SUB+=	MAD=""

PLIST_SUB+=	MAD="@comment "
.endif

.if ${PORT_OPTIONS:MMODPLUG}
LIB_DEPENDS+=	modplug:${PORTSDIR}/audio/libmodplug
CONFIGURE_ARGS+=CONFIG_MODPLUG=y
PLIST_SUB+=	MODPLUG=""

PLIST_SUB+=	MODPLUG="@comment "
.endif

.if ${PORT_OPTIONS:MMIKMOD}
LIB_DEPENDS+=	mikmod:${PORTSDIR}/audio/libmikmod
CONFIGURE_ARGS+=CONFIG_MIKMOD=y
PLIST_SUB+=	MIKMOD=""

PLIST_SUB+=	MIKMOD="@comment "
.endif

.if ${PORT_OPTIONS:MMUSEPACK}
LIB_DEPENDS+=	mpcdec:${PORTSDIR}/audio/musepack
CONFIGURE_ARGS+=CONFIG_MPC=y
PLIST_SUB+=	MPC=""

PLIST_SUB+=	MPC="@comment "
.endif

.if ${PORT_OPTIONS:MVORBIS} || ${PORT_OPTIONS:MTREMOR}
LIB_DEPENDS+=	vorbisfile:${PORTSDIR}/audio/libvorbis
CONFIGURE_ARGS+=CONFIG_VORBIS=y
PLIST_SUB+=	VORBIS=""

PLIST_SUB+=	VORBIS="@comment "
.endif

.if ${PORT_OPTIONS:MTREMOR}
LIB_DEPENDS+=	vorbisidec:${PORTSDIR}/audio/libtremor
CONFIGURE_ARGS+=CONFIG_TREMOR=y
.endif

.if ${PORT_OPTIONS:MMP4}
LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
LIB_DEPENDS+=	mp4v2:${PORTSDIR}/multimedia/mp4v2
CONFIGURE_ARGS+=CONFIG_MP4=y

PLIST_SUB+=	MP4="@comment "
.endif

.if ${PORT_OPTIONS:MAAC}
LIB_DEPENDS+=	faad:${PORTSDIR}/audio/faad
CONFIGURE_ARGS+=CONFIG_AAC=y
PLIST_SUB+=	AAC=""

PLIST_SUB+=	AAC="@comment "
.endif

.if ${PORT_OPTIONS:MWAVPACK}
LIB_DEPENDS+=	wavpack:${PORTSDIR}/audio/wavpack
CONFIGURE_ARGS+=CONFIG_WAVPACK=y
PLIST_SUB+=	WAVPACK=""

PLIST_SUB+=	WAVPACK="@comment "
.endif

.if ${PORT_OPTIONS:MFFMPEG}
FFMPEG_SUFFIX=	-011
BUILD_DEPENDS+=	ffmpeg${FFMPEG_SUFFIX}>0.11:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX}
RUN_DEPENDS+=	ffmpeg${FFMPEG_SUFFIX}>0.11:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX}
CONFIGURE_ARGS+=CONFIG_FFMPEG=y
PLIST_SUB+=	FFMPEG=""
.else

PLIST_SUB+=	FFMPEG="@comment "
.endif

.if ${PORT_OPTIONS:MAO}
LIB_DEPENDS+=	ao:${PORTSDIR}/audio/libao
CONFIGURE_ARGS+=CONFIG_AO=y
PLIST_SUB+=	AO=""

PLIST_SUB+=	AO="@comment "
.endif

.if ${PORT_OPTIONS:MPULSEAUDIO}
LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
CONFIGURE_ARGS+=CONFIG_PULSE=y
PLIST_SUB+=	PULSEAUDIO=""

PLIST_SUB+=	PULSEAUDIO="@comment "
.endif

.if ${PORT_OPTIONS:MARTS}
LIB_DEPENDS+=	artsc:${PORTSDIR}/audio/arts
CONFIGURE_ARGS+=CONFIG_ARTS=y
PLIST_SUB+=	ARTS=""


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
	@${REINPLACE_CMD} -e 's,libavformat,libavformat${FFMPEG_SUFFIX},g' \
		${WRKSRC}/configure

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (cmus-v2.4.2.tar.bz2) = 1f54d94574f0f7f9beca34908b16141f8eb89070728305d8906b8dc19cca0c31	1	SHA256 (cmus-v2.4.3.tar.bz2) = c8b853d6cc4de6cc628fe1cf48f5a841ab230d818bdbf39131b69d88844bcffe
2	SIZE (cmus-v2.4.2.tar.bz2) = 204285	2	SIZE (cmus-v2.4.3.tar.bz2) = 204508




--- ./Makefile.orig	2011-11-30 03:57:20.000000000 -0500
+++ ./Makefile	2012-10-14 20:42:11.000000000 -0400
@@ -96,7 +96,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)
 
 flac.so: $(flac-objs) $(libcmus-y)
 	$(call cmd,ld_dl,$(FLAC_LIBS))
@@ -200,10 +200,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 $< $@

Return to bug 170476

Lines 1-16 Link Here

(-)Makefile (-42 / +30 lines)
1	# New ports collection makefile for: cmus	1	# Created by: Adam Weinberger
2	# Date created: 14 October 2005
3	# Whom: Adam Weinberger
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6	#
7		3
8	PORTNAME= cmus	4	PORTNAME= cmus
9	PORTVERSION= 2.4.2	5	PORTVERSION= 2.4.3
10	PORTREVISION= 2
11	CATEGORIES= audio	6	CATEGORIES= audio
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	7	MASTER_SITES= SF/${PORTNAME}
13	MASTER_SITE_SUBDIR= ${PORTNAME}
14	DISTNAME= ${PORTNAME}-v${PORTVERSION}	8	DISTNAME= ${PORTNAME}-v${PORTVERSION}
15		9
16	MAINTAINER= h.skuhra@gmail.com	10	MAINTAINER= h.skuhra@gmail.com
Lines 20-48 Link Here
20	USE_GMAKE= yes	14	USE_GMAKE= yes
21	USE_ICONV= yes	15	USE_ICONV= yes
22	USE_NCURSES= yes	16	USE_NCURSES= yes
		17	USE_PKGCONFIG= build
23	HAS_CONFIGURE= yes	18	HAS_CONFIGURE= yes
24	CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man \	19	CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man \
25	exampledir=${EXAMPLESDIR} \	20	exampledir=${EXAMPLESDIR} \
26	CONFIG_ALSA=n	21	CONFIG_ALSA=n CONFIG_ROAR=n
27		22
28	OPTIONS= FLAC "FLAC (Free Lossless Audio Codec) support" Off \	23	OPTIONS_DEFINE= AAC AO ARTS FFMPEG FLAC MAD MIKMOD MODPLUG MP4 \
29	MAD "MPEG Audio Decoder (libmad) support" On \	24	MUSEPACK PULSEAUDIO TREMOR VORBIS WAVPACK
30	MODPLUG "libmodplug (mod, x3m, ...) support" Off \	25	OPTIONS_DEFAULT=FLAC MAD VORBIS
31	MIKMOD "libmikmod (mod, x3m, ...) support" Off \
32	MUSEPACK "libmpcdec (Musepack .mpc) support" Off \
33	VORBIS "Ogg/Vorbis support" On \
34	TREMOR "Use Tremor as Ogg/Vorbis input plugin" Off \
35	MP4 "MPEG-4 AAC support" Off \
36	AAC "AAC support" Off \
37	WAVPACK "Wavpack support" Off \
38	FFMPEG "FFMPEG support" Off \
39	LIBAO "Libao cross-platform audio library" Off \
40	PULSEAUDIO "Pulseaudio support" Off \
41	ARTS "ARTS support" Off
42		26
43	.include <bsd.port.pre.mk>	27	.include <bsd.port.options.mk>
44		28
45	.if defined(WITH_FLAC)	29	.if ${PORT_OPTIONS:MFLAC}
46	LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac	30	LIB_DEPENDS+= FLAC:${PORTSDIR}/audio/flac
47	CONFIGURE_ARGS+=CONFIG_FLAC=y	31	CONFIGURE_ARGS+=CONFIG_FLAC=y
48	PLIST_SUB+= FLAC=""	32	PLIST_SUB+= FLAC=""
Lines 51-57 Link Here
51	PLIST_SUB+= FLAC="@comment "	35	PLIST_SUB+= FLAC="@comment "
52	.endif	36	.endif
53		37
54	.if !defined(WITHOUT_MAD)	38	.if ${PORT_OPTIONS:MMAD}
55	LIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad	39	LIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad
56	CONFIGURE_ARGS+=CONFIG_MAD=y	40	CONFIGURE_ARGS+=CONFIG_MAD=y
57	PLIST_SUB+= MAD=""	41	PLIST_SUB+= MAD=""
Lines 60-66 Link Here
60	PLIST_SUB+= MAD="@comment "	44	PLIST_SUB+= MAD="@comment "
61	.endif	45	.endif
62		46
63	.if defined(WITH_MODPLUG)	47	.if ${PORT_OPTIONS:MMODPLUG}
64	LIB_DEPENDS+= modplug:${PORTSDIR}/audio/libmodplug	48	LIB_DEPENDS+= modplug:${PORTSDIR}/audio/libmodplug
65	CONFIGURE_ARGS+=CONFIG_MODPLUG=y	49	CONFIGURE_ARGS+=CONFIG_MODPLUG=y
66	PLIST_SUB+= MODPLUG=""	50	PLIST_SUB+= MODPLUG=""
Lines 69-75 Link Here
69	PLIST_SUB+= MODPLUG="@comment "	53	PLIST_SUB+= MODPLUG="@comment "
70	.endif	54	.endif
71		55
72	.if defined(WITH_MIKMOD)	56	.if ${PORT_OPTIONS:MMIKMOD}
73	LIB_DEPENDS+= mikmod:${PORTSDIR}/audio/libmikmod	57	LIB_DEPENDS+= mikmod:${PORTSDIR}/audio/libmikmod
74	CONFIGURE_ARGS+=CONFIG_MIKMOD=y	58	CONFIGURE_ARGS+=CONFIG_MIKMOD=y
75	PLIST_SUB+= MIKMOD=""	59	PLIST_SUB+= MIKMOD=""
Lines 77-83 Link Here
77	PLIST_SUB+= MIKMOD="@comment "	61	PLIST_SUB+= MIKMOD="@comment "
78	.endif	62	.endif
79		63
80	.if defined(WITH_MUSEPACK)	64	.if ${PORT_OPTIONS:MMUSEPACK}
81	LIB_DEPENDS+= mpcdec:${PORTSDIR}/audio/musepack	65	LIB_DEPENDS+= mpcdec:${PORTSDIR}/audio/musepack
82	CONFIGURE_ARGS+=CONFIG_MPC=y	66	CONFIGURE_ARGS+=CONFIG_MPC=y
83	PLIST_SUB+= MPC=""	67	PLIST_SUB+= MPC=""
Lines 86-92 Link Here
86	PLIST_SUB+= MPC="@comment "	70	PLIST_SUB+= MPC="@comment "
87	.endif	71	.endif
88		72
89	.if !defined(WITHOUT_VORBIS) \|\| defined(WITH_TREMOR)	73	.if ${PORT_OPTIONS:MVORBIS} \|\| ${PORT_OPTIONS:MTREMOR}
90	LIB_DEPENDS+= vorbisfile:${PORTSDIR}/audio/libvorbis	74	LIB_DEPENDS+= vorbisfile:${PORTSDIR}/audio/libvorbis
91	CONFIGURE_ARGS+=CONFIG_VORBIS=y	75	CONFIGURE_ARGS+=CONFIG_VORBIS=y
92	PLIST_SUB+= VORBIS=""	76	PLIST_SUB+= VORBIS=""
Lines 95-106 Link Here
95	PLIST_SUB+= VORBIS="@comment "	79	PLIST_SUB+= VORBIS="@comment "
96	.endif	80	.endif
97		81
98	.if defined(WITH_TREMOR)	82	.if ${PORT_OPTIONS:MTREMOR}
99	LIB_DEPENDS+= vorbisidec:${PORTSDIR}/audio/libtremor	83	LIB_DEPENDS+= vorbisidec:${PORTSDIR}/audio/libtremor
100	CONFIGURE_ARGS+=CONFIG_TREMOR=y	84	CONFIGURE_ARGS+=CONFIG_TREMOR=y
101	.endif	85	.endif
102		86
103	.if defined(WITH_MP4)	87	.if ${PORT_OPTIONS:MMP4}
104	LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad	88	LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad
105	LIB_DEPENDS+= mp4v2:${PORTSDIR}/multimedia/mp4v2	89	LIB_DEPENDS+= mp4v2:${PORTSDIR}/multimedia/mp4v2
106	CONFIGURE_ARGS+=CONFIG_MP4=y	90	CONFIGURE_ARGS+=CONFIG_MP4=y
Lines 110-116 Link Here
110	PLIST_SUB+= MP4="@comment "	94	PLIST_SUB+= MP4="@comment "
111	.endif	95	.endif
112		96
113	.if defined(WITH_AAC)	97	.if ${PORT_OPTIONS:MAAC}
114	LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad	98	LIB_DEPENDS+= faad:${PORTSDIR}/audio/faad
115	CONFIGURE_ARGS+=CONFIG_AAC=y	99	CONFIGURE_ARGS+=CONFIG_AAC=y
116	PLIST_SUB+= AAC=""	100	PLIST_SUB+= AAC=""
Lines 119-125 Link Here
119	PLIST_SUB+= AAC="@comment "	103	PLIST_SUB+= AAC="@comment "
120	.endif	104	.endif
121		105
122	.if defined(WITH_WAVPACK)	106	.if ${PORT_OPTIONS:MWAVPACK}
123	LIB_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack	107	LIB_DEPENDS+= wavpack:${PORTSDIR}/audio/wavpack
124	CONFIGURE_ARGS+=CONFIG_WAVPACK=y	108	CONFIGURE_ARGS+=CONFIG_WAVPACK=y
125	PLIST_SUB+= WAVPACK=""	109	PLIST_SUB+= WAVPACK=""
Lines 128-135 Link Here
128	PLIST_SUB+= WAVPACK="@comment "	112	PLIST_SUB+= WAVPACK="@comment "
129	.endif	113	.endif
130		114
131	.if defined(WITH_FFMPEG)	115	.if ${PORT_OPTIONS:MFFMPEG}
132	LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg	116	FFMPEG_SUFFIX= -011
		117	BUILD_DEPENDS+= ffmpeg${FFMPEG_SUFFIX}>0.11:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX}
		118	RUN_DEPENDS+= ffmpeg${FFMPEG_SUFFIX}>0.11:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX}
133	CONFIGURE_ARGS+=CONFIG_FFMPEG=y	119	CONFIGURE_ARGS+=CONFIG_FFMPEG=y
134	PLIST_SUB+= FFMPEG=""	120	PLIST_SUB+= FFMPEG=""
135	.else	121	.else
Lines 137-143 Link Here
137	PLIST_SUB+= FFMPEG="@comment "	123	PLIST_SUB+= FFMPEG="@comment "
138	.endif	124	.endif
139		125
140	.if defined(WITH_LIBAO)	126	.if ${PORT_OPTIONS:MAO}
141	LIB_DEPENDS+= ao:${PORTSDIR}/audio/libao	127	LIB_DEPENDS+= ao:${PORTSDIR}/audio/libao
142	CONFIGURE_ARGS+=CONFIG_AO=y	128	CONFIGURE_ARGS+=CONFIG_AO=y
143	PLIST_SUB+= AO=""	129	PLIST_SUB+= AO=""
Lines 146-152 Link Here
146	PLIST_SUB+= AO="@comment "	132	PLIST_SUB+= AO="@comment "
147	.endif	133	.endif
148		134
149	.if defined(WITH_PULSEAUDIO)	135	.if ${PORT_OPTIONS:MPULSEAUDIO}
150	LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio	136	LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio
151	CONFIGURE_ARGS+=CONFIG_PULSE=y	137	CONFIGURE_ARGS+=CONFIG_PULSE=y
152	PLIST_SUB+= PULSEAUDIO=""	138	PLIST_SUB+= PULSEAUDIO=""
Lines 155-161 Link Here
155	PLIST_SUB+= PULSEAUDIO="@comment "	141	PLIST_SUB+= PULSEAUDIO="@comment "
156	.endif	142	.endif
157		143
158	.if defined(WITH_ARTS)	144	.if ${PORT_OPTIONS:MARTS}
159	LIB_DEPENDS+= artsc:${PORTSDIR}/audio/arts	145	LIB_DEPENDS+= artsc:${PORTSDIR}/audio/arts
160	CONFIGURE_ARGS+=CONFIG_ARTS=y	146	CONFIGURE_ARGS+=CONFIG_ARTS=y
161	PLIST_SUB+= ARTS=""	147	PLIST_SUB+= ARTS=""
Lines 169-175 Link Here
169		155
170	post-patch:	156	post-patch:
171	@${REINPLACE_CMD} -e 's,doc/cmus/examples,examples/cmus,g' \	157	@${REINPLACE_CMD} -e 's,doc/cmus/examples,examples/cmus,g' \
172	${WRKSRC}/Makefile ${WRKSRC}/Doc/cmus.txt	158	${WRKSRC}/Doc/cmus.txt
173	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' ${WRKSRC}/Doc/cmus.txt	159	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' ${WRKSRC}/Doc/cmus.txt
		160	@${REINPLACE_CMD} -e 's,libavformat,libavformat${FFMPEG_SUFFIX},g' \
		161	${WRKSRC}/configure
174		162
175	.include <bsd.port.post.mk>	163	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-Makefile (+24 lines)
	1	--- ./Makefile.orig 2011-11-30 03:57:20.000000000 -0500
	2	+++ ./Makefile 2012-10-14 20:42:11.000000000 -0400
	3	@@ -96,7 +96,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
	10	flac.so: $(flac-objs) $(libcmus-y)
	11	$(call cmd,ld_dl,$(FLAC_LIBS))
	12	@@ -200,10 +200,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 $< $@