Update to 1.3.3

  - fix up OPTIONS processing so that
     - turning off an OPTION does disable the option even in the presence
       of the optional dependencies required for it
     - add PLIST_FILES where appropriate for each option
  - rename the STATS option to TRUSTANCHOR since that's the important
    capability that option controls
  - strip installed files where appropriate

Changes:  	https://gitlab.labs.nic.cz/knot/knot-resolver/raw/v1.3.3/NEWS

PR:		221177
Submitted by:	freebsd@dns-lab.com (maintainer)

3 files changed, 42 insertions, 18 deletions

diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
index 2072ece66b2d..00dde3bf2300 100644
--- a/dns/knot-resolver/Makefile
+++ b/dns/knot-resolver/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	knot-resolver
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.3
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-resolver/ \
 		https://dns.company/downloads/knot-resolver/
@@ -30,46 +30,77 @@ USES=		gmake libedit libtool pkgconfig tar:xz
 USE_CSTD=	c99
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	COOKIES DNSTAP DOXYGEN GO MEMCACHED REDIS STATS
+OPTIONS_DEFINE=	COOKIES DNSTAP DOXYGEN GO MEMCACHED REDIS TRUSTANCHOR
 
 COOKIES_DESC=			cookies
 COOKIES_LIB_DEPENDS=		libnettle.so:security/nettle
+COOKIES_MAKE_ARGS_ON=		HAS_nettle=yes
+COOKIES_MAKE_ARGS_OFF=		HAS_nettle=no
+COOKIES_PLIST_FILES=		lib/kdns_modules/cookies.so      \
+				include/libkres/alg_containers.h \
+				include/libkres/alg_sha.h        \
+				include/libkres/control.h        \
+				include/libkres/helper.h         \
+				include/libkres/lru_cache.h      \
+				include/libkres/nonce.h
 
 DNSTAP_DESC=			dnstap support
 DNSTAP_LIB_DEPENDS=		libprotobuf.so:devel/protobuf \
 				libprotobuf-c.so:devel/protobuf-c \
 				libfstrm.so:devel/fstrm
+DNSTAP_MAKE_ARGS_ON=		HAS_libprotobuf-c=yes HAS_libfstrm=yes
+DNSTAP_MAKE_ARGS_OFF=		HAS_libprotobuf-c=no  HAS_libfstrm=no
+DNSTAP_PLIST_FILES=		lib/kdns_modules/dnstap.so
 
 DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
-DOXYGEN_MAKE_ARGS=		HAS_doxygen=yes
+DOXYGEN_MAKE_ARGS_ON=		HAS_doxygen=yes
 DOXYGEN_MAKE_ARGS_OFF=		HAS_doxygen=no
 
 GO_DESC=			go
 GO_BUILD_DEPENDS=		go>=1.5:lang/go
+GO_MAKE_ARGS_ON=		HAS_go=yes
+GO_MAKE_ARGS_OFF=		HAS_go=no
 
 MEMCACHED_DESC=			memcached in-memory data-backend
 MEMCACHED_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
-MEMCACHED_MAKE_ARGS=		HAS_libmemcached=yes
+MEMCACHED_MAKE_ARGS_ON=		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_ON=		HAS_hiredis=yes
 REDIS_MAKE_ARGS_OFF=		HAS_hiredis=no
 REDIS_PLIST_FILES=		lib/kdns_modules/redis.so
 
-STATS_DESC=			stats
-STATS_BUILD_DEPENDS=		luasocket:net/luasocket \
-				luasec:security/luasec
+TRUSTANCHOR_DESC=		Trust anchor bootstrapping and stats 
+TRUSTANCHOR_USES=		lua
+TRUSTANCHOR_MAKE_ARGS_ON=	HAS_ltn12=yes HAS_ssl.https=yes
+TRUSTANCHOR_MAKE_ARGS_OFF=	HAS_ltn12=no  HAS_ssl.https=no
+TRUSTANCHOR_BUILD_DEPENDS=	${LUA_PKGNAMEPREFIX}luasocket>=0:net/luasocket \
+				${LUA_PKGNAMEPREFIX}luasec>=0:security/luasec
 
 USERS=		kresd
 GROUPS=		kresd
 
 PORTDOCS=	AUTHORS COPYING CodingStyle README.md
 
+STRIP_TARGETS=	sbin/kresd			\
+		sbin/kresc			\
+		lib/libkres.so.3		\
+		lib/kdns_modules/cookies.so	\
+		lib/kdns_modules/dnstap.so	\
+		lib/kdns_modules/hints.so	\
+		lib/kdns_modules/kmemcached.so	\
+		lib/kdns_modules/stats.so
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
+.for STRIP_TGT in ${STRIP_TARGETS}
+	if [ -f ${STAGEDIR}${PREFIX}/${STRIP_TGT} ]; then \
+	    ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${STRIP_TGT}; \
+	fi
+.endfor
 
 .include <bsd.port.mk>
diff --git a/dns/knot-resolver/distinfo b/dns/knot-resolver/distinfo
index 4676dfcdc15b..a8dfc4749e22 100644
--- a/dns/knot-resolver/distinfo
+++ b/dns/knot-resolver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498699706
-SHA256 (knot-resolver-1.3.1.tar.xz) = cc9631fe1a92628e81e74b324a7f70c0b29840d426de05d7d045fdf85ab01117
-SIZE (knot-resolver-1.3.1.tar.xz) = 1074804
+TIMESTAMP = 1502352801
+SHA256 (knot-resolver-1.3.3.tar.xz) = c679238bea5744de8a99f4402a61e9e58502bc42b40ecfa370e53679ed5d5b80
+SIZE (knot-resolver-1.3.3.tar.xz) = 1082408
diff --git a/dns/knot-resolver/pkg-plist b/dns/knot-resolver/pkg-plist
index 40ba03983c24..f7628dbfcf8f 100644
--- a/dns/knot-resolver/pkg-plist
+++ b/dns/knot-resolver/pkg-plist
@@ -3,21 +3,15 @@ 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.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
@@ -29,7 +23,6 @@ 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