Upgrade JDB to 1.7.

From the change log:
1.7,  5-Jan-00
- NEW: dbcolize now detects and rejects lines that contain embedded
	copies of the field separator
- NEW: configure tries harder to prevent people from improperly
	configuring/installing jdb
- NEW: tcpdump_to_db converter (incomplete)
- NEW: tabdelim_to_db converter:  from spreadsheet tab-delimited files to db
- BUG FIX:  dbjoin used to produce incorrect output if there
	were extra, unmatched values in the 2nd table.
- BUG FIX:  the sample commands in the usage strings
	now all should explicitly include the source of data
	(typically from "cat foo.jdb |").
- DOCUMENTATION BUG FIX: dbcolmovingstats had incorrect sample output.

1.6, 24-May-99
- NEW: dbsort, dbstats, dbmultistats now run in constant memory
	(using tmp files if necessary)
- NEW: dbcolmovingstats does moving means over a series of data
- NEW: dbcol has a -v option to get all columns except those listed
- NEW: dbmultistats does quartitles and medians
- NEW: dbstripextraheaders now also cleans up bogus comments
	before the fist header
- BUG FIX: dbcolneaten works better with double-space-separated data

5 files changed, 24 insertions, 31 deletions

diff --git a/databases/jdb/Makefile b/databases/jdb/Makefile
index c1e244fd720..bc505a5dd08 100644
--- a/databases/jdb/Makefile
+++ b/databases/jdb/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/05/17 16:58:30 bad Exp $
+# $NetBSD: Makefile,v 1.2 2000/04/27 14:44:27 bad Exp $
 
-DISTNAME=	jdb-1.5
+DISTNAME=	jdb-1.7
 CATEGORIES=	databases
 MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/JDB/
 
@@ -10,6 +10,6 @@ HOMEPAGE=	http://www.isi.edu/~johnh/SOFTWARE/JDB/index.html
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS+=	--with-perl=${LOCALBASE}/bin
+CONFIGURE_ARGS+=	--with-perl=${LOCALBASE}/bin  --datadir=${PREFIX}/share/jdb
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/jdb/files/md5 b/databases/jdb/files/md5
index 91b4f714a2d..15212c5cdea 100644
--- a/databases/jdb/files/md5
+++ b/databases/jdb/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/05/17 16:58:30 bad Exp $
+$NetBSD: md5,v 1.2 2000/04/27 14:44:28 bad Exp $
 
-MD5 (jdb-1.5.tar.gz) = 966d9ec0970ff34d1dfcd78c9e454cd9
+MD5 (jdb-1.7.tar.gz) = d59f6f6c8d0d6e752ebf55f2f9422e65
diff --git a/databases/jdb/files/patch-sum b/databases/jdb/files/patch-sum
index d6fbebdd158..b11f427b139 100644
--- a/databases/jdb/files/patch-sum
+++ b/databases/jdb/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:29 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/04/27 14:44:28 bad Exp $
 
-MD5 (patch-aa) = d2d3e916156836aa4c8aac34a71976df
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/databases/jdb/patches/patch-aa b/databases/jdb/patches/patch-aa
deleted file mode 100644
index 95f00634aab..00000000000
--- a/databases/jdb/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/05/17 16:58:30 bad Exp $
-
---- Makefile.in.orig	Thu Jun 25 18:47:37 1998
-+++ Makefile.in	Mon May 17 17:55:50 1999
-@@ -22,7 +22,7 @@
- 
- # Where should the support files go?
- # LIBDIR=/usr/local/lib/jdb
--LIBDIR=@mydatadir@
-+LIBDIR=@mydatadir@/jdb
- 
- ######################################################################
- # No need to change things below this line.
diff --git a/databases/jdb/pkg/PLIST b/databases/jdb/pkg/PLIST
index ba66708e386..b75d5b4d320 100644
--- a/databases/jdb/pkg/PLIST
+++ b/databases/jdb/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/05/17 16:58:30 bad Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/04/27 14:44:28 bad Exp $
 bin/db2dcliff
 bin/dbcol
 bin/dbcolcreate
@@ -7,6 +7,7 @@ bin/dbcoldiff
 bin/dbcolhisto
 bin/dbcolize
 bin/dbcolmerge
+bin/dbcolmovingstats
 bin/dbcolneaten
 bin/dbcolpercentile
 bin/dbcolrename
@@ -30,15 +31,17 @@ bin/dbstats
 bin/dbstripcomments
 bin/dbstripextraheaders
 bin/dbstripleadingspace
-bin/kitrace_to_db
 bin/dmalloc_to_db
+bin/kitrace_to_db
 bin/ns_to_db
-lib/jdb/README
-lib/jdb/COPYING
-lib/jdb/release
-lib/jdb/round.pl
-lib/jdb/t_distr.pl
-lib/jdb/dblib.pl
-lib/jdb/DbGetopt.pm
-lib/jdb/DbTDistr.pm
-@dirrm lib/jdb
+bin/tabdelim_to_db
+bin/tcpdump_to_db
+share/jdb/README
+share/jdb/COPYING
+share/jdb/release
+share/jdb/round.pl
+share/jdb/t_distr.pl
+share/jdb/dblib.pl
+share/jdb/DbGetopt.pm
+share/jdb/DbTDistr.pm
+@dirrm share/jdb