Import of pkgsrc-2015Q1

databases/gdbm/Makefile

@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2013/04/08 11:17:10 rodent Exp $
+# $NetBSD: Makefile,v 1.51 2014/10/09 14:06:05 wiz Exp $
 
 .include "Makefile.common"
 
 COMMENT=	The GNU database manager
-PKGREVISION=	3
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 INFO_FILES=		yes
 MAKE_JOBS_SAFE=		no

databases/gdbm/Makefile.common

@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.2 2012/01/08 09:22:52 adam Exp $
+# $NetBSD: Makefile.common,v 1.3 2014/05/23 20:49:15 wiz Exp $
 #
 # used by databases/gdbm/Makefile
 # used by databases/gdbm_compat/Makefile
 
-DISTNAME=	gdbm-1.10
+DISTNAME=	gdbm-1.11
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GNU:=gdbm/}
 

databases/gdbm/PLIST

@@ -1,11 +1,21 @@
-@comment $NetBSD: PLIST,v 1.11 2012/01/24 02:44:30 sbd Exp $
-bin/testgdbm
+@comment $NetBSD: PLIST,v 1.12 2014/05/23 20:49:15 wiz Exp $
+bin/gdbm_dump
+bin/gdbm_load
+bin/gdbmtool
 include/gdbm.h
 info/gdbm.info
 lib/libgdbm.la
+man/man1/gdbm_dump.1
+man/man1/gdbm_load.1
+man/man1/gdbmtool.1
 man/man3/gdbm.3
 share/locale/de/LC_MESSAGES/gdbm.mo
+share/locale/eo/LC_MESSAGES/gdbm.mo
 share/locale/fi/LC_MESSAGES/gdbm.mo
+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/sr/LC_MESSAGES/gdbm.mo
 share/locale/uk/LC_MESSAGES/gdbm.mo
+share/locale/vi/LC_MESSAGES/gdbm.mo

databases/gdbm/distinfo

@@ -1,5 +1,11 @@
-$NetBSD: distinfo,v 1.8 2012/01/08 09:22:52 adam Exp $
+$NetBSD: distinfo,v 1.9 2014/05/23 20:49:15 wiz Exp $
 
-SHA1 (gdbm-1.10.tar.gz) = 441201e9145f590ba613f8a1e952455d620e0860
-RMD160 (gdbm-1.10.tar.gz) = 32207388952acc2e9123fd1fd1f8880031cfb8d6
-Size (gdbm-1.10.tar.gz) = 655599 bytes
+SHA1 (gdbm-1.11.tar.gz) = ce433d0f192c21d41089458ca5c8294efe9806b4
+RMD160 (gdbm-1.11.tar.gz) = f3d38a31ed509fdbfe52674e55585c2e570938c5
+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

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 }, 

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

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
+ ])
+ 

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
+ ])
+ 

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

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