View | Details | Raw Unified | Return to bug 170476 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 170476