svn commit: r371356 - in head/dns/powerdns: . files

[Kurt Jaeger]

Author: pi
Date: Wed Oct 22 11:59:49 2014
New Revision: 371356
URL: https://svnweb.freebsd.org/changeset/ports/371356
QAT: https://qat.redports.org/buildarchive/r371356/

Log:
  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 at cainites.net> (maintainer)

Added:
  head/dns/powerdns/files/patch-modules__luabackend__lua_functions.cc   (contents, props changed)
  head/dns/powerdns/files/patch-modules__luabackend__luabackend.hh   (contents, props changed)
Modified:
  head/dns/powerdns/Makefile

Modified: head/dns/powerdns/Makefile
==============================================================================
--- head/dns/powerdns/Makefile	Wed Oct 22 11:48:36 2014	(r371355)
+++ head/dns/powerdns/Makefile	Wed Oct 22 11:59:49 2014	(r371356)
@@ -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="${WRKDIRPREFI
 		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
 

Added: head/dns/powerdns/files/patch-modules__luabackend__lua_functions.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/dns/powerdns/files/patch-modules__luabackend__lua_functions.cc	Wed Oct 22 11:59:49 2014	(r371356)
@@ -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()); 

Added: head/dns/powerdns/files/patch-modules__luabackend__luabackend.hh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/dns/powerdns/files/patch-modules__luabackend__luabackend.hh	Wed Oct 22 11:59:49 2014	(r371356)
@@ -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);