Update jdb to 1.12 plus the patch for the problem with trailing spaces in

dbstats from Heidemann's web page.

Changes since 1.7 apart from bugfixes:

1.12,  30-Oct-02

- NEW: dbcolmultiscale
- NEW: dbcol has -r option for "relaxed error checking"
- NEW: dbcolneaten has new -e option to strip end-of-line spaces
- NEW: dbrow finally has a -v option to negate the test
- NEW: db_to_html_table: simple conversion to html tables
- NEW: dblib now has a function dblib_text2html() that will

1.11,  2-Nov-01

- NEW: dbcolneaten now supports "field specifiers" that
	allow some control over how wide columns should be
- OPTIMIZATION: dbsort now tries hard to be filesystem cache-friendly

1.10, 10-Apr-01

- NEW: dbstats now includes a -S option to optimize work on
	pre-sorted data (inspired by code contributed by Haobo Yu)

1.9,  6-Nov-00

- NEW: dbfilesplit, split a single input file into multiple output files.

1.8, 28-Jun-00

- NEW:  dbrowuniq now optionally checks for uniqueness only on certain fields
- NEW: dbrowsplituniq makes one pass through a file and splits it into
	separate files based on the given fields
- NEW:  converter for "crl" format network traces
- NEW:  anywhere you use arbitrary code (like dbroweval),
	_last_foo now maps to the last row's value for field _foo.
- OPTIMIZATION: comment processing slightly changed so that
	dbmultistats now is much faster on files with lots of comments.

5 files changed, 49 insertions, 20 deletions

diff --git a/databases/jdb/DESCR b/databases/jdb/DESCR
index 6bef375360b..f977254b3ae 100644
--- a/databases/jdb/DESCR
+++ b/databases/jdb/DESCR
@@ -1,10 +1,12 @@
-JDB is a package of commands for manipulating flat-ASCII databases from
-shell scripts.  JDB is useful to process medium amounts of data.  JDB is
-very good at doing things like:
+JDB is package of commands for manipulating flat-ASCII databases from
+shell scripts.  JDB is useful to process medium amounts of data (with
+very little data you'd do it by hand, with megabytes you might want a
+real database).  JDB is very good at doing things like:
 
- * extracting measurements from experimental output
- * re-examining data to address different hypotheses
- * joining data from different experiments
- * computing statistics on data (mean, confidence intervals, histograms,
-   correlations)
- * reformatting data for graphing programs
+	- extracting measurements from experimental output
+	- re-examining data to address different hypotheses
+        - joining data from different experiments
+	- eliminating/detecting outliers
+	- computing statistics on data (mean, confidence intervals,
+		correlations, histograms)
+	- reformatting data for graphing programs
diff --git a/databases/jdb/Makefile b/databases/jdb/Makefile
index bfcc6e7e9d9..a8f5b7b97a7 100644
--- a/databases/jdb/Makefile
+++ b/databases/jdb/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:39:05 martti Exp $
+# $NetBSD: Makefile,v 1.8 2003/12/15 20:18:33 bad Exp $
 
-DISTNAME=	jdb-1.7
+DISTNAME=	jdb-1.12
 CATEGORIES=	databases
 MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/JDB/
 
diff --git a/databases/jdb/PLIST b/databases/jdb/PLIST
index 52f556b03e4..99915f81b64 100644
--- a/databases/jdb/PLIST
+++ b/databases/jdb/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:11:48 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/12/15 20:18:33 bad Exp $
+bin/crl_to_db
 bin/db2dcliff
+bin/db_to_html_table
 bin/dbcol
 bin/dbcolcreate
 bin/dbcoldefine
@@ -8,6 +10,7 @@ bin/dbcolhisto
 bin/dbcolize
 bin/dbcolmerge
 bin/dbcolmovingstats
+bin/dbcolmultiscale
 bin/dbcolneaten
 bin/dbcolpercentile
 bin/dbcolrename
@@ -15,6 +18,7 @@ bin/dbcolscorrelate
 bin/dbcolsplit
 bin/dbcolstats
 bin/dbcoltighten
+bin/dbfilesplit
 bin/dbformmail
 bin/dbjoin
 bin/dblistize
@@ -25,6 +29,7 @@ bin/dbrowaccumulate
 bin/dbrowdiff
 bin/dbrowenumerate
 bin/dbroweval
+bin/dbrowsplituniq
 bin/dbrowuniq
 bin/dbsort
 bin/dbstats
@@ -32,16 +37,15 @@ bin/dbstripcomments
 bin/dbstripextraheaders
 bin/dbstripleadingspace
 bin/dmalloc_to_db
+bin/ipchain_logs_to_db
 bin/kitrace_to_db
 bin/ns_to_db
 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/README
 share/jdb/DbGetopt.pm
 share/jdb/DbTDistr.pm
+share/jdb/dblib.pl
+share/jdb/release
 @dirrm share/jdb
diff --git a/databases/jdb/distinfo b/databases/jdb/distinfo
index 4d907c1a3e0..86441afe786 100644
--- a/databases/jdb/distinfo
+++ b/databases/jdb/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:10:58 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/12/15 20:18:33 bad Exp $
 
-SHA1 (jdb-1.7.tar.gz) = 8c3e45ced221f0337f205cc5dec071ecf80ce176
-Size (jdb-1.7.tar.gz) = 109011 bytes
+SHA1 (jdb-1.12.tar.gz) = 63dd7a5f700628734a8316612d86c9a9b5f0e787
+Size (jdb-1.12.tar.gz) = 141134 bytes
+SHA1 (patch-aa) = 1b0726a8b8b7b2295bc5e7f30e153d2a56d99dcf
diff --git a/databases/jdb/patches/patch-aa b/databases/jdb/patches/patch-aa
new file mode 100644
index 00000000000..f3a9b695433
--- /dev/null
+++ b/databases/jdb/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.3 2003/12/15 20:18:33 bad Exp $
+
+--- dblib.pl.orig	Mon Oct 28 23:46:40 2002
++++ dblib.pl	Mon Dec 15 21:04:54 2003
+@@ -2,7 +2,7 @@
+ 
+ #
+ # dblib.pl
+-# Copyright (C) 1991-1998 by John Heidemann <johnh@isi.edu>
++# Copyright (C) 1991-2002 by John Heidemann <johnh@isi.edu>
+ # $Id: patch-aa,v 1.3 2003/12/15 20:18:33 bad Exp $
+ #
+ # This program is distributed under terms of the GNU general
+@@ -330,7 +330,7 @@
+ 
+ sub force_numeric {
+     my($value, $ignore_non_numeric) = @_;
+-    if ($value =~ /^[-+]?[0-9]+(.[0-9]+)?(e[-+0-9]+)?$/) {
++    if ($value =~ /^\s*[-+]?[0-9]+(.[0-9]+)?(e[-+0-9]+)?\s*$/) {
+         return $value + 0.0;   # force numeric
+     } else {
+ 	if ($ignore_non_numeric) {