svn commit: r459781 - branches/2018Q1/dns/powerdns-recursor

[Kirill Ponomarev]

Author: krion
Date: Tue Jan 23 15:52:45 2018
New Revision: 459781
URL: https://svnweb.freebsd.org/changeset/ports/459781

Log:
  Fix previous commit with mfh.
  
  Approved by:	ports-secteam

Modified:
  branches/2018Q1/dns/powerdns-recursor/Makefile

Modified: branches/2018Q1/dns/powerdns-recursor/Makefile
==============================================================================
--- branches/2018Q1/dns/powerdns-recursor/Makefile	Tue Jan 23 15:45:58 2018	(r459780)
+++ branches/2018Q1/dns/powerdns-recursor/Makefile	Tue Jan 23 15:52:45 2018	(r459781)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	recursor
-DISTVERSION=	4.1.0
-PORTREVISION=	1
+DISTVERSION=	4.1.1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 PKGNAMEPREFIX=	powerdns-
@@ -23,6 +22,8 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.h
 LIB_DEPENDS=	libboost_context.so:devel/boost-libs \
 		libprotobuf.so:devel/protobuf
 
+CONFLICTS_INSTALL=	powerdns-recursor40
+
 USES=		compiler:c++11-lib cpe gmake localbase:ldflags pkgconfig ssl tar:bzip2
 GNU_CONFIGURE=	YES
 CXXFLAGS+=	-D_GLIBCXX_USE_C99
@@ -33,26 +34,18 @@ 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
-
+OPTIONS_DEFINE=		LUAJIT OPTALGO SETUID
+OPTIONS_DEFAULT=	SETUID
 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-libdecaf \
 			--enable-libsodium
 OPTALGO_DESC=		Enable optional algorithms (12, 15 & 16)
 OPTALGO_LIB_DEPENDS=	libbotan-2.so:security/botan2 \
+			libdecaf.so:security/libdecaf \
 			libsodium.so:security/libsodium
 SETUID_DESC=		Run as pdns_recursor user
 SETUID_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-setuid