Import of pkgsrc-2016Q3

databases/sqlrelay/patches/patch-config.mk.in

@@ -1,13 +1,14 @@
-$NetBSD: patch-config.mk.in,v 1.2 2015/09/02 12:39:33 fhajny Exp $
+$NetBSD: patch-config.mk.in,v 1.3 2016/07/01 17:02:39 fhajny Exp $
 
---- config.mk.in.orig	2015-08-24 07:39:39.000000000 +0000
+We install init scripts ourselves.
+--- config.mk.in.orig	2016-03-24 00:59:48.000000000 +0000
 +++ config.mk.in
-@@ -861,7 +861,7 @@ MODULERENAME = $(top_builddir)/moduleren
+@@ -921,7 +921,7 @@ MODULERENAME = $(top_builddir)/moduleren
  
  
  # build directories
--INSTALLSUBDIRS = install-src install-bin install-etc install-init install-man install-doc install-license install-pkgconfig
-+INSTALLSUBDIRS = install-src install-bin install-etc install-man install-doc install-license install-pkgconfig
- UNINSTALLSUBDIRS = uninstall-src uninstall-bin uninstall-etc uninstall-init uninstall-man uninstall-doc uninstall-license uninstall-pkgconfig
- 
- ifeq ($(SQLRELAY_ENABLE_SHARED),yes)
+-INSTALLSUBDIRS = install-src install-bin install-etc install-init install-license
++INSTALLSUBDIRS = install-src install-bin install-etc install-license
+ ifeq ($(ENABLE_CPP),yes)
+ INSTALLSUBDIRS += install-pkgconfig
+ endif

databases/sqlrelay/patches/patch-etc_Makefile

@@ -1,24 +1,16 @@
-$NetBSD: patch-etc_Makefile,v 1.2 2015/05/20 13:26:45 ryoon Exp $
+$NetBSD: patch-etc_Makefile,v 1.3 2016/07/01 17:02:39 fhajny Exp $
 
 Install config file examples properly.
---- etc/Makefile.orig	2015-03-16 04:08:11.000000000 +0000
+--- etc/Makefile.orig	2016-01-28 19:28:21.000000000 +0000
 +++ etc/Makefile
