diff -rup knot.old/Makefile knot/Makefile --- knot.old/Makefile 2013-11-12 09:32:26.000000000 +0000 +++ knot/Makefile 2013-11-12 11:31:53.000000000 +0000 @@ -3,6 +3,7 @@ PORTNAME= knot DISTVERSION= 1.3.3 +PORTREVISION= 1 CATEGORIES= dns ipv6 MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ http://dns-lab.com/downloads/knot-dns/ @@ -37,5 +38,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/samples/knot.sample.conf ${STAGEDIR}${ETCDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ + @${MKDIR} ${PREFIX}/var/lib/knot + @${MKDIR} ${PREFIX}/var/run/knot + @${CHOWN} 53:53 ${PREFIX}/var/lib/knot + @${CHOWN} 53:53 ${PREFIX}/var/run/knot .include diff -rup knot.old/files/knotd.in knot/files/knotd.in --- knot.old/files/knotd.in 2013-11-12 09:32:26.000000000 +0000 +++ knot/files/knotd.in 2013-11-12 11:26:31.000000000 +0000 @@ -19,32 +19,21 @@ name=knot rcvar=knot_enable extra_commands="reload" -reload_cmd="${name}_reload" -status_cmd="${name}_status" -stop_cmd="${name}_stop" +reload_cmd="${name}_x reload" +status_cmd="${name}_x status" +stop_cmd=" ${name}_x stop" load_rc_config ${name} : ${knot_enable:="NO"} : ${knot_config="%%PREFIX%%/etc/knot/knot.conf"} -command=%%PREFIX%%/sbin/${name}c -procname=%%PREFIX%%/sbin/${name}d -pidfile=/var/run/${name}.pid - -command_args="-c ${knot_config} -w start" +command=%%PREFIX%%/sbin/${name}d +command_args="-c ${knot_config} -d" required_files=${knot_config} -knot_reload() { - echo "Reloading ${name}." - ${command} -c ${knot_config} reload - } -knot_status() { - ${command} -c ${knot_config} status - } -knot_stop() { - echo "Stopping ${name}." - ${command} -c ${knot_config} stop +knot_x() { + %%PREFIX%%/sbin/${name}c -c ${knot_config} "$1" } run_rc_command "$1" diff -rup knot.old/files/pkg-message.in knot/files/pkg-message.in --- knot.old/files/pkg-message.in 2013-11-12 09:32:26.000000000 +0000 +++ knot/files/pkg-message.in 2013-11-12 11:18:55.000000000 +0000 @@ -1,30 +1,22 @@ #################################################################### # -# To start using Knot DNS, you should complete the following tasks: -# -# ----- configure -------------------------------------------------- +# To get Knot DNS started: # cp %%ETCDIR%%/knot.sample.conf %%ETCDIR%%/knot.conf $EDITOR %%ETCDIR%%/knot.conf -# -# ----- prepare ---------------------------------------------------- -# -# required: echo knot_enable=\"YES\" >> /etc/rc.conf -# for customization if desired: # echo knot_config=\"%%PREFIX%%/etc/knot/knot.conf\" >> /etc/rc.conf -# -# ----- startup ---------------------------------------------------- -# %%PREFIX%%/etc/rc.d/knotd start # #################################################################### - When upgrading from version of before 1.3.0-RC1: mind the default config file location has changed. + When upgrading from version of 1.3.1-RC1 or before: + the startup script has changed due to parameter changes. + That problem reapeared in port 1.3.3 and was fixed in 1.3.3_1. ====================================================================