Index: head/dns/powerdns/Makefile =================================================================== --- head/dns/powerdns/Makefile (revision 431989) +++ head/dns/powerdns/Makefile (revision 431990) @@ -1,127 +1,128 @@ # $FreeBSD$ PORTNAME= powerdns PORTVERSION= 4.0.3 +PORTREVISION= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} MAINTAINER= tremere@cainites.net COMMENT= Advanced DNS server with multiple backends including SQL LICENSE= GPLv2 LIB_DEPENDS= libboost_serialization.so:devel/boost-libs BROKEN_powerpc64= Does not build BROKEN_sparc64= Does not compile: error: to_string is not a member of std USES= compiler:c++11-lib cpe gmake libtool localbase:ldflags pathfix pkgconfig ssl \ tar:bzip2 USE_LDCONFIG= YES USE_SUBMAKE= YES GNU_CONFIGURE= YES INSTALL_TARGET= install-strip CONFIGURE_ARGS= --disable-static \ --with-modules="" \ --with-dynmodules="pipe bind ${MODULES}" \ --docdir="${PREFIX}/share/doc/powerdns" \ --sysconfdir="${PREFIX}/etc/pdns" \ --with-boost="${LOCALBASE}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ CURDIR2="${.CURDIR}" \ MKDIR="${MKDIR}" \ DISTNAME="${DISTNAME}" \ POWERDNS_OPTIONS="${POWERDNS_OPTIONS}" SUB_FILES= pkg-message USE_RC_SUBR= pdns OPTIONS_DEFINE= GEOIP MYDNS MYSQL OPENDBX OPENLDAP PGSQL PROTOBUF REMOTE SQLITE3 TINYDNS TOOLS UNIXODBC OPTIONS_GROUP= EXPERIMENTAL REMOTEOPT OPTIONS_GROUP_EXPERIMENTAL= LUABACKEND OPTIONS_GROUP_REMOTEOPT= ZEROMQ OPTIONS_SINGLE= LUASG OPTIONS_SINGLE_LUASG= LUA LUAJIT ZEROMQ_IMPLIES= REMOTE OPTIONS_DEFAULT= LUA PGSQL OPTIONS_SUB= yes GEOIP_LIB_DEPENDS= libyaml-cpp.so:devel/yaml-cpp \ libGeoIP.so:net/GeoIP GEOIP_VARS= MODULES+=geoip LUA_CONFIGURE_WITH= lua LUA_USES= lua LUABACKEND_VARS= MODULES+=lua LUAJIT_CONFIGURE_WITH= luajit LUAJIT_LIB_DEPENDS= libluajit-5.1.so.2:lang/luajit MYDNS_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYDNS_USE= MYSQL=YES MYDNS_VARS= MODULES+=mydns MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE} MYSQL_CONFIGURE_OFF= --without-mysql MYSQL_USE= MYSQL=YES MYSQL_VARS= MODULES+=gmysql OPENDBX_LIB_DEPENDS= libopendbx.so:databases/opendbx OPENDBX_VARS= MODULES+=opendbx OPENLDAP_CXXFLAGS= -DLDAP_DEPRECATED=1 OPENLDAP_USE= OPENLDAP=YES OPENLDAP_VARS= MODULES+=ldap PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} PGSQL_CONFIGURE_OFF= --without-pgsql PGSQL_USES= pgsql PGSQL_VARS= MODULES+=gpgsql PROTOBUF_CONFIGURE_WITH= protobuf PROTOBUF_LIB_DEPENDS= libprotobuf.so:devel/protobuf REMOTE_VARS= MODULES+=remote SQLITE3_USES= sqlite:3 SQLITE3_VARS= MODULES+=gsqlite3 TINYDNS_CONFIGURE_ON= CDB_LIBS="-L${LOCALBASE}/lib -lcdb" CDB_CFLAGS="-I${LOCALBASE}/include" TINYDNS_LIB_DEPENDS= libcdb.so:databases/tinycdb TINYDNS_VARS= MODULES+=tinydns TOOLS_CONFIGURE_ENABLE= tools UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC UNIXODBC_VARS= MODULES+=godbc ZEROMQ_CONFIGURE_ARGS= --enable-remotebackend-zeromq ZEROMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 GEOIP_DESC= GeoIP backend LUASG_DESC= Lua Engine LUABACKEND_DESC= Lua backend LUAJIT_DESC= Enable LuaJIT MYDNS_DESC= MyDNS backend MYSQL_DESC= MySQL backend OPENDBX_DESC= OpenDBX backend OPENLDAP_DESC= OpenLDAP backend PGSQL_DESC= PostgreSQL backend PROTOBUF_DESC= Protobuf support REMOTE_DESC= Remote backend REMOTEOPT_DESC= Remote backend connectors SQLITE3_DESC= SQLite 3 backend TINYDNS_DESC= TinyDNS backend TOOLS_DESC= Build extra tools ZEROMQ_DESC= Enable ZeroMQ connector (Implies REMOTE enabled) post-install:: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @${STAGEDIR}${LOCALBASE}/sbin/pdns_server --module-dir=${STAGEDIR}${LOCALBASE}/lib/pdns --launch="pipe bind ${MODULES}" --config > ${STAGEDIR}${EXAMPLESDIR}/pdns.conf @${REINPLACE_CMD} -e 's;${STAGEDIR};;' -i '' ${STAGEDIR}${EXAMPLESDIR}/pdns.conf .include Index: head/dns/powerdns/files/patch-ext_json11_json11.cpp =================================================================== --- head/dns/powerdns/files/patch-ext_json11_json11.cpp (nonexistent) +++ head/dns/powerdns/files/patch-ext_json11_json11.cpp (revision 431990) @@ -0,0 +1,37 @@ +--- ext/json11/json11.cpp.orig 2017-01-18 18:06:37 UTC ++++ ext/json11/json11.cpp +@@ -37,11 +37,21 @@ 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 +214,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/powerdns/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 Index: head/dns/powerdns-recursor/Makefile =================================================================== --- head/dns/powerdns-recursor/Makefile (revision 431989) +++ head/dns/powerdns-recursor/Makefile (revision 431990) @@ -1,56 +1,57 @@ # Created by: sten@blinkenlights.nl # $FreeBSD$ PORTNAME= recursor PORTVERSION= 4.0.4 +PORTREVISION= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ PKGNAMEPREFIX= powerdns- DISTNAME= pdns-${PORTNAME}-${PORTVERSION} MAINTAINER= tremere@cainites.net COMMENT= Advanced DNS recursor LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs LIB_DEPENDS= libboost_context.so:devel/boost-libs BROKEN_sparc64= Does not compile on sparc64 USES= compiler:c++11-lib cpe gmake localbase pkgconfig ssl tar:bzip2 GNU_CONFIGURE= YES CXXFLAGS+= -D_GLIBCXX_USE_C99 CPE_VENDOR= powerdns OPTIONS_DEFINE= SETUID OPTIONS_DEFAULT= LUA SETUID OPTIONS_RADIO= LUA_RG OPTIONS_RADIO_LUA_RG= LUA LUAJIT LUAJIT_DESC= Enable LuaJIT LUA_RG_DESC= Lua Engine SETUID_DESC= Run as pdns_recursor user CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/pdns SUB_FILES= pkg-message LUA_CONFIGURE_WITH= lua LUA_USES= lua LUAJIT_CONFIGURE_WITH= luajit LUAJIT_LIB_DEPENDS= libluajit-5.1.so.2:lang/luajit SETUID_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-setuid USE_RC_SUBR+= pdns-recursor .include .if ${PORT_OPTIONS:MSETUID} USERS= pdns_recursor GROUPS= pdns .endif .include Index: head/dns/powerdns-recursor/files/patch-ext_json11_json11.cpp =================================================================== --- head/dns/powerdns-recursor/files/patch-ext_json11_json11.cpp (nonexistent) +++ head/dns/powerdns-recursor/files/patch-ext_json11_json11.cpp (revision 431990) @@ -0,0 +1,37 @@ +--- ext/json11/json11.cpp.orig 2017-01-18 18:06:37 UTC ++++ ext/json11/json11.cpp +@@ -37,11 +37,21 @@ 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 +214,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/powerdns-recursor/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