Add patches needed for gdbm-1.11.

6 files changed, 90 insertions, 0 deletions

diff --git a/databases/gdbm/patches/patch-src_gdbmtool.c b/databases/gdbm/patches/patch-src_gdbmtool.c
new file mode 100644
index 00000000000..f83a27bb540
--- /dev/null
+++ b/databases/gdbm/patches/patch-src_gdbmtool.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gdbmtool.c,v 1.1 2014/05/23 20:49:37 wiz Exp $
+
+Avoid conflict with sys/syslimits.h.
+
+--- src/gdbmtool.c.orig	2013-05-21 19:48:31.000000000 +0000
++++ src/gdbmtool.c
+@@ -1347,7 +1347,7 @@ coerce_s2d (struct gdbmarg *arg, struct 
+ 
+ #define coerce_fail NULL
+ 
+-coerce_type_t coerce_tab[ARG_MAX][ARG_MAX] = {
++coerce_type_t coerce_tab[GDBM_ARG_MAX][GDBM_ARG_MAX] = {
+   /*             s            d            k */
+   /* s */  { coerce_ref,  coerce_fail, coerce_fail },
+   /* d */  { coerce_s2d,  coerce_ref,  coerce_k2d }, 
diff --git a/databases/gdbm/patches/patch-src_gdbmtool.h b/databases/gdbm/patches/patch-src_gdbmtool.h
new file mode 100644
index 00000000000..e20386910b4
--- /dev/null
+++ b/databases/gdbm/patches/patch-src_gdbmtool.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gdbmtool.h,v 1.1 2014/05/23 20:49:37 wiz Exp $
+
+Avoid conflict with sys/syslimits.h.
+
+--- src/gdbmtool.h.orig	2013-05-15 15:32:42.000000000 +0000
++++ src/gdbmtool.h
+@@ -138,7 +138,7 @@ struct kvpair *kvpair_list (struct locus
+ #define ARG_STRING 0
+ #define ARG_DATUM  1
+ #define ARG_KVPAIR 2
+-#define ARG_MAX    3
++#define GDBM_ARG_MAX    3
+ 
+ /* Argument to a command handler */
+ struct gdbmarg
diff --git a/databases/gdbm/patches/patch-tests_create00.at b/databases/gdbm/patches/patch-tests_create00.at
new file mode 100644
index 00000000000..f9b27e61d3e
--- /dev/null
+++ b/databases/gdbm/patches/patch-tests_create00.at
@@ -0,0 +1,15 @@
+$NetBSD: patch-tests_create00.at,v 1.1 2014/05/23 20:49:37 wiz Exp $
+
+Fix unportable sort syntax.
+
+--- tests/create00.at.orig	2012-03-21 17:14:03.000000000 +0000
++++ tests/create00.at
+@@ -21,7 +21,7 @@ AT_CHECK([
+ AT_SORT_PREREQ
+ num2word 1:1000 > input
+ gtload test.db < input
+-gtdump test.db | sort -k1,2 -n > output
++gtdump test.db | sort -n -k1,2 > output
+ cmp -s input output || diff -u input output
+ ])
+ 
diff --git a/databases/gdbm/patches/patch-tests_dbmcreate00.at b/databases/gdbm/patches/patch-tests_dbmcreate00.at
new file mode 100644
index 00000000000..ef7ec27644a
--- /dev/null
+++ b/databases/gdbm/patches/patch-tests_dbmcreate00.at
@@ -0,0 +1,15 @@
+$NetBSD: patch-tests_dbmcreate00.at,v 1.1 2014/05/23 20:49:37 wiz Exp $
+
+Fix unportable sort syntax.
+
+--- tests/dbmcreate00.at.orig	2012-03-21 17:14:03.000000000 +0000
++++ tests/dbmcreate00.at
+@@ -22,7 +22,7 @@ AT_COMPAT_PREREQ
+ AT_SORT_PREREQ
+ num2word 1:1000 > input
+ dtload test < input
+-dtdump test | sort -k1,2 -n > output
++dtdump test | sort -n -k1,2 > output
+ cmp -s input output || diff -u input output
+ ])
+ 
diff --git a/databases/gdbm/patches/patch-tests_dbmdel00.at b/databases/gdbm/patches/patch-tests_dbmdel00.at
new file mode 100644
index 00000000000..54ac820fa30
--- /dev/null
+++ b/databases/gdbm/patches/patch-tests_dbmdel00.at
@@ -0,0 +1,15 @@
+$NetBSD: patch-tests_dbmdel00.at,v 1.1 2014/05/23 20:49:37 wiz Exp $
+
+Fix unportable sort syntax.
+
+--- tests/dbmdel00.at.orig	2011-08-08 09:21:17.000000000 +0000
++++ tests/dbmdel00.at
+@@ -22,7 +22,7 @@ AT_COMPAT_PREREQ
+ AT_SORT_PREREQ
+ num2word 1:10 | dtload test
+ dtdel test 8
+-dtdump test | sort -k1,2 -n
++dtdump test | sort -n -k1,2
+ ],
+ [0],
+ [1	one
diff --git a/databases/gdbm/patches/patch-tests_delete00.at b/databases/gdbm/patches/patch-tests_delete00.at
new file mode 100644
index 00000000000..bf08743f603
--- /dev/null
+++ b/databases/gdbm/patches/patch-tests_delete00.at
@@ -0,0 +1,15 @@
+$NetBSD: patch-tests_delete00.at,v 1.1 2014/05/23 20:49:37 wiz Exp $
+
+Fix unportable sort syntax.
+
+--- tests/delete00.at.orig	2011-08-05 11:30:47.000000000 +0000
++++ tests/delete00.at
+@@ -21,7 +21,7 @@ AT_CHECK([
+ AT_SORT_PREREQ
+ num2word 1:10 | gtload test.db
+ gtdel test.db 8
+-gtdump test.db | sort -k1,2 -n
++gtdump test.db | sort -n -k1,2
+ ],
+ [0],
+ [1	one