Index: head/dns/dnsdist/Makefile =================================================================== --- head/dns/dnsdist/Makefile (revision 431819) +++ head/dns/dnsdist/Makefile (revision 431820) @@ -1,44 +1,45 @@ # Created by: Carlos J Puga Medina # $FreeBSD$ PORTNAME= dnsdist DISTVERSION= 1.1.0 +PORTREVISION= 1 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_NAME_UNLICENSE= The Unlicense LICENSE_FILE_UNLICENSE= ${WRKSRC}/ext/incbin/UNLICENSE LICENSE_PERMS_UNLICENSE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept 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:c++14-lang 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 post-install: ${INSTALL_DATA} ${FILESDIR}/dnsdist.conf.sample \ ${STAGEDIR}${PREFIX}/etc .include Index: head/dns/dnsdist/files/patch-ext_json11_json11.cpp =================================================================== --- head/dns/dnsdist/files/patch-ext_json11_json11.cpp (nonexistent) +++ head/dns/dnsdist/files/patch-ext_json11_json11.cpp (revision 431820) @@ -0,0 +1,36 @@ +--- 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 { ++class JsonNull final : public Value { + public: +- JsonNull() : Value(nullptr) {} ++ JsonNull() : Value({}) {} + }; + + /* * * * * * * * * * * * * * * * * * * * Property changes on: head/dns/dnsdist/files/patch-ext_json11_json11.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property