* Use USE_RC_SUBR instead of custom hacks which did not seem to work correctly

* Fix typo in the startup script

Reported by:	Wojciech Puchar <wojtek@tensor.3miasto.net> (on ports@)

net/mpd/Makefile

@@ -7,7 +7,7 @@
 
 PORTNAME=	mpd
 PORTVERSION=	3.18
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	archie
@@ -23,17 +23,11 @@ MANCOMPRESSED=	maybe
 USE_OPENSSL=	yes
 MAKE_ENV=	COPTS="${COPTS} -I${OPENSSLINC}" LDADD="${LDADD} -L${OPENSSLLIB}"
 
-.include <bsd.port.pre.mk>
+USE_RC_SUBR=	mpd
 
 pre-build:
 	@${ECHO}
 	@${ECHO} "Use WITH_OPENSSL_PORT=yes if you use OPENSSL from ports"
 	@${ECHO}
 
-post-install:
-	@${SED} -e "s=%%RC_SUBR%%=${RC_SUBR}=" \
-		-e "s=%%PREFIX%%=${PREFIX}=" \
-		< ${FILESDIR}/mpd.sh > ${WRKSRC}/mpd.sh
-	@${INSTALL_SCRIPT} ${WRKSRC}/mpd.sh ${PREFIX}/etc/rc.d/mpd.sh
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

net/mpd/files/mpd.in

@@ -1,17 +1,19 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: /tmp/pcvs/ports/net/mpd/files/Attic/mpd.in,v 1.1 2007-01-10 06:47:24 vd Exp $
 #
 # PROVIDE: mpd
 # REQUIRE: NETWORKING syslogd
 #
-# Add the following line to /etc/rc.conf to enable mpd:
+# Add the following line to /etc/rc.conf[.local] to enable mpd:
 #
 # mpd_enable="YES"
 #
+# You can also set mpd_flags to any flags you want. The default is "-b".
+#
 
 mpd_flags="${mpd_flags:--b}"
-mpd_enable="${mpd_enable-NO}"
+mpd_enable="${mpd_enable:-NO}"
 
 . %%RC_SUBR%%
 

net/mpd/pkg-plist

@@ -2,7 +2,6 @@ etc/mpd/mpd.conf.sample
 etc/mpd/mpd.links.sample
 etc/mpd/mpd.secret.sample
 etc/mpd/mpd.script.sample
-etc/rc.d/mpd.sh
 sbin/mpd
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/mpd.ps