 @@ -1,44 +1,54 @@
-# $NetBSD: Makefile,v 1.24 2015/06/30 13:17:10 pettai Exp $
+# $NetBSD: Makefile,v 1.25 2015/10/26 19:23:08 pettai Exp $
-DISTNAME=	knot-1.5.3
+DISTNAME=	knot-2.0.1
 CATEGORIES=	net
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pettai@NetBSD.org
 HOMEPAGE=	http://www.knot-dns.cz/
 COMMENT=	Knot (auth) DNS server
 LICENSE=	gnu-gpl-v3
 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
 CONFIGURE_ARGS+=	--with-urcu=${BUILDLINK_PREFIX.userspace-rcu}
 CONFIGURE_ARGS+=	--with-libidn=${BUILDLINK_PREFIX.libidn}
 USE_LIBTOOL=	yes
-USE_TOOLS+=	bison flex gmake
+USE_TOOLS+=	bison flex gmake pkg-config
 PKGCONFIG_OVERRIDE=	src/dnssec/libdnssec.pc.in
 PKGCONFIG_OVERRIDE+=	src/libknot.pc.in
 PKGCONFIG_OVERRIDE+=	src/zscanner/libzscanner.pc.in
 RCD_SCRIPTS=	knot
 EGDIR=			${PREFIX}/share/examples/knot
 KNOT_SYSCONFDIR=	${PKG_SYSCONFDIR}/knot
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKSRC}/samples/Makefile.in
 SUBST_STAGE.paths=	post-patch
 SUBST_SED.paths=	-e 's,@EGDIR@,${EGDIR},'
 CONF_FILES=	${EGDIR}/knot.sample.conf \
 			${KNOT_SYSCONFDIR}/knot.sample.conf
 CONF_FILES+=	${EGDIR}/example.com.zone \
 			${KNOT_SYSCONFDIR}/example.com.zone
 INSTALLATION_DIRS=	${EGDIR} ${KNOT_SYSCONFDIR}
 OWN_DIRS+=		${VARBASE}/knot
 .include "../../devel/userspace-rcu/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/jansson/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,19 +1,106 @@
