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

Collapse All | Expand All

(-)musicpd/Makefile (-30 / +15 lines)
Lines 6-25 Link Here
6
#
6
#
7
7
8
PORTNAME=	musicpd
8
PORTNAME=	musicpd
9
PORTVERSION=	0.11.5
9
PORTVERSION=	0.12.0
10
PORTREVISION=	2
11
CATEGORIES=	audio ipv6
10
CATEGORIES=	audio ipv6
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	http://musicpd.org/uploads/files/
13
MASTER_SITE_SUBDIR=	${PORTNAME}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
14
DISTNAME=	mpd-${PORTVERSION}
13
DISTNAME=	mpd-${PORTVERSION}
15
14
16
MAINTAINER=	ports@mark.reidel.info
15
MAINTAINER=	redchrom@gmail.com
17
COMMENT=	A remote-controllable music-daemon
16
COMMENT=	A remote-controllable music-daemon
18
17
19
LIB_DEPENDS+=	ao.3:${PORTSDIR}/audio/libao \
18
LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
20
		mad.2:${PORTSDIR}/audio/mad
21
19
20
USE_BZIP2=	yes
22
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
22
USE_RC_SUBR=	musicpd.sh
23
PKGMESSAGE=	${WRKDIR}/pkg-message
23
PKGMESSAGE=	${WRKDIR}/pkg-message
24
24
25
OPTIONS=	FLAC "Support for FLAC Audio" on \
25
OPTIONS=	FLAC "Support for FLAC Audio" on \
Lines 33-44 Link Here
33
33
34
.include <bsd.port.pre.mk>
34
.include <bsd.port.pre.mk>
35
35
36
.if ${OSVERSION} >= 500038
37
RC_SUBR?=	${DESTDIR}/etc/rc.subr
38
.else
39
USE_RC_SUBR=	yes
40
.endif
41
42
.ifdef(WITHOUT_FLAC)
36
.ifdef(WITHOUT_FLAC)
43
CONFIGURE_ARGS+=--disable-flac
37
CONFIGURE_ARGS+=--disable-flac
44
.else
38
.else
Lines 89-117 Link Here
89
CFLAGS+=	-I${PREFIX}/include
83
CFLAGS+=	-I${PREFIX}/include
90
84
91
MAN1=		mpd.1
85
MAN1=		mpd.1
86
MAN5=		mpd.conf.5
92
87
93
DOCS=		README \
88
DOCSDIR=	${PREFIX}/share/doc/mpd
94
		UPGRADING \
89
DOCS=	COMMANDS \
95
		doc/COMMANDS
90
		mpdconf.example \
96
91
		README \
97
SED_SCRIPT+=	-e 's,%%PREFIX%%,${PREFIX},g' \
92
		UPGRADING
98
		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
93
99
		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
94
SED_SCRIPT+=	-e 's,%%PREFIX%%,${PREFIX},g'
100
95
101
post-build:
96
post-build:
102
	@${SED} ${SED_SCRIPT} ${FILESDIR}/musicpd.sh >${WRKDIR}/musicpd.sh
103
	@${SED} ${SED_SCRIPT} ${MASTERDIR}/pkg-message >${PKGMESSAGE}
97
	@${SED} ${SED_SCRIPT} ${MASTERDIR}/pkg-message >${PKGMESSAGE}
104
98
105
do-install:
99
post-install:
106
	${INSTALL_PROGRAM} ${WRKSRC}/src/mpd ${PREFIX}/bin/
107
	${MKDIR} ${EXAMPLESDIR}
108
	${INSTALL_DATA} ${FILESDIR}/mpd.conf.sample ${EXAMPLESDIR}/mpd.conf
109
	${INSTALL_SCRIPT} ${WRKDIR}/musicpd.sh ${PREFIX}/etc/rc.d/
