Index: branches/2018Q1/dns/powerdns-recursor/Makefile
===================================================================
--- branches/2018Q1/dns/powerdns-recursor/Makefile	(revision 459778)
+++ branches/2018Q1/dns/powerdns-recursor/Makefile	(revision 459779)
@@ -1,67 +1,69 @@
 # Created by: sten@blinkenlights.nl
 # $FreeBSD$
 
 PORTNAME=	recursor
 DISTVERSION=	4.1.0
 PORTREVISION=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 PKGNAMEPREFIX=	powerdns-
 DISTNAME=	pdns-${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	tremere@cainites.net
 COMMENT=	Advanced DNS recursor
 
 LICENSE=	GPLv2
 
 BROKEN_armv6=		fails to compile: use of overloaded operator << is ambiguous
 BROKEN_armv7=		fails to compile: use of overloaded operator << is ambiguous
 BROKEN_sparc64=		fails to compile: json11.cpp: undefined reference to std::__throw_out_of_range_fmt
 BROKEN_powerpc64=	fails to compile: dnslabeltext.cc: undefined reference to std::__cxx11::basic_string
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 LIB_DEPENDS=	libboost_context.so:devel/boost-libs \
 		libprotobuf.so:devel/protobuf
 
 USES=		compiler:c++11-lib cpe gmake localbase:ldflags pkgconfig ssl tar:bzip2
 GNU_CONFIGURE=	YES
 CXXFLAGS+=	-D_GLIBCXX_USE_C99
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/pdns \
 		--with-protobuf
 
 CPE_VENDOR=	powerdns
 
 USE_RC_SUBR=	pdns-recursor
 
 OPTIONS_DEFINE=	OPTALGO SETUID
 OPTIONS_DEFAULT=	LUA SETUID
 OPTIONS_RADIO=	LUA_RG
 OPTIONS_RADIO_LUA_RG=	LUA LUAJIT
 LUAJIT_DESC=		Enable LuaJIT
 LUA_RG_DESC=		Lua Engine
 OPTALGO_DESC=		Enable optional algorithms (12 & 15)
 SETUID_DESC=		Run as pdns_recursor user
 
 LUA_CONFIGURE_WITH=	lua
 LUA_USES=		lua
 
 LUAJIT_CONFIGURE_WITH=	luajit
+LUAJIT_DESC=		Use LuaJIT instead of Lua
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so.2:lang/luajit
-
+LUAJIT_USES_OFF=	lua
 OPTALGO_CONFIGURE_ON=	--enable-botan \
 			--enable-libsodium
+OPTALGO_DESC=		Enable optional algorithms (12, 15 & 16)
 OPTALGO_LIB_DEPENDS=	libbotan-2.so:security/botan2 \
 			libsodium.so:security/libsodium
-
-SETUID_VARS=	USERS=pdns_recursor GROUPS=pdns
+SETUID_DESC=		Run as pdns_recursor user
 SETUID_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-setuid
+SETUID_VARS=		USERS=pdns_recursor GROUPS=pdns
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1003506
 IGNORE=		no _cxa_thread_atexit() support in FreeBSD libc < 10.4
 .endif
 
 .include <bsd.port.post.mk>
Index: branches/2018Q1/dns/powerdns-recursor/distinfo
===================================================================
--- branches/2018Q1/dns/powerdns-recursor/distinfo	(revision 459778)
+++ branches/2018Q1/dns/powerdns-recursor/distinfo	(revision 459779)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512394122
-SHA256 (pdns-recursor-4.1.0.tar.bz2) = 880b9d4cc57e2b11cae5bff9b20571fb3466f4385c010d06764296fef44f60a3
-SIZE (pdns-recursor-4.1.0.tar.bz2) = 1222751
+TIMESTAMP = 1516634099
+SHA256 (pdns-recursor-4.1.1.tar.bz2) = 8feb03c7141997775cb52c131579e8e34c9896ea8bb77276328f5f6cc4e1396b
+SIZE (pdns-recursor-4.1.1.tar.bz2) = 1224544
Index: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 459778)
+++ branches/2018Q1	(revision 459779)

Property changes on: branches/2018Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r459742