-@comment $NetBSD: PLIST,v 1.6 2014/11/10 21:20:32 pettai Exp $
+@comment $NetBSD: PLIST,v 1.7 2015/10/26 19:23:08 pettai Exp $
 bin/kdig
 bin/khost
 bin/knsec3hash
 bin/knsupdate
 include/dnssec/binary.h
 include/dnssec/crypto.h
 include/dnssec/dnssec.h
 include/dnssec/error.h
 include/dnssec/event.h
 include/dnssec/kasp.h
 include/dnssec/key.h
 include/dnssec/keyid.h
 include/dnssec/keystore.h
 include/dnssec/keytag.h
 include/dnssec/list.h
 include/dnssec/nsec.h
 include/dnssec/random.h
 include/dnssec/sign.h
 include/dnssec/tsig.h
 include/libknot/binary.h
 include/libknot/consts.h
 include/libknot/descriptor.h
 include/libknot/dname.h
 include/libknot/errcode.h
 include/libknot/internal/array-sort.h
 include/libknot/internal/base32hex.h
 include/libknot/internal/base64.h
 include/libknot/internal/binsearch.h
 include/libknot/internal/consts.h
 include/libknot/internal/endian.h
 include/libknot/internal/errcode.h
 include/libknot/internal/getline.h
 include/libknot/internal/heap.h
 include/libknot/internal/hhash.h
 include/libknot/internal/lists.h
 include/libknot/internal/macros.h
 include/libknot/internal/mem.h
 include/libknot/internal/mempattern.h
 include/libknot/internal/mempool.h
 include/libknot/internal/namedb/namedb.h
 include/libknot/internal/namedb/namedb_lmdb.h
 include/libknot/internal/namedb/namedb_trie.h
 include/libknot/internal/net.h
 include/libknot/internal/print.h
 include/libknot/internal/sockaddr.h
 include/libknot/internal/strlcat.h
 include/libknot/internal/strlcpy.h
 include/libknot/internal/tolower.h
 include/libknot/internal/trie/hat-trie.h
 include/libknot/internal/trie/murmurhash3.h
 include/libknot/internal/utils.h
 include/libknot/internal/wire_ctx.h
 include/libknot/libknot.h
 include/libknot/packet/compr.h
 include/libknot/packet/pkt.h
 include/libknot/packet/rrset-wire.h
 include/libknot/packet/wire.h
 include/libknot/processing/layer.h
 include/libknot/processing/overlay.h
 include/libknot/processing/requestor.h
 include/libknot/rdata.h
 include/libknot/rdataset.h
 include/libknot/rrset-dump.h
 include/libknot/rrset.h
 include/libknot/rrtype/aaaa.h
 include/libknot/rrtype/dnskey.h
 include/libknot/rrtype/naptr.h
 include/libknot/rrtype/nsec.h
 include/libknot/rrtype/nsec3.h
 include/libknot/rrtype/nsec3param.h
 include/libknot/rrtype/opt.h
 include/libknot/rrtype/rdname.h
 include/libknot/rrtype/rrsig.h
 include/libknot/rrtype/soa.h
 include/libknot/rrtype/tsig.h
 include/libknot/rrtype/txt.h
 include/libknot/tsig-op.h
 include/libknot/tsig.h
 include/libknot/yparser/yparser.h
 include/libknot/yparser/ypformat.h
 include/libknot/yparser/ypscheme.h
 include/libknot/yparser/yptrafo.h
 include/zscanner/error.h
 include/zscanner/scanner.h
 lib/libdnssec.la
 lib/libknot.la
 lib/libzscanner.la
 lib/pkgconfig/libdnssec.pc
 lib/pkgconfig/libknot.pc
 lib/pkgconfig/libzscanner.pc
 libexec/knot1to2
 man/man1/kdig.1
 man/man1/khost.1
 man/man1/knot1to2.1
 man/man1/knsec3hash.1
 man/man1/knsupdate.1
 man/man5/knot.conf.5
 man/man8/keymgr.8
 man/man8/knotc.8
 man/man8/knotd.8
 sbin/keymgr
 sbin/knotc
 sbin/knotd
 share/examples/knot/example.com.zone
 share/examples/knot/knot.sample.conf
 @pkgdir etc/knot

 @@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2014/11/10 21:20:32 pettai Exp $
+$NetBSD: distinfo,v 1.15 2015/10/26 19:23:08 pettai Exp $
-SHA1 (knot-1.5.3.tar.gz) = 4692c5001472443d07ac088592b349793a968706
+SHA1 (knot-2.0.1.tar.xz) = 155a9aa3e7e6f12b70ec8e079ef6c8e137b0f8cf
-RMD160 (knot-1.5.3.tar.gz) = 72442dff1c138ed0ad0300e395c524f318baa123
+RMD160 (knot-2.0.1.tar.xz) = 5fa3ed2da1fb673d329a0d5ade8a4284675c0a63
-Size (knot-1.5.3.tar.gz) = 1175445 bytes
+SHA512 (knot-2.0.1.tar.xz) = b74069a6da4eb0f456a3bd38318712f467f736af1712a14772f7e539b009c02f8e447c2fcd21f5005a2a4906466294ab6b46e7782aac3b88619063aed14cddb5
-SHA1 (patch-Makefile.in) = b24790f99d791ac184eff66db563a0a314f8370c
+Size (knot-2.0.1.tar.xz) = 958560 bytes
-SHA1 (patch-samples_Makefile.in) = 7a2cc5b1eebc7483ffcefc565d200d9a203d49ff
+SHA1 (patch-samples_Makefile.in) = be60c4bfb4ed49dbe8c55dc5d453c8733fb4fb61

 @@ -1,36 +1,35 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: knot.sh,v 1.2 2015/06/30 13:17:10 pettai Exp $
