4 files changed, 12 insertions, 16 deletions

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 8582d52c2608..ced0997ffa55 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	musicpd
-PORTVERSION=	0.10.2
+PORTVERSION=	0.10.3
 CATEGORIES=	audio ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -32,10 +32,8 @@ OPTIONS=	FLAC "Support for FLAC Audio" on \
 
 .if ${OSVERSION} >= 500038
 RC_SUBR?=	${DESTDIR}/etc/rc.subr
-RC_SUFX=
 .else
 USE_RC_SUBR=	yes
-RC_SUFX=	.sh
 .endif
 
 #.if ${OSVERSION} < 500000
@@ -89,9 +87,7 @@ DOCS=		README \
 
 SED_SCRIPT+=	-e 's,%%PREFIX%%,${PREFIX},g' \
 		-e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-		-e 's,%%RC_SUFX%%,${RC_SUFX},g'
-PLIST_SUB+=	RC_SUFX=${RC_SUFX}
+		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
 
 post-build:
 	@${SED} ${SED_SCRIPT} ${FILESDIR}/musicpd.sh >${WRKDIR}/musicpd.sh
@@ -101,7 +97,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mpd ${PREFIX}/bin/
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/mpd.conf.sample ${EXAMPLESDIR}/mpd.conf
-	${INSTALL_SCRIPT} ${WRKDIR}/musicpd.sh ${PREFIX}/etc/rc.d/musicpd${RC_SUFX}
+	${INSTALL_SCRIPT} ${WRKDIR}/musicpd.sh ${PREFIX}/etc/rc.d/
 	${INSTALL_MAN} ${WRKSRC}/doc/mpd.1 ${MAN1PREFIX}/man/man1/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
@@ -114,9 +110,9 @@ post-install:
 	@${ECHO_CMD} -- IMPORTANT NOTICE ----------------------------------
 	@${ECHO_CMD} If you upgraded from a pre-0.10.0 release, you have to
 	@${ECHO_CMD} rebuild your index now by running
-	@${ECHO_CMD} ${PREFIX}/etc/rc.d/musicpd${RC_SUFX} stop
+	@${ECHO_CMD} ${PREFIX}/etc/rc.d/musicpd.sh stop
 	@${ECHO_CMD} ${PREFIX}/bin/mpd --create-db ${PREFIX}/etc/mpd.conf
-	@${ECHO_CMD} ${PREFIX}/etc/rc.d/musicpd${RC_SUFX} start
+	@${ECHO_CMD} ${PREFIX}/etc/rc.d/musicpd.sh start
 	@${ECHO_CMD} ------------------------------------------------------
 	@${ECHO_CMD}
 
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo
index 8d20c0201d66..967b2d2a706c 100644
--- a/audio/musicpd/distinfo
+++ b/audio/musicpd/distinfo
@@ -1,2 +1,2 @@
-MD5 (mpd-0.10.2.tar.gz) = a8d7f7299fb367e4110c3b6c8c8f6887
-SIZE (mpd-0.10.2.tar.gz) = 815198
+MD5 (mpd-0.10.3.tar.gz) = cd16e7cba47ca743106ab10bbcf1f41d
+SIZE (mpd-0.10.3.tar.gz) = 815429
diff --git a/audio/musicpd/pkg-message b/audio/musicpd/pkg-message
index 51e5c8eb7bb1..a8eb7b308b1e 100644
--- a/audio/musicpd/pkg-message
+++ b/audio/musicpd/pkg-message
@@ -9,12 +9,12 @@ and add the following line to /etc/rc.conf:
   musicpd_enable="YES"
 
 Then start the server with
-  %%PREFIX%%/etc/rc.d/musicpd%%RC_SUFX%% start
+  %%PREFIX%%/etc/rc.d/musicpd.sh start
 or reboot.
 
 NOTE: The musicpd server is pretty useless without a
-      client. You might want to install the traymp-port,
-      too.
+      client. You might want to install one of the following
+      ports, too: traymp, mpc or kmp.
 
 ************************************************************
 
diff --git a/audio/musicpd/pkg-plist b/audio/musicpd/pkg-plist
index f6edfcf4ec41..600d12fd4f3d 100644
--- a/audio/musicpd/pkg-plist
+++ b/audio/musicpd/pkg-plist
@@ -1,9 +1,9 @@
 bin/mpd
-@unexec etc/rc.d/musicpd%%RC_SUFX%% stop 2>/dev/null || true
+@unexec etc/rc.d/musicpd.sh stop 2>/dev/null || true
 %%PORTDOCS%%%%DOCSDIR%%/COMMANDS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%EXAMPLESDIR%%/mpd.conf
 @dirrm %%EXAMPLESDIR%%
-etc/rc.d/musicpd%%RC_SUFX%%
+etc/rc.d/musicpd.sh