Import of pkgsrc-2016Q3

databases/pgpool2/patches/patch-configure

@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2016/03/11 21:30:55 fhajny Exp $
+
+Pick a better name for the package.
+
+--- configure.orig	2016-02-10 08:53:31.000000000 +0000
++++ configure
+@@ -3979,7 +3979,7 @@ fi
+ 
+ 
+ # Define the identity of the package.
+- PACKAGE='pgpool-II'
++ PACKAGE='pgpool2'
+  VERSION='3.5.0'
+ 
+ 

databases/pgpool2/patches/patch-src_include_pool.h

@@ -0,0 +1,15 @@
+$NetBSD: patch-src_include_pool.h,v 1.1 2016/03/11 21:30:55 fhajny Exp $
+
+Default pid file location.
+
+--- src/include/pool.h.orig	2016-02-20 00:28:07.000000000 +0200
++++ src/include/pool.h		2016-02-20 00:29:09.000000000 +0200
+@@ -81,7 +81,7 @@
+ #define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
+ 
+ /* pid file name */
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
++#define DEFAULT_PID_FILE_NAME "@PGPOOL_PIDDIR@/pgpool.pid"
+ 
+ /* status file name */
+ #define STATUS_FILE_NAME "pgpool_status"

databases/pgpool2/patches/patch-src_sample_pgpool.conf.sample

@@ -0,0 +1,28 @@
+$NetBSD: patch-src_sample_pgpool.conf.sample,v 1.1 2016/03/11 21:30:55 fhajny Exp $
+
+Default pid file location.
+
+--- src/sample/pgpool.conf.sample.orig	2015-04-08 07:58:44.000000000 +0000
++++ src/sample/pgpool.conf.sample
+@@ -211,10 +211,10 @@ debug_level = 0
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+ 
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '@PGPOOL_PIDDIR@/pgpool.pid'
+                                    # PID file name
+                                    # (change requires restart)
+-logdir = '/var/log/pgpool'
++logdir = '@PGPOOL_LOGDIR@'
+                                    # Directory of pgPool status file
+                                    # (change requires restart)
+ 
+@@ -682,7 +682,7 @@ memqcache_cache_block_size = 1048576
+ 								   # Cache block size in bytes. Mandatory if memqcache_method = 'shmem'.
+ 								   # Defaults to 1MB.
+                                    # (change requires restart)
+-memqcache_oiddir = '/var/log/pgpool/oiddir'
++memqcache_oiddir = '@PGPOOL_LOGDIR@/oiddir'
+ 				   				   # Temporary work directory to record table oids
+                                    # (change requires restart)
+ white_memqcache_table_list = ''

databases/pgpool2/patches/patch-src_watchdog_wd__escalation.c

@@ -0,0 +1,16 @@
+$NetBSD: patch-src_watchdog_wd__escalation.c,v 1.1 2016/03/11 21:30:55 fhajny Exp $
+
+Add sys/wait.h unconditionally, same as other source files.
+
+--- src/watchdog/wd_escalation.c.orig	2016-02-10 08:53:31.000000000 +0000
++++ src/watchdog/wd_escalation.c
+@@ -27,9 +27,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ 
+-#ifdef __FreeBSD__
+ #include <sys/wait.h>
+-#endif
+ 
+ #include "pool.h"
+ #include "utils/elog.h"