diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2004-07-28 21:54:57 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2004-07-28 21:54:57 +0000 |
commit | 06aec1c6eb82064ea32558ede6785883254b5443 (patch) | |
tree | 14770c52be941b211efc475228417cec754d087d /dns | |
parent | Fix SoX buffer overflows when handling .WAV files (CAN-2004-0557) (diff) |
- Fix few obvious problems with rc script
Notes
Notes:
svn path=/head/; revision=114972
Diffstat (limited to 'dns')
-rw-r--r-- | dns/dnrd/Makefile | 5 | ||||
-rw-r--r-- | dns/dnrd/files/dnrd.sh | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/dns/dnrd/Makefile b/dns/dnrd/Makefile index 8de7028285db..8f28705e3c10 100644 --- a/dns/dnrd/Makefile +++ b/dns/dnrd/Makefile @@ -16,6 +16,7 @@ COMMENT= A proxy DNS daemon USE_GMAKE= yes USE_REINPLACE= yes +USE_RC_SUBR= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} @@ -26,8 +27,10 @@ post-patch: @${REINPLACE_CMD} -e 's|/etc/dnrd|${PREFIX}/etc/dnrd|g' ${WRKSRC}/doc/dnrd.8 \ ${WRKSRC}/doc/master.sample ${WRKSRC}/doc/README-master ${WRKSRC}/src/common.h \ ${WRKSRC}/src/master.c ${WRKSRC}/src/main.c + @${SED} -e 's|%%RC_SUBR%%|${RC_SUBR}|g' -e 's|%%PREFIX%%|${PREFIX}|' \ + ${FILESDIR}/dnrd.sh > ${WRKDIR}/dnrd.sh post-install: - ${INSTALL_SCRIPT} ${FILESDIR}/dnrd.sh ${PREFIX}/etc/rc.d/dnrd.sh + ${INSTALL_SCRIPT} ${WRKDIR}/dnrd.sh ${PREFIX}/etc/rc.d/dnrd.sh .include <bsd.port.mk> diff --git a/dns/dnrd/files/dnrd.sh b/dns/dnrd/files/dnrd.sh index 6abd3601a059..9dcee18fab22 100644 --- a/dns/dnrd/files/dnrd.sh +++ b/dns/dnrd/files/dnrd.sh @@ -13,12 +13,12 @@ # override these variables in /etc/rc.conf dnrd_enable=${dnrd_enable-"NO"} -. /etc/rc.subr +. %%RC_SUBR%% name=dnrd rcvar=$(set_rcvar) -command=/usr/local/sbin/${name} +command=%%PREFIX%%/sbin/${name} pidfile=/var/run/${name}.pid load_rc_config ${name} |