Updated to version 1.814.

Pkgsrc changes:
  - Tests 148-149 in t/db-btree.t were confused by the fact that
    DB_File seemed to run in compatibility mode ($DB_File::db_185_compat is 1),
    although db1 was used. Thus, we enable this mode only for db2/db3/db4.
  - Patch-aa for Makefile.pl now initialises VER_INFO to avoid a warning.
  - Tested with db1-db4 on NetBSD and db2-db4 on Solaris.

Changes since version 1.806:
=====================================
1.814 11 November 2005
   * Fix from Dominic Dunlop to tidy up an OS-X specific warning in
     db-btree.t.
   * Silenced a warning about $DB_File::Error only being used once.
     Issue spotted by Dominic Dunlop.
1.813 31st October 2005
   * Updates for Berkeley DB 4.4
1.812 9th October 2005
   * Added libscan to Makefile.PL
   * Fixed test failing under windows
1.811 12th March 2005
   * Fixed DBM filter bug in seq
1.810 7th August 2004
   * Fixed db-hash.t for Cygwin
   * Added substr tests to db-hast.t
   * Documented AIX build problem in README.
1.809 20th June 2004
   * Merged core patch 22258
   * Merged core patch 22741
   * Fixed core bug 30237.
     Using substr to pass parameters to the low-level Berkeley DB interface
     causes problems with Perl 5.8.1 or better.
     typemap fix supplied by Marcus Holland-Moritz.
1.808 22nd December 2003
   * Added extra DBM Filter tests.
   * Fixed a memory leak in ParseOpenInfo, which whould occur if the
     opening of the database failed. Leak spotted by Adrian Enache.
1.807 1st November 2003
   * Fixed minor typos on pod documetation - reported by Jeremy Mates &
     Mark Jason Dominus.
   * dbinfo updated to report when a database is encrypted.

3 files changed, 23 insertions, 22 deletions

diff --git a/databases/p5-DB_File/Makefile b/databases/p5-DB_File/Makefile
index 8e7572b9d07..2c097b7a10f 100644
--- a/databases/p5-DB_File/Makefile
+++ b/databases/p5-DB_File/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/08/06 06:19:06 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/11/11 20:14:51 heinz Exp $
 
-DISTNAME=	DB_File-1.806
+DISTNAME=	DB_File-1.814
 PKGNAME=	p5-${DISTNAME}
 SVR4_PKGNAME=	p5dbfi
-PKGREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=DB_File/}
 
@@ -15,10 +14,12 @@ PERL5_PACKLIST=	auto/DB_File/.packlist
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bdb.buildlink3.mk"
 
-MAKE_ENV+=	DB_NAME="${BDB_LIBS}"
+MAKE_ENV+=	DB_FILE_NAME="${BDB_LIBS}"
 MAKE_ENV+=	DB_FILE_INCLUDE="${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}"
 MAKE_ENV+=	DB_FILE_LIB="${BDBBASE}/lib"
+.if empty(BDB_TYPE:Mdb1)
 MAKE_ENV+=	DB_FILE_COMPAT185=1
+.endif
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/p5-DB_File/distinfo b/databases/p5-DB_File/distinfo
index 4182805066b..8ce77a9360a 100644
--- a/databases/p5-DB_File/distinfo
+++ b/databases/p5-DB_File/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 16:33:08 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/11/11 20:14:51 heinz Exp $
 
-SHA1 (DB_File-1.806.tar.gz) = 83cd50f25699f8661e03671cea210e0996ce05f8
-RMD160 (DB_File-1.806.tar.gz) = 1743ddf405a91ad5bad8bbe27919bb05f089f3e8
-Size (DB_File-1.806.tar.gz) = 80078 bytes
-SHA1 (patch-aa) = 01a2ab03eabc3bab6e09e977bf64423de289d8da
+SHA1 (DB_File-1.814.tar.gz) = 8713b4986b38526d5534a3dfd3110da27febf0f8
+RMD160 (DB_File-1.814.tar.gz) = 544a968b5e4cd1d1249012d3894ff1d5bc2515a5
+Size (DB_File-1.814.tar.gz) = 87227 bytes
+SHA1 (patch-aa) = b7464439133c119d6a040365e527eb5d69467d3c
diff --git a/databases/p5-DB_File/patches/patch-aa b/databases/p5-DB_File/patches/patch-aa
index f3c32cee71b..7c49f37174d 100644
--- a/databases/p5-DB_File/patches/patch-aa
+++ b/databases/p5-DB_File/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2004/11/15 18:42:04 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2005/11/11 20:14:51 heinz Exp $
 
---- Makefile.PL.orig	2002-06-22 05:35:48.000000000 -0400
+--- Makefile.PL.orig	Wed Aug 31 23:29:18 2005
 +++ Makefile.PL
-@@ -51,7 +51,7 @@ WriteMakefile(
+@@ -7,7 +7,7 @@ use Config ;
+ die "DB_File needs Perl 5.004_05 or better. This is $]\n" 
+     if $] <= 5.00404; 
+ 
+-my $VER_INFO ;
++my $VER_INFO = "";
+ my $LIB_DIR ;
+ my $INC_DIR ;
+ my $DB_NAME ;
+@@ -54,7 +54,7 @@ WriteMakefile(
  	'depend'	=> { 'Makefile'          => 'config.in',
                               'version$(OBJ_EXT)' => 'version.c'},
  	'clean'		=> { FILES => 'constants.h constants.xs' },
@@ -11,16 +20,7 @@ $NetBSD: patch-aa,v 1.3 2004/11/15 18:42:04 jlam Exp $
          'dist'          => { COMPRESS => 'gzip', SUFFIX => 'gz',
  			     DIST_DEFAULT => 'MyDoubleCheck tardist'},    
  	);
-@@ -214,7 +214,7 @@ sub ParseCONFIG
- 
-     $INC_DIR = $ENV{'DB_FILE_INCLUDE'} || $Info{'INCLUDE'} ;
-     $LIB_DIR = $ENV{'DB_FILE_LIB'} || $Info{'LIB'} ;
--    $DB_NAME = $Info{'DBNAME'} if defined $Info{'DBNAME'} ;
-+    $DB_NAME = $ENV{'DB_NAME'} || $Info{'DBNAME'} ;
-     $COMPAT185 = "-DCOMPAT185 -DDB_LIBRARY_COMPATIBILITY_API" 
-         if (defined $ENV{'DB_FILE_COMPAT185'} && 
- 		$ENV{'DB_FILE_COMPAT185'} =~ /^\s*(on|true|1)\s*$/i) ||
-@@ -222,9 +222,9 @@ sub ParseCONFIG
+@@ -238,9 +238,9 @@ sub ParseCONFIG
      my $PREFIX  = $Info{'PREFIX'} ;
      my $HASH    = $Info{'HASH'} ;