Make this package compile correctly again after latest bdb.buildlink3.mk

changes.

3 files changed, 31 insertions, 46 deletions

diff --git a/databases/p5-DB_File/Makefile b/databases/p5-DB_File/Makefile
index 2a0a0c5fc49..429c0acd06e 100644
--- a/databases/p5-DB_File/Makefile
+++ b/databases/p5-DB_File/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/11/13 21:28:28 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/11/15 18:42:04 jlam Exp $
 
 DISTNAME=	DB_File-1.806
 PKGNAME=	p5-${DISTNAME}
@@ -10,21 +10,15 @@ MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Perl5 module to use Berkeley DB version 1 API
 
 USE_BUILDLINK3=	yes
-USE_DB185=	yes
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/DB_File/.packlist
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bdb.buildlink3.mk"
 
-# XXX This is a bit ugly...
-DB_NAME=		${BUILDLINK_TRANSFORM:Ml\:db\:*:S/l:db:/-l/}
-MAKE_ENV+=		DB_NAME=${DB_NAME}
-PERL5_LDFLAGS+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.db}/lib
-PERL5_LDFLAGS+=		-L${BUILDLINK_PREFIX.db}/lib
-MAKE_ENV+=		DB_CPPFLAGS=${BUILDLINK_CPPFLAGS.db}
-.if ${BDB_TYPE} == "db2"
-MAKE_ENV+=		DB_FILE_COMPAT185=1
-.endif
+MAKE_ENV+=	DB_NAME="${BDB_LIBS}"
+MAKE_ENV+=	DB_FILE_INCLUDE="${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}"
+MAKE_ENV+=	DB_FILE_LIB="${BDBBASE}/lib"
+MAKE_ENV+=	DB_FILE_COMPAT185=1
 
 .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 7a61d157203..3ae7eef9411 100644
--- a/databases/p5-DB_File/distinfo
+++ b/databases/p5-DB_File/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/03/22 19:13:02 heinz Exp $
+$NetBSD: distinfo,v 1.3 2004/11/15 18:42:04 jlam Exp $
 
 SHA1 (DB_File-1.806.tar.gz) = 83cd50f25699f8661e03671cea210e0996ce05f8
 Size (DB_File-1.806.tar.gz) = 80078 bytes
-SHA1 (patch-aa) = 6f72a793009f39b8ff8c5ab5d367be20370958c7
+SHA1 (patch-aa) = 01a2ab03eabc3bab6e09e977bf64423de289d8da
diff --git a/databases/p5-DB_File/patches/patch-aa b/databases/p5-DB_File/patches/patch-aa
index 6df46327c69..f3c32cee71b 100644
--- a/databases/p5-DB_File/patches/patch-aa
+++ b/databases/p5-DB_File/patches/patch-aa
@@ -1,38 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/03/22 19:13:01 heinz Exp $
+$NetBSD: patch-aa,v 1.3 2004/11/15 18:42:04 jlam Exp $
 
---- Makefile.PL.orig	Sat Jun 22 11:35:48 2002
+--- Makefile.PL.orig	2002-06-22 05:35:48.000000000 -0400
 +++ Makefile.PL
-@@ -7,14 +7,15 @@ 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 ;
- my $LIBS ;
- my $COMPAT185 = "" ;
- 
--ParseCONFIG() ;
-+my $DB_CPPFLAGS = $ENV{'DB_CPPFLAGS'};
-+$DB_NAME = $ENV{'DB_NAME'};
- 
- my @files = ('DB_File.pm', glob "t/*.t") ;
- UpDowngrade(@files);
-@@ -40,9 +41,9 @@ $OS2 = "-DOS2" if $Config{'osname'} eq '
- 
- WriteMakefile(
- 	NAME 		=> 'DB_File',
--	LIBS 		=> ["-L${LIB_DIR} $LIBS"],
-+	LIBS 		=> ["$LIBS"],
-         #MAN3PODS        => {},         # Pods will be built by installman.
--	INC		=> "-I$INC_DIR",
-+	INC		=> "$DB_CPPFLAGS",
- 	VERSION_FROM	=> 'DB_File.pm',
- 	XSPROTOARG	=> '-noprototypes',
- 	DEFINE		=> "-D_NOT_CORE $OS2 $VER_INFO $COMPAT185",
-@@ -51,7 +52,7 @@ WriteMakefile(
+@@ -51,7 +51,7 @@ WriteMakefile(
  	'depend'	=> { 'Makefile'          => 'config.in',
                               'version$(OBJ_EXT)' => 'version.c'},
  	'clean'		=> { FILES => 'constants.h constants.xs' },
@@ -41,3 +11,24 @@ $NetBSD: patch-aa,v 1.2 2003/03/22 19:13:01 heinz 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
+     my $PREFIX  = $Info{'PREFIX'} ;
+     my $HASH    = $Info{'HASH'} ;
+ 
+-    $VER_INFO = "-DmDB_Prefix_t=${PREFIX} -DmDB_Hash_t=${HASH}" ;
++    # $VER_INFO = "-DmDB_Prefix_t=${PREFIX} -DmDB_Hash_t=${HASH}" ;
+ 
+-    print <<EOM if 0 ;
++    print <<EOM if 1 ;
+     INCLUDE	[$INC_DIR]
+     LIB		[$LIB_DIR]
+     HASH	[$HASH]