From f23df914759e556876b5242f6b746ad0bad53fba Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 22 May 2016 17:24:32 +0000 Subject: Version 1.12, 2016-05-16 * New configuration variable COMPATINCLUDEDIR When used with --enable-libgdbm-compat, this variable points to the directory where the headers file dbm.h and ndbm.h will be installed. Use this variable to avoid conflicts with already installed headers. E.g.: ./configure --enable-libgdbm-compat COMPATINCLUDEDIR=/usr/include/gdbm --- databases/gdbm/Makefile.common | 4 ++-- databases/gdbm/distinfo | 16 +++++----------- databases/gdbm/patches/patch-src_gdbmtool.c | 15 --------------- databases/gdbm/patches/patch-src_gdbmtool.h | 15 --------------- databases/gdbm/patches/patch-tests_create00.at | 15 --------------- databases/gdbm/patches/patch-tests_dbmcreate00.at | 15 --------------- databases/gdbm/patches/patch-tests_dbmdel00.at | 15 --------------- databases/gdbm/patches/patch-tests_delete00.at | 15 --------------- 8 files changed, 7 insertions(+), 103 deletions(-) delete mode 100644 databases/gdbm/patches/patch-src_gdbmtool.c delete mode 100644 databases/gdbm/patches/patch-src_gdbmtool.h delete mode 100644 databases/gdbm/patches/patch-tests_create00.at delete mode 100644 databases/gdbm/patches/patch-tests_dbmcreate00.at delete mode 100644 databases/gdbm/patches/patch-tests_dbmdel00.at delete mode 100644 databases/gdbm/patches/patch-tests_delete00.at diff --git a/databases/gdbm/Makefile.common b/databases/gdbm/Makefile.common index 0a64aec8942..cedcab23159 100644 --- a/databases/gdbm/Makefile.common +++ b/databases/gdbm/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.3 2014/05/23 20:49:15 wiz Exp $ +# $NetBSD: Makefile.common,v 1.4 2016/05/22 17:24:32 wiz Exp $ # # used by databases/gdbm/Makefile # used by databases/gdbm_compat/Makefile -DISTNAME= gdbm-1.11 +DISTNAME= gdbm-1.12 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_GNU:=gdbm/} diff --git a/databases/gdbm/distinfo b/databases/gdbm/distinfo index 24d904e5aec..8ebaced4eea 100644 --- a/databases/gdbm/distinfo +++ b/databases/gdbm/distinfo @@ -1,12 +1,6 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 01:56:11 agc Exp $ +$NetBSD: distinfo,v 1.11 2016/05/22 17:24:32 wiz Exp $ -SHA1 (gdbm-1.11.tar.gz) = ce433d0f192c21d41089458ca5c8294efe9806b4 -RMD160 (gdbm-1.11.tar.gz) = f3d38a31ed509fdbfe52674e55585c2e570938c5 -SHA512 (gdbm-1.11.tar.gz) = 272fb65ab9ca0a21e9f0dcfb2c638457e87cbb938c65ee850123474d11f2858496f84d3fa9edca27cd91c7220160cfdb59f90bd46ddc45395514addc9fd4151c -Size (gdbm-1.11.tar.gz) = 811662 bytes -SHA1 (patch-src_gdbmtool.c) = 3f96f09d42dc4942b55da698d4853a3f175e6a44 -SHA1 (patch-src_gdbmtool.h) = 0301c08bbf66a3c4249bf32666f04a355803247b -SHA1 (patch-tests_create00.at) = 2ce3d6ebac588b25699a6f38b298d4fb63965714 -SHA1 (patch-tests_dbmcreate00.at) = 5d5030b9ff6b9f5a4141abec82a066afba5c557f -SHA1 (patch-tests_dbmdel00.at) = 3a472a1b0b45e315823dc5a505ddd656f2d8c469 -SHA1 (patch-tests_delete00.at) = 6ba7832eaf118d9b7380b0459ddcf786d497f431 +SHA1 (gdbm-1.12.tar.gz) = 86513e8871bb376bc014e9e5a2d18a8e0a8ea2f5 +RMD160 (gdbm-1.12.tar.gz) = 5f47e6adfec14b31c3e26c1027684ba4845eef8a +SHA512 (gdbm-1.12.tar.gz) = 25e03dceed6986f1977d304a5ad059ac6c603a88ad4aa18c831ec42df82d68006f2e04b8a3cc400d0a4970750c78ba24a3f84cdff70de9f278cfd854c059699e +Size (gdbm-1.12.tar.gz) = 841213 bytes diff --git a/databases/gdbm/patches/patch-src_gdbmtool.c b/databases/gdbm/patches/patch-src_gdbmtool.c deleted file mode 100644 index f83a27bb540..00000000000 --- a/databases/gdbm/patches/patch-src_gdbmtool.c +++ /dev/null @@ -1,15 +0,0 @@ -$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 deleted file mode 100644 index e20386910b4..00000000000 --- a/databases/gdbm/patches/patch-src_gdbmtool.h +++ /dev/null @@ -1,15 +0,0 @@ -$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 deleted file mode 100644 index f9b27e61d3e..00000000000 --- a/databases/gdbm/patches/patch-tests_create00.at +++ /dev/null @@ -1,15 +0,0 @@ -$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 deleted file mode 100644 index ef7ec27644a..00000000000 --- a/databases/gdbm/patches/patch-tests_dbmcreate00.at +++ /dev/null @@ -1,15 +0,0 @@ -$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 deleted file mode 100644 index 54ac820fa30..00000000000 --- a/databases/gdbm/patches/patch-tests_dbmdel00.at +++ /dev/null @@ -1,15 +0,0 @@ -$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 deleted file mode 100644 index bf08743f603..00000000000 --- a/databases/gdbm/patches/patch-tests_delete00.at +++ /dev/null @@ -1,15 +0,0 @@ -$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 -- cgit v1.2.3