-@@ -5,12 +5,12 @@ include ../config.mk
- install:
- 	$(MKINSTALLDIRS) $(sysconfdir)
- 	$(MKINSTALLDIRS) $(sysconfdir)/sqlrelay.conf.d
--	$(CP) sqlrelay.conf.example $(sysconfdir)
--	$(CHMOD) 644 $(sysconfdir)/sqlrelay.conf.example
--	$(CP) sqlrelay.dtd $(sysconfdir)
--	$(CHMOD) 644 $(sysconfdir)/sqlrelay.dtd
--	$(CP) sqlrelay.xsd $(sysconfdir)
--	$(CHMOD) 644 $(sysconfdir)/sqlrelay.xsd
-+	$(CP) sqlrelay.conf.example $(EXAMPLEDIR)
-+	$(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.conf.example
-+	$(CP) sqlrelay.dtd $(EXAMPLEDIR)
-+	$(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.dtd
-+	$(CP) sqlrelay.xsd $(EXAMPLEDIR)
-+	$(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.xsd
- 	$(CP) sqlrelay.conf.example $(EXAMPLEDIR)/sqlrelay.conf
- 	$(CHMOD) 644 $(EXAMPLEDIR)/sqlrelay.conf
+@@ -3,8 +3,8 @@ top_builddir = ..
+ include ../config.mk
  
+ install:
+-	$(MKINSTALLDIRS) $(sysconfdir)/$(SQLRELAY).conf.d
+-	$(CP) sqlrelay.xsd $(sysconfdir)/$(SQLRELAY).xsd
++	$(MKINSTALLDIRS) $(EXAMPLEDIR)/$(SQLRELAY).conf.d
++	$(CP) sqlrelay.xsd $(EXAMPLEDIR)/$(SQLRELAY).xsd
+ 	$(MKINSTALLDIRS) $(EXAMPLEDIR)
+ 	$(CP) sqlrelay.conf $(EXAMPLEDIR)/$(SQLRELAY).conf
+ 	$(CHMOD) 644 $(EXAMPLEDIR)/$(SQLRELAY).conf

databases/sqlrelay/patches/patch-src_api_nodejs_sqlrelay.cpp

@@ -1,24 +0,0 @@
-$NetBSD: patch-src_api_nodejs_sqlrelay.cpp,v 1.1 2015/09/21 17:46:36 fhajny Exp $
-
-Add support for nodejs>=4.0.0.
-
---- src/api/nodejs/sqlrelay.cpp.orig	2015-07-05 02:55:20.000000000 +0000
-+++ src/api/nodejs/sqlrelay.cpp
-@@ -13,7 +13,7 @@ using namespace v8;
- using namespace node;
- 
- // macros to deal with differences between major versions of node.js
--#if NODE_MINOR_VERSION >= 12
-+#if NODE_MAJOR_VERSION >= 4 || ( NODE_MAJOR_VERSION < 1 && NODE_MINOR_VERSION >= 12 )
- 
- 	#define RET void
- 	#define ARGS FunctionCallbackInfo<Value>
-@@ -84,7 +84,7 @@ using namespace node;
- #define toString(arg) ((arg->IsNull())?NULL:*(String::Utf8Value(arg)))
- #define toArray(arg) Handle<Array>::Cast(arg);
- 
--#if NODE_MINOR_VERSION >= 12
-+#if NODE_MAJOR_VERSION >= 4 || ( NODE_MAJOR_VERSION < 1 && NODE_MINOR_VERSION >= 12 )
- 	#define throwWrongNumberOfArguments() isolate->ThrowException(Exception::TypeError(newString("Wrong number of arguments")))
- 	#define throwInvalidArgumentType() isolate->ThrowException(Exception::TypeError(newString("Invalid argument type")))
- #else

databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp

@@ -1,13 +1,23 @@
-$NetBSD: patch-src_api_php_sql__relay.cpp,v 1.3 2015/07/05 12:52:39 joerg Exp $
+$NetBSD: patch-src_api_php_sql__relay.cpp,v 1.4 2016/07/01 17:02:39 fhajny Exp $
 
---- src/api/php/sql_relay.cpp.orig	2015-07-05 10:40:12.000000000 +0000
+--- src/api/php/sql_relay.cpp.orig	2016-03-13 19:20:25.000000000 +0000
 +++ src/api/php/sql_relay.cpp
-@@ -16,29 +16,7 @@
+@@ -24,39 +24,15 @@
  	#define ZTS 1
  #endif
  
 -extern "C" {
 -	#ifndef WIN32
+-
+-		// On some platforms (solaris), stdio.h must be included prior
+-		// to including math.h or FILE will get redefined.
+-		#include <stdio.h>
+-
+-		// php.h ultimately includes math.h and on some platforms,
+-		// __cplusplus to be defined when including it.  Manually
+-		// including it prior to including php.h solves this problem.
+-		#include <math.h>
+-
 -		#ifdef __cplusplus
 -			#undef __cplusplus
 -			#define cpluspluswasdefined
@@ -29,6 +39,14 @@ $NetBSD: patch-src_api_php_sql__relay.cpp,v 1.3 2015/07/05 12:52:39 joerg Exp $
 -		#endif
 -	#endif
 -}
++// On some platforms (solaris), stdio.h must be included prior
++// to including math.h or FILE will get redefined.
++#include <stdio.h>
++
++// php.h ultimately includes math.h and on some platforms,
++// __cplusplus to be defined when including it.  Manually
++// including it prior to including php.h solves this problem.
++#include <math.h>
 +#include <php.h>
  
  #include <config.h>