* 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@)
This commit is contained in:
Vasil Dimov 2007-01-10 06:47:24 +00:00
parent 8a847e6ec2
commit ce56c53bec
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=181952
3 changed files with 8 additions and 13 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= mpd PORTNAME= mpd
PORTVERSION= 3.18 PORTVERSION= 3.18
PORTREVISION= 4 PORTREVISION= 5
CATEGORIES= net CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= archie MASTER_SITE_SUBDIR= archie
@ -23,17 +23,11 @@ MANCOMPRESSED= maybe
USE_OPENSSL= yes USE_OPENSSL= yes
MAKE_ENV= COPTS="${COPTS} -I${OPENSSLINC}" LDADD="${LDADD} -L${OPENSSLLIB}" MAKE_ENV= COPTS="${COPTS} -I${OPENSSLINC}" LDADD="${LDADD} -L${OPENSSLLIB}"
.include <bsd.port.pre.mk> USE_RC_SUBR= mpd
pre-build: pre-build:
@${ECHO} @${ECHO}
@${ECHO} "Use WITH_OPENSSL_PORT=yes if you use OPENSSL from ports" @${ECHO} "Use WITH_OPENSSL_PORT=yes if you use OPENSSL from ports"
@${ECHO} @${ECHO}
post-install: .include <bsd.port.mk>
@${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>

View file

@ -1,17 +1,19 @@
#!/bin/sh #!/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 # PROVIDE: mpd
# REQUIRE: NETWORKING syslogd # 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" # mpd_enable="YES"
# #
# You can also set mpd_flags to any flags you want. The default is "-b".
#
mpd_flags="${mpd_flags:--b}" mpd_flags="${mpd_flags:--b}"
mpd_enable="${mpd_enable-NO}" mpd_enable="${mpd_enable:-NO}"
. %%RC_SUBR%% . %%RC_SUBR%%

View file

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