diff options
| author | pi <pi@FreeBSD.org> | 2014-10-22 19:59:49 +0800 |
|---|---|---|
| committer | pi <pi@FreeBSD.org> | 2014-10-22 19:59:49 +0800 |
| commit | 4ff9fec01fadb87f56c368bf624d1a34afd1f1f5 (patch) | |
| tree | 2c43526bc85d5e90dff6e44725f4936cbfeada1d /dns | |
| parent | 6f7a3681d88f41f55d55c6ad414edd4aca2e555e (diff) | |
| download | freebsd-ports-gnome-4ff9fec01fadb87f56c368bf624d1a34afd1f1f5.tar.gz freebsd-ports-gnome-4ff9fec01fadb87f56c368bf624d1a34afd1f1f5.tar.zst freebsd-ports-gnome-4ff9fec01fadb87f56c368bf624d1a34afd1f1f5.zip | |
dns/powerdns: fix for check-plist with non-standard options
The pkg-plist was broken with non-default backends enabled.
PR: 194505
Submitted by: Ralf van der Enden <tremere@cainites.net> (maintainer)
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/powerdns/Makefile | 4 | ||||
| -rw-r--r-- | dns/powerdns/files/patch-modules__luabackend__lua_functions.cc | 18 | ||||
| -rw-r--r-- | dns/powerdns/files/patch-modules__luabackend__luabackend.hh | 12 |
3 files changed, 32 insertions, 2 deletions
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile index 7d1f6bddd31b..bae3d0aff225 100644 --- a/dns/powerdns/Makefile +++ b/dns/powerdns/Makefile @@ -25,6 +25,7 @@ LDFLAGS+= -L${LOCALBASE}/lib 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}" \ @@ -32,7 +33,6 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ MKDIR="${MKDIR}" \ DISTNAME="${DISTNAME}" \ POWERDNS_OPTIONS="${POWERDNS_OPTIONS}" -# DOCSDIR= ${PREFIX}/share/doc/pdns SUB_FILES= pkg-message @@ -60,7 +60,7 @@ REMOTE_DESC= Remote backend TINYDNS_DESC= TinyDNS backend TOOLS_DESC= Build extra tools -OPTIONS_DEFAULT= PGSQLDB DNSSEC BOTAN110 POLARSSL +OPTIONS_DEFAULT= PGSQL DNSSEC BOTAN110 POLARSSL OPTIONS_SUB= yes diff --git a/dns/powerdns/files/patch-modules__luabackend__lua_functions.cc b/dns/powerdns/files/patch-modules__luabackend__lua_functions.cc new file mode 100644 index 000000000000..fcb87906ee34 --- /dev/null +++ b/dns/powerdns/files/patch-modules__luabackend__lua_functions.cc @@ -0,0 +1,18 @@ +--- modules/luabackend/lua_functions.cc.orig 2014-09-23 06:27:34 UTC ++++ modules/luabackend/lua_functions.cc +@@ -238,6 +238,7 @@ + return ret; + } + ++#ifndef __i386__ + bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, time_t& value) { + lua_pushstring(lua, key.c_str()); + lua_gettable(lua, -2); +@@ -253,6 +254,7 @@ + + return ret; + } ++#endif + + bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, uint32_t& value) { + lua_pushstring(lua, key.c_str()); diff --git a/dns/powerdns/files/patch-modules__luabackend__luabackend.hh b/dns/powerdns/files/patch-modules__luabackend__luabackend.hh new file mode 100644 index 000000000000..df2fb1d8fd21 --- /dev/null +++ b/dns/powerdns/files/patch-modules__luabackend__luabackend.hh @@ -0,0 +1,12 @@ +--- modules/luabackend/luabackend.hh.orig 2014-09-23 06:27:34 UTC ++++ modules/luabackend/luabackend.hh +@@ -155,7 +155,9 @@ + // FUNCTIONS TO THIS BACKEND + bool getValueFromTable(lua_State *lua, const std::string& key, string& value); + bool getValueFromTable(lua_State *lua, uint32_t key, string& value); ++#ifndef __i386__ + bool getValueFromTable(lua_State *lua, const std::string& key, time_t& value); ++#endif + bool getValueFromTable(lua_State *lua, const std::string& key, uint32_t& value); + bool getValueFromTable(lua_State *lua, const std::string& key, uint16_t& value); + bool getValueFromTable(lua_State *lua, const std::string& key, int& value); |