diff -ruN dns/knot2.orig/Makefile dns/knot2/Makefile
--- dns/knot2.orig/Makefile	2019-12-03 17:54:49.000000000 +0000
+++ dns/knot2/Makefile	2020-02-19 18:18:24.058804000 +0000
@@ -2,7 +2,7 @@
 # $FreeBSD: head/dns/knot2/Makefile 518954 2019-12-03 17:54:49Z pi $
 
 PORTNAME=	knot
-DISTVERSION=	2.9.1
+DISTVERSION=	2.9.2
 CATEGORIES=	dns
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
 		https://dns.company/downloads/knot-dns/
@@ -12,26 +12,28 @@
 COMMENT?=	High performance authoritative-only DNS server
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-NOT_FOR_ARCHS=	i386
-NOT_FOR_ARCHS_REASON_i386=Uses 64 bit atomics that clang cannot generate on i386
+BUILD_DEPENDS=	autoconf>=2.65:devel/autoconf
 
 LIB_DEPENDS=	libgnutls.so:security/gnutls \
-		liblmdb.so:databases/lmdb \
-		liburcu.so:sysutils/liburcu
+		liblmdb.so:databases/lmdb
 
 CONFLICTS=	knot-1.* knot1-[0-6].*
 
-USES=		alias compiler:c11 libedit libtool localbase ncurses pkgconfig python tar:xz
-GNU_CONFIGURE=	yes
+USES=		alias libtool localbase pkgconfig tar:xz
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-recvmmsg=no \
-		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
+		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
+		--mandir=${MANPREFIX}/man
 
 .if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
 CONFIGURE_ARGS+=	--with-rundir=/var/run/knot \
 			--with-storage=/var/db/knot
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	pkg-message
+USES+=		libedit
+LIB_DEPENDS+=	liburcu.so:sysutils/liburcu
 .endif
 
 .if defined(UTILS_ONLY) || defined(LIB_ONLY)
@@ -44,7 +46,6 @@
 .endif
 
 USE_LDCONFIG=	yes
-LLD_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 
 USERS=		knot
@@ -75,15 +76,26 @@
 # in higher line count.  Ideally this bug should be fixed upstream.
 DNSTAP_CPPFLAGS=		-I${LOCALBASE}/include
 
+DOCS_USES+=			python
+DOCS_CONFIGURE_OFF=		--disable-documentation
+
 FASTPARSER_DESC=		Fast zone parser (demanding compilation)
 FASTPARSER_CONFIGURE_ENABLE=	fastparser
 
 IDN_CONFIGURE_WITH=		libidn
+IDN_CONFIGURE_OFF=		--without-libidn
 IDN_LIB_DEPENDS=		libidn2.so:dns/libidn2
 
 MAXMINDDB_DESC=			Enable MaxMind for geodb module
 MAXMINDDB_LIB_DEPENDS=		libmaxminddb.so:net/libmaxminddb
 MAXMINDDB_CONFIGURE_ENABLE=	maxminddb
+
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == i386
+USES+=				autoreconf
+EXTRA_PATCHES+=			${PATCHDIR}/extrapatch-configure.ac
+.endif
 
 post-patch:
 .if !defined(UTILS_ONLY) && !defined(LIB_ONLY)
diff -ruN dns/knot2.orig/distinfo dns/knot2/distinfo
--- dns/knot2.orig/distinfo	2019-12-03 17:54:49.000000000 +0000
+++ dns/knot2/distinfo	2020-02-19 18:10:00.642172000 +0000
@@ -1,3 +1,3 @@
-TIMESTAMP = 1574091844
-SHA256 (knot-2.9.1.tar.xz) = f19121956caa360c387923654f13e4c97b3fb9093d242e110d7e0916b8d8a04d
-SIZE (knot-2.9.1.tar.xz) = 1212460
+TIMESTAMP = 1576799805
+SHA256 (knot-2.9.2.tar.xz) = 298cdf33aa7589b50df7e5833694b24cd2de8b6d17cee7e1673873fe576db6ee
+SIZE (knot-2.9.2.tar.xz) = 1181860
diff -ruN dns/knot2.orig/distinfo.orig dns/knot2/distinfo.orig
--- dns/knot2.orig/distinfo.orig	1970-01-01 00:00:00.000000000 +0000
+++ dns/knot2/distinfo.orig	2019-12-03 17:54:49.000000000 +0000
@@ -0,0 +1,3 @@
+TIMESTAMP = 1574091844
+SHA256 (knot-2.9.1.tar.xz) = f19121956caa360c387923654f13e4c97b3fb9093d242e110d7e0916b8d8a04d
+SIZE (knot-2.9.1.tar.xz) = 1212460
diff -ruN dns/knot2.orig/files/extrapatch-configure.ac dns/knot2/files/extrapatch-configure.ac
--- dns/knot2.orig/files/extrapatch-configure.ac	1970-01-01 00:00:00.000000000 +0000
+++ dns/knot2/files/extrapatch-configure.ac	2020-02-19 18:21:44.078813000 +0000
@@ -0,0 +1,12 @@
+--- configure.ac.orig	2020-02-03 00:11:36 UTC
++++ configure.ac
+@@ -636,7 +636,8 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sched.h>]]
+ AC_LINK_IFELSE(
+   [AC_LANG_PROGRAM([[#include <stdint.h>]],
+                    [[uint64_t val = 0; __atomic_add_fetch(&val, 1, __ATOMIC_RELAXED);]])],
+-  [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])]
++  [AS_IF([test -z "$CC_CLANG_VERSION" -o $host_cpu != "i386"],
++         [AC_DEFINE(HAVE_ATOMIC, 1, [Define to 1 if you have '__atomic' functions.])])]
+ )
+ 
+ # Check for '__sync' compiler builtin atomic functions.