+# $NetBSD: knot.sh,v 1.3 2015/10/26 19:23:08 pettai Exp $
+#
 # PROVIDE: knot
 # REQUIRE: NETWORKING syslogd
 # BEFORE:  DAEMON
 if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 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"
+extra_commands="reload"
 start_cmd="$knotd -d"
 stop_cmd="$command stop"
 restart_cmd="$command restart"
 reload_cmd="$command reload"
 status_cmd="$command status"
 knot_precmd()
+{
         if [ ! -d @VARBASE@/run/knot ]; then
                 @MKDIR@ @VARBASE@/run/knot
                 @CHMOD@ 0750 @VARBASE@/run/knot
                 @CHOWN@ root:wheel @VARBASE@/run/knot
         fi
+}
 if [ -f /etc/rc.subr ]; then

 @@ -1,29 +1,25 @@
-$NetBSD: patch-samples_Makefile.in,v 1.3 2014/11/10 21:20:32 pettai Exp $
+$NetBSD: patch-samples_Makefile.in,v 1.4 2015/10/26 19:23:08 pettai Exp $
-Fix sysconfdir + sample conf snippet
+--- samples/Makefile.in.orig	2015-10-26 16:12:16.000000000 +0000
 --- samples/Makefile.in.orig	2014-09-15 14:32:42.000000000 +0000
 +++ samples/Makefile.in
-@@ -252,6 +252,7 @@ sharedstatedir = @sharedstatedir@
+@@ -264,6 +264,7 @@ sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  storage_dir = @storage_dir@
  sysconfdir = @sysconfdir@
 +EGDIR = @EGDIR@
  systemd_CFLAGS = @systemd_CFLAGS@
  systemd_LIBS = @systemd_LIBS@
  target_alias = @target_alias@
-@@ -469,10 +470,10 @@ knot.sample.conf: knot.sample.conf.in
+@@ -483,9 +484,9 @@ knot.sample.conf: knot.sample.conf.in
  	mv $@.tmp $@
- install-data-local: knot.sample.conf
+ @HAVE_DAEMON_TRUE@install-data-local: knot.sample.conf
--	[ -d $(DESTDIR)/$(config_dir) ] || \
+-@HAVE_DAEMON_TRUE@	if [ \! -f $(DESTDIR)/$(config_dir)/knot.sample.conf ]; then \
--	  $(INSTALL) -d $(DESTDIR)/$(config_dir)
+-@HAVE_DAEMON_TRUE@	  $(INSTALL) -d $(DESTDIR)/$(config_dir); \
--	[ -f $(DESTDIR)/$(config_dir)/knot.sample.conf ] || \
+-@HAVE_DAEMON_TRUE@	  $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(config_dir); \
--	  $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(config_dir)
++@HAVE_DAEMON_TRUE@	if [ \! -f $(DESTDIR)/$(EGDIR)/knot.sample.conf ]; then \
-+	[ -d $(DESTDIR)/$(EGDIR) ] || \
++@HAVE_DAEMON_TRUE@	  $(INSTALL) -d $(DESTDIR)/$(EGDIR); \
-+	  $(INSTALL) -d $(DESTDIR)/$(EGDIR)
++@HAVE_DAEMON_TRUE@	  $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(EGDIR); \
-+	[ -f $(DESTDIR)/$(EGDIR)/knot.sample.conf ] || \
+ @HAVE_DAEMON_TRUE@	fi
-+	  $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(EGDIR)
+ @HAVE_BASH_COMPLETIONS_TRUE@@HAVE_DAEMON_TRUE@	if [ \! -f $(DESTDIR)/$(bash_completions_dir)/keymgr ]; then \
  @HAVE_BASH_COMPLETIONS_TRUE@@HAVE_DAEMON_TRUE@	  $(INSTALL) -d $(DESTDIR)/$(bash_completions_dir); \
  uninstall-local:
  	[ -f $(DESTDIR)/$(config_dir)/knot.sample.conf ] && \