110
	${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 ${MAN1PREFIX}/man/man1/
111
.if !defined(NOPORTDOCS)
112
	${MKDIR} ${DOCSDIR}
113
	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
114
.endif
115
	@${CAT} ${PKGMESSAGE}
100
	@${CAT} ${PKGMESSAGE}
116
101
117
.include <bsd.port.post.mk>
102
.include <bsd.port.post.mk>
(-)musicpd/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (mpd-0.11.5.tar.gz) = 1a9a1a9d31f00a43838b3752024f7ebe
1
MD5 (mpd-0.12.0.tar.bz2) = 4995b18764b4f92fad7bed9506635ec3
2
SHA256 (mpd-0.11.5.tar.gz) = 30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd
2
SHA256 (mpd-0.12.0.tar.bz2) = 89a89a13c8d65d8488887d57cb4b87c6b0cb0d4d31e31cb836c73b1d45dbc5b1
3
SIZE (mpd-0.11.5.tar.gz) = 1127523
3
SIZE (mpd-0.12.0.tar.bz2) = 397497
(-)musicpd/files/mpd.conf.sample (-34 lines)
Lines 1-34 Link Here
1
# required
2
port                   "2100"
3
music_directory        "/mp3"
4
playlist_directory     "/mp3"
5
log_file               "/var/log/mpd.log"
6
error_file             "/var/log/mpd.error"
7
8
# optional
9
max_connections        "5"
10
max_command_list_size  "2048"
11
max_output_buffer_size "2048"
12
connection_timeout     "60"
13
db_file                "/mp3/.mpddb"
14
state_file             "/mp3/.mpdstate"
15
save_absolute_paths_in_playlists "no"
16
17
max_playlist_length    "4096"
18
buffer_before_play     "25%"
19
bind_to_address	       "any"
20
21
mixer_type             "oss"
22
mixer_device           "/dev/mixer"
23
24
ao_driver              "oss"
25
ao_driver_options      "dsp=/dev/dsp"
26
audio_write_size       "1024"
27
28
#user                   "mp3"
29
30
# log_level can be "default", "secure", "verbose"
31
log_level              "default"
32
#password               "password@read,add,control,admin"
33
#default_permissions    "read,add,control,admin"
34
#filesystem_charset     "UTF-8"
(-)musicpd/files/musicpd.sh (-29 lines)
Lines 1-29 Link Here
1
#!/bin/sh
2
#
3
4
# PROVIDE: musicpd
5
# REQUIRE:
6
# BEFORE:
7
# KEYWORD: shutdown
8
9
# Add the following line to /etc/rc.conf to enable mpd:
10
#
11
#musicpd_enable="YES"
12
13
. %%RC_SUBR%%
14
15
name=musicpd
16
rcvar=`set_rcvar`
17
18
config=%%PREFIX%%/etc/mpd.conf
19
command=%%PREFIX%%/bin/mpd
20
required_files=$config
21
22
musicpd_flags="$musicpd_flags $config"
23
24
[ -z "$musicpd_enable" ] && musicpd_enable="NO"
25
[ -z "$musicpd_flags" ]  && musicpd_flags=
26
27
load_rc_config $name
28
29
run_rc_command "$1"
(-)musicpd/files/musicpd.sh.in (+29 lines)
Line 0 Link Here
1
#!/bin/sh
2
#
3
4
# PROVIDE: musicpd
5
# REQUIRE:
6
# BEFORE:
7
# KEYWORD: shutdown
8
9
# Add the following line to /etc/rc.conf to enable mpd:
10
#
11
#musicpd_enable="YES"
12
13
. %%RC_SUBR%%
14
15
name=musicpd
16
rcvar=`set_rcvar`
17
18
config=%%PREFIX%%/etc/mpd.conf
19
command=%%PREFIX%%/bin/mpd
20
required_files=$config
21
22
musicpd_flags="$musicpd_flags $config"
23
24
[ -z "$musicpd_enable" ] && musicpd_enable="NO"
25
[ -z "$musicpd_flags" ]  && musicpd_flags=
26
27
load_rc_config $name
28
29
run_rc_command "$1"
(-)musicpd/pkg-message (-1 / +1 lines)
Lines 4-10 Link Here
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 create
6
  %%PREFIX%%/etc/mpd.conf out of
6
  %%PREFIX%%/etc/mpd.conf out of
7
  %%EXAMPLESDIR%%/mpd.conf
7
  %%PREFIX%%/share/doc/mpd/mpdconf.example
8
and add the following line to /etc/rc.conf:
8
and add the following line to /etc/rc.conf:
9
  musicpd_enable="YES"
9
  musicpd_enable="YES"
10
10
(-)musicpd/pkg-plist (-4 / +2 lines)
Lines 1-9 Link Here
1
bin/mpd
1
bin/mpd
2
@unexec etc/rc.d/musicpd.sh stop 2>/dev/null || true
3
%%PORTDOCS%%%%DOCSDIR%%/COMMANDS
2
%%PORTDOCS%%%%DOCSDIR%%/COMMANDS
3
%%PORTDOCS%%%%DOCSDIR%%/mpdconf.example
4
%%PORTDOCS%%%%DOCSDIR%%/README
4
%%PORTDOCS%%%%DOCSDIR%%/README
5
%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
5
%%PORTDOCS%%%%DOCSDIR%%/UPGRADING
6
%%PORTDOCS%%@dirrm %%DOCSDIR%%
6
%%PORTDOCS%%@dirrm %%DOCSDIR%%
7
%%EXAMPLESDIR%%/mpd.conf
7
%%PORTDOCS%%@unexec %D/%%DOCSDIR%% 2>/dev/null || true
8
@dirrm %%EXAMPLESDIR%%
9
etc/rc.d/musicpd.sh

Return to bug 103706