CVS commit: pkgsrc/databases/slony1

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Feb 24 22:07:34 UTC 2017

Modified Files:
        pkgsrc/databases/slony1: distinfo
Added Files:
        pkgsrc/databases/slony1/patches: patch-config.h.in patch-configure
            patch-src_slonik_slonik.c patch-tools_start__slon.sh
Removed Files:
        pkgsrc/databases/slony1/patches: patch-aa patch-ab

Log Message:
Fix building on systems where alloca.h does not exists, like NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/databases/slony1/distinfo
cvs rdiff -u -r1.6 -r0 pkgsrc/databases/slony1/patches/patch-aa
cvs rdiff -u -r1.3 -r0 pkgsrc/databases/slony1/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/databases/slony1/patches/patch-config.h.in \
    pkgsrc/databases/slony1/patches/patch-configure \
    pkgsrc/databases/slony1/patches/patch-src_slonik_slonik.c \
    pkgsrc/databases/slony1/patches/patch-tools_start__slon.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/slony1/distinfo
diff -u pkgsrc/databases/slony1/distinfo:1.18 pkgsrc/databases/slony1/distinfo:1.19
--- pkgsrc/databases/slony1/distinfo:1.18       Sun Jan  1 15:17:03 2017
+++ pkgsrc/databases/slony1/distinfo    Fri Feb 24 22:07:34 2017
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.18 2017/01/01 15:17:03 adam Exp $
+$NetBSD: distinfo,v 1.19 2017/02/24 22:07:34 adam Exp $
 
 SHA1 (slony1-2.2.5.tar.bz2) = 2d44227509f94b93e2f26261fabc5481a367b862
 RMD160 (slony1-2.2.5.tar.bz2) = 0a36003db4fcd4faa21054eb8e02d8771152d588
 SHA512 (slony1-2.2.5.tar.bz2) = 06c5d8c136b1560aa6a3b1b7bfbad09fb6bbff7e3c530ceaf0279d4564dd1518c69647368deac9eb19ea5059a2d78fef26f62bd34315f5f3415ca0f5cb0992aa
 Size (slony1-2.2.5.tar.bz2) = 1466439 bytes
-SHA1 (patch-aa) = 4d384c712e1ba42564eb13ef6a3d08b7360e2298
-SHA1 (patch-ab) = 8937bed61506b48fb15ba76ea30dcd06aa6bd760
+SHA1 (patch-config.h.in) = 7348475c942c06d8d668f8b1a5d4fc4a03189017
+SHA1 (patch-configure) = 67eba0a1a45ef1f68a5a62627deb9e68f967b012
+SHA1 (patch-src_slonik_slonik.c) = 301e6a401b9f0158e3c6f471d294dbd910f8897b
+SHA1 (patch-tools_start__slon.sh) = 449e381de530cd9485e48e780cab0990d9fef6f4

Added files:

Index: pkgsrc/databases/slony1/patches/patch-config.h.in
diff -u /dev/null pkgsrc/databases/slony1/patches/patch-config.h.in:1.1
--- /dev/null   Fri Feb 24 22:07:34 2017
+++ pkgsrc/databases/slony1/patches/patch-config.h.in   Fri Feb 24 22:07:34 2017
@@ -0,0 +1,13 @@
+$NetBSD: patch-config.h.in,v 1.1 2017/02/24 22:07:34 adam Exp $
+
+Define HAVE_ALLOCA_H.
+
+--- config.h.in.orig   2017-02-24 21:58:27.000000000 +0000
++++ config.h.in
+@@ -79,4 +79,6 @@
+ 
+ #undef HAS_LOOKUPEXPLICITNAMESPACE_2
+ 
++#undef HAVE_ALLOCA_H
++
+ #endif /* SLONY_I_CONFIG_H */
Index: pkgsrc/databases/slony1/patches/patch-configure
diff -u /dev/null pkgsrc/databases/slony1/patches/patch-configure:1.1
--- /dev/null   Fri Feb 24 22:07:34 2017
+++ pkgsrc/databases/slony1/patches/patch-configure     Fri Feb 24 22:07:34 2017
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.1 2017/02/24 22:07:34 adam Exp $
+
+Add DragonFly support.
+Detect presence of alloca.h.
+
+--- configure.orig     2016-05-31 01:56:39.000000000 +0000
++++ configure
+@@ -2409,6 +2409,7 @@ case $host_os in
+   darwin*) template=darwin ;;
+     dgux*) template=dgux ;;
+  freebsd*) template=freebsd ;;
++ dragonfly*) template=dragonfly ;;
+     hpux*) template=hpux ;;
+     irix*) template=irix ;;
+    linux*|gnu*|k*bsd*-gnu)
+@@ -4311,7 +4312,7 @@ fi
+ 
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+-                inttypes.h stdint.h unistd.h
++                inttypes.h stdint.h unistd.h alloca.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
Index: pkgsrc/databases/slony1/patches/patch-src_slonik_slonik.c
diff -u /dev/null pkgsrc/databases/slony1/patches/patch-src_slonik_slonik.c:1.1
--- /dev/null   Fri Feb 24 22:07:34 2017
+++ pkgsrc/databases/slony1/patches/patch-src_slonik_slonik.c   Fri Feb 24 22:07:34 2017
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_slonik_slonik.c,v 1.1 2017/02/24 22:07:34 adam Exp $
+
+Include alloca.h only when it has been detected.
+
+--- src/slonik/slonik.c.orig   2017-02-24 21:59:57.000000000 +0000
++++ src/slonik/slonik.c
+@@ -22,7 +22,6 @@
+ #include <ctype.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+-#include <alloca.h>
+ #else
+ #include <winsock2.h>
+ #include <windows.h>
+@@ -44,6 +43,9 @@
+ #include "../parsestatements/scanner.h"
+ extern int    STMTS[MAXSTATEMENTS];
+ 
++#ifdef HAVE_ALLOCA_H
++#include <alloca.h>
++#endif
+ 
+ #ifdef HAVE_PGPORT
+ #undef USE_REPL_SNPRINTF
Index: pkgsrc/databases/slony1/patches/patch-tools_start__slon.sh
diff -u /dev/null pkgsrc/databases/slony1/patches/patch-tools_start__slon.sh:1.1
--- /dev/null   Fri Feb 24 22:07:34 2017
+++ pkgsrc/databases/slony1/patches/patch-tools_start__slon.sh  Fri Feb 24 22:07:34 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_start__slon.sh,v 1.1 2017/02/24 22:07:34 adam Exp $
+
+Portability fix.
+
+--- tools/start_slon.sh.orig   2011-10-11 20:20:52.000000000 +0000
++++ tools/start_slon.sh
+@@ -16,7 +16,7 @@ test -r "$SLON_CONF" || (echo "No slon c
+ 
+ PID_LINE=`grep pid_file $SLON_CONF | cut -d "#" -f 1 | grep "^[[:space:]]*pid_file='.*'"`
+ PID_FILE=`echo $PID_LINE | cut -d "=" -f 2 | cut -d "'" -f 2`
+-if [ "x$PID_FILE" == "x" ]; then
++if [ "x$PID_FILE" = "x" ]; then
+     echo "pid_file not found in slon conf file - $SLON_CONF"
+     exit 1
+ else