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

Collapse All | Expand All

(-)audio/musicpd/Makefile (-4 / +10 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	musicpd
8
PORTNAME=	musicpd
9
PORTVERSION=	0.15.8
9
PORTVERSION=	0.15.11
10
PORTREVISION=	3
11
CATEGORIES=	audio ipv6
10
CATEGORIES=	audio ipv6
12
MASTER_SITES=	SF/${PORTNAME}/mpd/${PORTVERSION}
11
MASTER_SITES=	SF/${PORTNAME}/mpd/${PORTVERSION}
13
DISTNAME=	mpd-${PORTVERSION}
12
DISTNAME=	mpd-${PORTVERSION}
Lines 62-67 Link Here
62
MPDDIR=	var/mpd
61
MPDDIR=	var/mpd
63
MPDUSER=	mpd
62
MPDUSER=	mpd
64
MPDGROUP=	mpd
63
MPDGROUP=	mpd
64
MPDCONF=	mpd.conf
65
65
66
USERS=	${MPDUSER}
66
USERS=	${MPDUSER}
67
GROUPS=	${MPDGROUP}
67
GROUPS=	${MPDGROUP}
Lines 70-82 Link Here
70
MPDGID=	137
70
MPDGID=	137
71
71
72
PLIST_SUB=	MPDUSER=${MPDUSER} \
72
PLIST_SUB=	MPDUSER=${MPDUSER} \
73
		MPDGROUP=${MPDGROUP}
73
		MPDGROUP=${MPDGROUP} \
74
		MPDCONF=${MPDCONF}
74
75
75
SUB_LIST+=	MPDUSER=${MPDUSER} \
76
SUB_LIST+=	MPDUSER=${MPDUSER} \
76
		MPDGROUP=${MPDGROUP} \
77
		MPDGROUP=${MPDGROUP} \
77
		MPDDIR=${PREFIX}/${MPDDIR} \
78
		MPDDIR=${PREFIX}/${MPDDIR} \
78
		MPDUID=${MPDUID} \
79
		MPDUID=${MPDUID} \
79
		MPDGID=${MPDGID}
80
		MPDGID=${MPDGID} \
81
		MPDCONF=${MPDCONF}
80
82
81
.include <bsd.port.pre.mk>
83
.include <bsd.port.pre.mk>
82
84
Lines 227-232 Link Here
227
.endif
229
.endif
228
230
229
post-install:
231
post-install:
232
	@${INSTALL_DATA} ${WRKSRC}/doc/mpdconf.example ${PREFIX}/etc/${MPDCONF}.sample
233
	@if [ ! -f ${PREFIX}/etc/${MPDCONF} ]; then \
234
		${CP} -p ${PREFIX}/etc/${MPDCONF}.sample ${PREFIX}/etc/${MPDCONF} ; \
235
	fi
230
	@${MKDIR} ${PREFIX}/${MPDDIR}
236
	@${MKDIR} ${PREFIX}/${MPDDIR}
231
	@${CHOWN} -R ${MPDUSER}:${MPDGROUP} ${PREFIX}/${MPDDIR}
237
	@${CHOWN} -R ${MPDUSER}:${MPDGROUP} ${PREFIX}/${MPDDIR}
232
	@${ECHO_MSG}
238
	@${ECHO_MSG}
(-)audio/musicpd/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (mpd-0.15.8.tar.bz2) = 824e1ce46c0f468865d9e5e403cdaf5d
1
MD5 (mpd-0.15.11.tar.bz2) = a8f8afc641db6f789281fe14fcc8d8a9
2
SHA256 (mpd-0.15.8.tar.bz2) = 5de1bac0af52c6d2d2744a8c8c84bb1423de4eff2351790068173cf4f287aad7
2
SHA256 (mpd-0.15.11.tar.bz2) = 829020b3f53cc22bb71e65b870f6d28ef17399b9965321da2bc01d6be5e2c6c3
3
SIZE (mpd-0.15.8.tar.bz2) = 390489
3
SIZE (mpd-0.15.11.tar.bz2) = 390410
(-)audio/musicpd/files/musicpd.in (-1 / +1 lines)
Lines 15-21 Link Here
15
rcvar=`set_rcvar`
15
rcvar=`set_rcvar`
16
stop_cmd="${name}_stop"
16
stop_cmd="${name}_stop"
17
17
18
config=%%PREFIX%%/etc/mpd.conf
18
config=%%PREFIX%%/etc/%%MPDCONF%%
19
command=%%PREFIX%%/bin/mpd
19
command=%%PREFIX%%/bin/mpd
20
required_files=$config
20
required_files=$config
21
21
(-)audio/musicpd/files/pkg-message.in (-3 / +2 lines)
Lines 2-11 Link Here
2
2
3
The musicpd package has been successfully installed.
3
The musicpd package has been successfully installed.
4
4
5
In order to run the MPD server, you need to create
5
In order to run the MPD server, you need to edit
6
6
7
	%%PREFIX%%/etc/mpd.conf out of
7
	%%PREFIX%%/etc/%%MPDCONF%%
8
	%%PREFIX%%/share/doc/mpd/mpdconf.example
9
8
10
and add the following line to /etc/rc.conf:
9
and add the following line to /etc/rc.conf:
11
10
(-)audio/musicpd/pkg-plist (+3 lines)
Lines 1-2 Link Here
1
bin/mpd
1
bin/mpd
2
@dirrmtry var/mpd
2
@dirrmtry var/mpd
3
@unexec if cmp -s %D/etc/%%MPDCONF%%.sample %D/etc/%%MPDCONF%%; then rm -f %D/etc/%%MPDCONF%%; fi
4
etc/%%MPDCONF%%.sample
5
@exec if [ ! -f %D/etc/%%MPDCONF%% ] ; then cp -p %D/%F %B/%%MPDCONF%%; fi

Return to bug 148082