Index: head/dns/knot-resolver/Makefile
===================================================================
--- head/dns/knot-resolver/Makefile	(revision 421347)
+++ head/dns/knot-resolver/Makefile	(revision 421348)
@@ -1,63 +1,60 @@
 # Created by: Leo Vandewoestijne <freebsd@dns-lab.com>
 # $FreeBSD$
 
 PORTNAME=	knot-resolver
 PORTVERSION=	1.1.1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
 		https://dns.company/downloads/knot-resolver/
 
 MAINTAINER=	freebsd@dns-lab.com
 COMMENT=	Caching full resolver implementation
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libknot.so:dns/knot2 \
 		liblmdb.so:databases/lmdb \
 		libluajit-5.1.so:lang/luajit \
 		libuv.so:devel/libuv \
 		libgnutls.so:security/gnutls \
 		libnettle.so:security/nettle
 
 CONFLICTS=	knot-1.* knot1-[0-6].*
 
 BROKEN_FreeBSD_9=	does not build, see PR#212215 for build failures
 
 MAKE_ARGS+=	PREFIX=${PREFIX}
 MAKE_ARGS+=	LIBDIR=${PREFIX}/lib
 MAKE_ARGS+=	PKG_CONFIG_PATH=${LOCALBASE}/libdata/pkgconfig
 MAKE_ARGS+=	lmdb_CFLAGS=-I${LOCALBASE}/include lmdb_LIBS=-llmdb
 
 USES=		gmake libtool pkgconfig tar:xz
 USE_CSTD=	c99
-USE_LDCONFIG=	${PREFIX}/lib
+USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=			DOXYGEN MEMCACHED REDIS
 OPTIONS_DEFAULT=
 DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
 DOXYGEN_MAKE_ARGS=		HAS_doxygen=yes
 DOXYGEN_MAKE_ARGS_OFF=		HAS_doxygen=no
 MEMCACHED_DESC=			memcached in-memory data-backend
 MEMCACHED_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
 MEMCACHED_MAKE_ARGS=		HAS_libmemcached=yes
 MEMCACHED_MAKE_ARGS_OFF=	HAS_libmemcached=no
 MEMCACHED_PLIST_FILES=		lib/kdns_modules/kmemcached.so
 REDIS_DESC=			redis in-memory data-backend
 REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis
 REDIS_MAKE_ARGS=		HAS_hiredis=yes
 REDIS_MAKE_ARGS_OFF=		HAS_hiredis=no
 REDIS_PLIST_FILES=		lib/kdns_modules/redis.so
 
 USERS=		kresd
 GROUPS=		kresd
-SUB_LIST+=	USERS="${USERS}" GROUPS="${GROUPS}"
-
-SUB_FILES=	pkg-message
 
 PORTDOCS=	AUTHORS COPYING CodingStyle README.md
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/dns/knot-resolver/pkg-plist
===================================================================
--- head/dns/knot-resolver/pkg-plist	(revision 421347)
+++ head/dns/knot-resolver/pkg-plist	(revision 421348)
@@ -1,78 +1,74 @@
 etc/kresd/config.cluster
 etc/kresd/config.isp
 etc/kresd/config.personal
 etc/kresd/config.splitview
 etc/kresd/icann-ca.pem
 include/libkres/alg_containers.h
 include/libkres/alg_sha.h
 include/libkres/array.h
 include/libkres/cache.h
 include/libkres/cdb.h
 include/libkres/cdb_lmdb.h
 include/libkres/control.h
 include/libkres/dnssec.h
 include/libkres/helper.h
 include/libkres/layer.h
 include/libkres/lru_cache.h
 include/libkres/map.h
 include/libkres/module.h
 include/libkres/nonce.h
 include/libkres/nsec.h
 include/libkres/nsec3.h
 include/libkres/nsrep.h
 include/libkres/resolve.h
 include/libkres/rplan.h
 include/libkres/set.h
 include/libkres/signature.h
 include/libkres/ta.h
 include/libkres/utils.h
 include/libkres/zonecut.h
 lib/kdns_modules/aho-corasick.lua
 lib/kdns_modules/cookies.so
 lib/kdns_modules/daf.lua
 lib/kdns_modules/daf/daf.js
 lib/kdns_modules/dns64.lua
 lib/kdns_modules/graphite.lua
 lib/kdns_modules/hints.so
 lib/kdns_modules/http.lua
 lib/kdns_modules/http/LICENSE
 lib/kdns_modules/http/bootstrap-theme.min.css
 lib/kdns_modules/http/bootstrap.min.css
 lib/kdns_modules/http/bootstrap.min.js
 lib/kdns_modules/http/d3.js
 lib/kdns_modules/http/datamaps.world.min.js
 lib/kdns_modules/http/dygraph-combined.js
 lib/kdns_modules/http/epoch.css
 lib/kdns_modules/http/epoch.js
 lib/kdns_modules/http/favicon.ico
 lib/kdns_modules/http/glyphicons-halflings-regular.woff2
 lib/kdns_modules/http/h2_connection.lua
 lib/kdns_modules/http/h2_stream.lua
 lib/kdns_modules/http/jquery.js
 lib/kdns_modules/http/kresd.css
 lib/kdns_modules/http/kresd.js
 lib/kdns_modules/http/main.tpl
 lib/kdns_modules/http/selectize.bootstrap3.min.css
 lib/kdns_modules/http/selectize.min.css
 lib/kdns_modules/http/selectize.min.js
 lib/kdns_modules/http/server.lua
 lib/kdns_modules/http/topojson.js
 lib/kdns_modules/ketcd.lua
 lib/kdns_modules/kres.lua
 lib/kdns_modules/policy.lua
 lib/kdns_modules/predict.lua
 lib/kdns_modules/prometheus.lua
 lib/kdns_modules/renumber.lua
 lib/kdns_modules/stats.so
 lib/kdns_modules/trust_anchors.lua
 lib/kdns_modules/view.lua
 lib/kdns_modules/zonefile.lua
 lib/libkres.so
 lib/libkres.so.1
 libdata/pkgconfig/libkres.pc
 man/man8/kresd.8.gz
 sbin/kresd
-@dir lib/kdns_modules/daf
-@dir lib/kdns_modules/http
-@dir lib/kdns_modules
-@dir libdata/pkgconfig