Date: Wed, 12 Feb 2003 15:41:17 -0800 (PST) From: Lars Eggert <larse@isi.edu> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/48219: Update port: databases/jdb bugfixes for perl-5.8 Message-ID: <200302122341.h1CNfHKB008707@nik.isi.edu>
next in thread | raw e-mail | index | archive | help
>Number: 48219 >Category: ports >Synopsis: Update port: databases/jdb bugfixes for perl-5.8 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Feb 12 15:50:08 PST 2003 >Closed-Date: >Last-Modified: >Originator: Lars Eggert >Release: FreeBSD 5.0-CURRENT i386 >Organization: USC/ISI >Environment: System: FreeBSD nik.isi.edu 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Mon Feb 10 18:10:13 PST 2003 root@nik.isi.edu:/usr/obj/usr/src/sys/KERNEL-1.15 i386 >Description: Attached patch addresses some bugs when running jdb under perl-5.8. >How-To-Repeat: >Fix: diff -N -r -u jdb.orig/Makefile jdb/Makefile --- jdb.orig/Makefile Wed Feb 12 15:27:26 2003 +++ jdb/Makefile Wed Feb 12 15:27:41 2003 @@ -7,6 +7,7 @@ PORTNAME= jdb PORTVERSION= 1.12 +PORTREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= http://www.isi.edu/~johnh/SOFTWARE/JDB/ diff -N -r -u jdb.orig/files/patch-aa jdb/files/patch-aa --- jdb.orig/files/patch-aa Wed Dec 31 16:00:00 1969 +++ jdb/files/patch-aa Wed Feb 12 15:34:10 2003 @@ -0,0 +1,11 @@ +--- d Wed Feb 12 15:33:25 2003 ++++ dblib.pl Wed Feb 12 15:33:39 2003 +@@ -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) { diff -N -r -u jdb.orig/files/patch-ab jdb/files/patch-ab --- jdb.orig/files/patch-ab Wed Dec 31 16:00:00 1969 +++ jdb/files/patch-ab Wed Feb 12 15:35:00 2003 @@ -0,0 +1,91 @@ +--- dbcolmultiscale.O Wed Feb 12 15:15:35 2003 ++++ dbcolmultiscale Wed Feb 12 15:15:50 2003 +@@ -127,7 +127,6 @@ + push(@INC, $dblibdir); + } + use DbGetopt; +-use FileCache; + require "$dblibdir/dblib.pl"; + + @orig_argv = @ARGV; +--- dbmultistats.O Wed Feb 12 15:08:07 2003 ++++ dbmultistats Wed Feb 12 15:09:28 2003 +@@ -57,7 +57,6 @@ + push(@INC, $dblibdir); + } + use DbGetopt; +-use FileCache; + require "$dblibdir/dblib.pl"; + + @orig_argv = @ARGV; +@@ -112,13 +111,13 @@ + # open a new file + $path = $tag_files{$tag} = &db_tmpfile(TMP); + close(TMP); +- cacheout $path; +- print $path "$col_headertag data\n"; ++ open PATH, ">>$path"; ++ print PATH "$col_headertag data\n"; + $tag_counts{$tag} = 1; + }; + $path = $tag_files{$tag}; +- cacheout $path; +- print $path "$val\n"; ++ open PATH, ">>$path"; ++ print PATH "$val\n"; + }; + + @dbstats_args = ("$dbbindir/dbstats"); +@@ -131,8 +130,7 @@ + foreach $tag (sort keys %tag_files) { + # close it + $path = $tag_files{$tag}; +- cacheout $path; +- close($path); ++ close(PATH); + + open(FROMMEAN, join(" ", @dbstats_args) . " <$tag_files{$tag} |") || die "$prog: cannot run dbstats.\n"; + @meanout = <FROMMEAN>; +--- dbrowsplituniq.O Wed Feb 12 15:10:08 2003 ++++ dbrowsplituniq Wed Feb 12 15:14:43 2003 +@@ -77,7 +77,6 @@ + require "$dblibdir/dblib.pl"; + use DbGetopt; + use English; +-use FileCache; + + @orig_argv = @ARGV; + my($prog) = &progname; +@@ -130,8 +129,8 @@ + my($path) = $prefix . $index . ".jdb"; + $index++; + $keys_to_paths{$key} = $path; +- cacheout $path; +- write_header_fh_tag($path, $col_headertag); ++ open $fh, ">>$path"; ++ write_header_fh_tag($fh, $col_headertag); + return $path; + } + +@@ -141,15 +140,15 @@ + &split_cols; + ] . $code . q[ + my($path) = &key_to_path($key); +- cacheout $path; +- write_these_cols_fh($path, @f); ++ open $fh, ">>$path"; ++ write_these_cols_fh($fh, @f); + }; + # cleanup + foreach (values %keys_to_paths) { +- cacheout $_; +- delayed_write_comments($_); +- print $_ "# | $prog ", join(" ", @orig_argv), "\n"; +- close $_; ++ open $fh, ">>$_"; ++ delayed_write_comments($fh); ++ print $fh "# | $prog ", join(" ", @orig_argv), "\n"; ++ close $fh; + }; + ]; + print $loop if ($debug); >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302122341.h1CNfHKB008707>