Import of pkgsrc-2015Q3

net/knot/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2015/01/18 16:00:02 wiedi Exp $
+# $NetBSD: Makefile,v 1.24 2015/06/30 13:17:10 pettai Exp $
 
 DISTNAME=	knot-1.5.3
 CATEGORIES=	net
@@ -9,15 +9,14 @@ HOMEPAGE=	http://www.knot-dns.cz/
 COMMENT=	Knot (auth) DNS server
 LICENSE=	gnu-gpl-v3
 
-# If you're not able to download the distfile, try using
-#FETCH_USING=   curl # in mk.conf or on the command-line
-
 BUILD_DEFS+=	VARBASE
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/knot
+CONFIGURE_ARGS+=	--with-rundir=${VARBASE}/run/knot
+CONFIGURE_ARGS+=	--with-storage=${VARBASE}/knot/lib
 
 USE_LIBTOOL=	yes
 USE_TOOLS+=	bison flex gmake

net/knot/files/knot.sh

@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: knot.sh,v 1.1 2012/11/05 23:08:06 pettai Exp $
+# $NetBSD: knot.sh,v 1.2 2015/06/30 13:17:10 pettai Exp $
 #
 # PROVIDE: knot
 # REQUIRE: NETWORKING syslogd
@@ -13,15 +13,16 @@ fi
 name="knot"
 rcvar=${name}
 command="@PREFIX@/sbin/knotc"
+knotd="@PREFIX@/sbin/knotd"
 command_args=""
 pidfile="@VARBASE@/knot/${name}.pid"
 start_precmd="knot_precmd"
 extra_commands="restart reload"
-start_cmd="$command -w start"
-stop_cmd="$command -w stop"
+start_cmd="$knotd -d"
+stop_cmd="$command stop"
 restart_cmd="$command restart"
 reload_cmd="$command reload"
-status_cmd="$command running"
+status_cmd="$command status"
 
 knot_precmd()
 {