Index: head/dns/dnsdist/Makefile
===================================================================
--- head/dns/dnsdist/Makefile	(revision 448579)
+++ head/dns/dnsdist/Makefile	(revision 448580)
@@ -1,52 +1,51 @@
 # Created by: Carlos J Puga Medina <cpm@fbsd.es>
 # $FreeBSD$
 
 PORTNAME=	dnsdist
-DISTVERSION=	1.1.0
-PORTREVISION=	7
+DISTVERSION=	1.2.0
 CATEGORIES=	dns net
 MASTER_SITES=	https://downloads.powerdns.com/releases/ \
 		LOCAL/cpm
 
 MAINTAINER=	cpm@FreeBSD.org
 COMMENT=	Highly DNS-, DoS- and abuse-aware loadbalancer
 
 LICENSE=	GPLv2 UNLICENSE
 LICENSE_COMB=	multi
 LICENSE_FILE_UNLICENSE=	${WRKSRC}/ext/incbin/UNLICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
 LIB_DEPENDS=	libboost_serialization.so:devel/boost-libs \
 		libprotobuf.so:devel/protobuf \
 		libre2.so:devel/re2 \
 		libsodium.so:security/libsodium
 
 GNU_CONFIGURE=	yes
 USES=		bison compiler cpe gmake libedit libtool localbase lua:52 \
 		pkgconfig tar:bz2
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin \
 		--enable-dnscrypt \
 		--enable-libsodium \
 		--enable-re2
 
 INSTALL_TARGET=	install-strip
 
 USERS=		_dnsdist
 GROUPS=		_dnsdist
 
 USE_RC_SUBR=	dnsdist
 
 .include <bsd.port.pre.mk>
 
 # Fix dnsdist binaries when building on FreeBSD 10.3
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
-BUILD_DEPENDS+=	clang39:devel/llvm39
-CC=		clang39
-CXX=		clang++39
+BUILD_DEPENDS+=	clang40:devel/llvm40
+CC=		clang40
+CXX=		clang++40
 .endif
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/dnsdist.conf.sample \
 		${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.post.mk>
Index: head/dns/dnsdist/distinfo
===================================================================
--- head/dns/dnsdist/distinfo	(revision 448579)
+++ head/dns/dnsdist/distinfo	(revision 448580)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483106940
-SHA256 (dnsdist-1.1.0.tar.bz2) = b4a1e8931b6d05a24494f54224211c0de0eeb1f5ff170f6b9f5665219bfeafc2
-SIZE (dnsdist-1.1.0.tar.bz2) = 874837
+TIMESTAMP = 1503429670
+SHA256 (dnsdist-1.2.0.tar.bz2) = 9885c9ee8ac7076aede586ea58d4642eb877e7b2d76c902254494e2a5a5faa78
+SIZE (dnsdist-1.2.0.tar.bz2) = 876104
Index: head/dns/dnsdist/files/patch-ext_json11_json11.cpp
===================================================================
--- head/dns/dnsdist/files/patch-ext_json11_json11.cpp	(revision 448579)
+++ head/dns/dnsdist/files/patch-ext_json11_json11.cpp	(nonexistent)
@@ -1,36 +0,0 @@
---- ext/json11/json11.cpp.orig	2017-01-18 02:13:48 UTC
-+++ ext/json11/json11.cpp
-@@ -37,11 +37,20 @@ using std::make_shared;
- using std::initializer_list;
- using std::move;
- 
-+/* Helper for representing null - just a do-nothing struct, plus comparison
-+ * operators so the helpers in JsonValue work. We can't use nullptr_t because
-+ * it may not be orderable.
-+*/
-+struct NullStruct {
-+    bool operator==(NullStruct) const { return true; }
-+    bool operator<(NullStruct) const { return false; }
-+};
-+
- /* * * * * * * * * * * * * * * * * * * *
-  * Serialization
-  */
- 
--static void dump(std::nullptr_t, string &out) {
-+static void dump(NullStruct, string &out) {
-     out += "null";
- }
- 
-@@ -204,9 +213,9 @@ public:
-     explicit JsonObject(Json::object &&value)      : Value(move(value)) {}
- };
- 
--class JsonNull final : public Value<Json::NUL, std::nullptr_t> {
-+class JsonNull final : public Value<Json::NUL, NullStruct> {
- public:
--    JsonNull() : Value(nullptr) {}
-+    JsonNull() : Value({}) {}
- };
- 
- /* * * * * * * * * * * * * * * * * * * *

Property changes on: head/dns/dnsdist/files/patch-ext_json11_json11.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/dns/dnsdist/pkg-descr
===================================================================
--- head/dns/dnsdist/pkg-descr	(revision 448579)
+++ head/dns/dnsdist/pkg-descr	(revision 448580)
@@ -1,6 +1,6 @@
 dnsdist is a highly DNS-, DoS- and abuse-aware loadbalancer. Its
 goal in life is to route DNS traffic to the best DNS server,
 delivering top performance to legitimate users while shunting or
 blocking abusive traffic.
 
-WWW: http://dnsdist.org
+WWW: https://dnsdist.org