diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2009-10-07 09:51:28 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2009-10-07 09:51:28 +0000 |
| commit | d2a608b232c7473598cb5b1f4759b850ad0420b0 (patch) | |
| tree | 5245f70400a9d37ae0a0a99e9c805651d4701d34 /dns | |
| parent | Update to 3.2.3. (diff) | |
- Fix startup script
- Fix config path
Reported by: Bernhard Frohelich, Martin Tournoij <carpetsmoker@rwxrwxrwx.net>
Notes
Notes:
svn path=/head/; revision=242545
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/maradns/Makefile | 4 | ||||
| -rw-r--r-- | dns/maradns/files/maradns.in | 6 | ||||
| -rw-r--r-- | dns/maradns/files/zoneserver.in | 10 |
3 files changed, 13 insertions, 7 deletions
diff --git a/dns/maradns/Makefile b/dns/maradns/Makefile index 621f131170f3..e0e87fde6cc6 100644 --- a/dns/maradns/Makefile +++ b/dns/maradns/Makefile @@ -7,6 +7,7 @@ PORTNAME= maradns PORTVERSION= 1.3.07.09 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= http://www.maradns.org/download/1.3/${PORTVERSION}/ \ http://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/ @@ -24,7 +25,8 @@ MAN5= mararc.5 csv1.5 csv2.5 csv2_txt.5 MAN8= maradns.8 zoneserver.8 duende.8 post-patch: - @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|/etc/mara|${ETCDIR}|g' + @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ + 's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g' @${FIND} ${WRKSRC} -name '*Makefile*' | ${XARGS} ${REINPLACE_CMD} -e \ 's|make|\$$\{MAKE\}|g ; \ s|^FLAGS =|#FLAGS =|g ; \ diff --git a/dns/maradns/files/maradns.in b/dns/maradns/files/maradns.in index 0b54259aa06f..38fc3a4761d3 100644 --- a/dns/maradns/files/maradns.in +++ b/dns/maradns/files/maradns.in @@ -11,13 +11,15 @@ . %%RC_SUBR%% +: ${maradns_enable="NO"} +: ${maradns_conf="%%PREFIX%%/etc/mararc"} + name="maradns" rcvar=`set_rcvar` command="%%PREFIX%%/bin/duende" +command_args="maradns -f ${maradns_conf}" pidfile="/var/run/${name}.pid" load_rc_config $name -maradns_enable=${maradns_enable-"NO"} - run_rc_command "$1" diff --git a/dns/maradns/files/zoneserver.in b/dns/maradns/files/zoneserver.in index d11e658a0fb4..72b1a8660f1b 100644 --- a/dns/maradns/files/zoneserver.in +++ b/dns/maradns/files/zoneserver.in @@ -3,7 +3,7 @@ # $FreeBSD$ # -# PROVIDE: zonserver +# PROVIDE: zoneserver # REQUIRE: SERVERS # BEFORE: DAEMON # KEYWORD: shutdown @@ -11,13 +11,15 @@ . %%RC_SUBR%% -name="zonserver" +: ${zoneserver_enable="NO"} +: ${maradns_conf="%%PREFIX%%/etc/mararc"} + +name="zoneserver" rcvar=`set_rcvar` command="%%PREFIX%%/bin/duende" +command_args="zoneserver -f ${maradns_conf}" pidfile="/var/run/${name}.pid" load_rc_config $name -zonserver_enable=${zonserver_enable-"NO"} - run_rc_command "$1" |