From 770381534d5558aa28d02fcd7a1c2f56cf3ec9b0 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Wed, 27 Jan 2021 16:54:50 +0000
Subject: [PATCH] database/gdbm: update to 1.19

* Pre-read the memory mapped regions on systems that support it.
* gdbmtool: tagged initialization of structured data
* Bugfix: Preserve locking type during database reorganization

Also fixes building with -fno-common
---
 databases/gdbm/Makefile                      |  8 ++++----
 databases/gdbm/distinfo                      |  4 ++--
 databases/gdbm/patches/patch-src_gdbmconst_h | 14 --------------
 databases/gdbm/pkg/PLIST                     |  5 +++--
 4 files changed, 9 insertions(+), 22 deletions(-)
 delete mode 100644 databases/gdbm/patches/patch-src_gdbmconst_h

diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index 287f027a3d5..e26592dbc44 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.47 2019/07/12 20:43:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.48 2021/01/27 16:54:50 naddy Exp $
 
 COMMENT=		GNU dbm
 
-DISTNAME=		gdbm-1.18.1
+DISTNAME=		gdbm-1.19
 CATEGORIES=		databases
-REVISION=		0
 
-SHARED_LIBS=		gdbm	5.1	# 5.0
+SHARED_LIBS=		gdbm	5.1	# 6.0
 
 HOMEPAGE=		https://www.gnu.org/software/gdbm/
 
@@ -20,5 +19,6 @@ LIB_DEPENDS=		devel/gettext,-runtime
 WANTLIB=		c curses iconv intl readline
 
 CONFIGURE_STYLE= 	gnu
+MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
 
 .include <bsd.port.mk>
diff --git a/databases/gdbm/distinfo b/databases/gdbm/distinfo
index 41f41c11d5f..4644ea3bca7 100644
--- a/databases/gdbm/distinfo
+++ b/databases/gdbm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gdbm-1.18.1.tar.gz) = huYTUn5dulROcyCPQreLfAItT6Wm1UmL8YyNb3Rbkdw=
-SIZE (gdbm-1.18.1.tar.gz) = 941863
+SHA256 (gdbm-1.19.tar.gz) = N+0SIUEiuXLhig2UmVA55XdIGRk573QRWx1B2IETZLw=
+SIZE (gdbm-1.19.tar.gz) = 967861
diff --git a/databases/gdbm/patches/patch-src_gdbmconst_h b/databases/gdbm/patches/patch-src_gdbmconst_h
deleted file mode 100644
index 967dda0b275..00000000000
--- a/databases/gdbm/patches/patch-src_gdbmconst_h
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gdbmconst_h,v 1.1 2019/05/08 15:24:14 jasper Exp $
-
-./gdbmconst.h:58:9: warning: 'SIZE_T_MAX' macro redefined
-
-Index: src/gdbmconst.h
---- src/gdbmconst.h.orig
-+++ src/gdbmconst.h
-@@ -55,4 +55,6 @@
- #define DEFAULT_CACHESIZE  100
- 
- /* Maximum size representable by a size_t variable */
-+#ifndef SIZE_T_MAX
- #define SIZE_T_MAX ((size_t)-1)
-+#endif
diff --git a/databases/gdbm/pkg/PLIST b/databases/gdbm/pkg/PLIST
index cd829a29b09..b859d719c2a 100644
--- a/databases/gdbm/pkg/PLIST
+++ b/databases/gdbm/pkg/PLIST
@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.10 2018/07/09 07:51:32 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.11 2021/01/27 16:54:51 naddy Exp $
 @bin bin/gdbm_dump
 @bin bin/gdbm_load
 @bin bin/gdbmtool
 include/gdbm.h
 @info info/gdbm.info
-lib/libgdbm.a
+@static-lib lib/libgdbm.a
 lib/libgdbm.la
 @lib lib/libgdbm.so.${LIBgdbm_VERSION}
 @man man/man1/gdbm_dump.1
@@ -20,6 +20,7 @@ share/locale/fr/LC_MESSAGES/gdbm.mo
 share/locale/ja/LC_MESSAGES/gdbm.mo
 share/locale/pl/LC_MESSAGES/gdbm.mo
 share/locale/pt_BR/LC_MESSAGES/gdbm.mo
+share/locale/ru/LC_MESSAGES/gdbm.mo
 share/locale/sr/LC_MESSAGES/gdbm.mo
 share/locale/sv/LC_MESSAGES/gdbm.mo
 share/locale/uk/LC_MESSAGES/gdbm.mo