Updating databases/p5-Template-DBI from 2.64 to 2.65

pkgsrc changes:
- adjust dependencies
- clarify license
- remove upstream applied patch

Upstream changes:
2.65    2010-07-27
        - take over maintainership from prior maintainers
	  Andy Wardley and Simon Matthews (Jens Rehsack)
	  Thanks to both guys for their great work so far
	- improve connect to can reconnect after CLONE
	- add support for keeping alive in threaded environment
	- add ability to prepare/query with passing params to
	  $dbh->prepare
	- add some neat functions to the iterator of th $sth
	- add ability to fetch and store $dbh and $sth attributes
	- reap DBI handles for new threads when used in threaded
	  environments and threads::variable::reap is available
	- add test with two placeholders

3 files changed, 8 insertions, 143 deletions

diff --git a/databases/p5-Template-DBI/Makefile b/databases/p5-Template-DBI/Makefile
index 04b06a840b5..1afd70997bc 100644
--- a/databases/p5-Template-DBI/Makefile
+++ b/databases/p5-Template-DBI/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2009/06/14 22:44:54 sno Exp $
+# $NetBSD: Makefile,v 1.3 2010/07/31 12:37:15 sno Exp $
 #
 
-DISTNAME=	Template-DBI-2.64
+DISTNAME=	Template-DBI-2.65
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Template/}
@@ -9,12 +9,12 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Template/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Template-DBI/
 COMMENT=	Template interface to the DBI module
-LICENSE=	gnu-gpl-v2 # OR artistic
+LICENSE=	${PERL5_LICENSE}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	p5-Template-Toolkit>=2.15:../../www/p5-Template-Toolkit
-DEPENDS+=	p5-Tie-DBI-[0-9]*:../../databases/p5-Tie-DBI
+DEPENDS+=	p5-Tie-DBI>=1.05:../../databases/p5-Tie-DBI # only with patches
 
 PERL5_PACKLIST=		auto/Template/DBI/.packlist
 
diff --git a/databases/p5-Template-DBI/distinfo b/databases/p5-Template-DBI/distinfo
index 83165e38b66..bc0246f4d34 100644
--- a/databases/p5-Template-DBI/distinfo
+++ b/databases/p5-Template-DBI/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/06/14 22:42:57 sno Exp $
+$NetBSD: distinfo,v 1.2 2010/07/31 12:37:15 sno Exp $
 
-SHA1 (Template-DBI-2.64.tar.gz) = 9f32974f4f9b53489d818c9c8546d65fd4921f18
-RMD160 (Template-DBI-2.64.tar.gz) = e7093c7498b245fc3ab2af04e567733c93012fb9
-Size (Template-DBI-2.64.tar.gz) = 13645 bytes
-SHA1 (patch-aa) = b6318935fb553efe2536b744f782d28dfff8f4b7
+SHA1 (Template-DBI-2.65.tar.gz) = 181f9417a66650c05860543993853ca33d105caf
+RMD160 (Template-DBI-2.65.tar.gz) = ddf9ad0badff6bc784b0af53b05be52bfba1cd83
+Size (Template-DBI-2.65.tar.gz) = 15681 bytes
diff --git a/databases/p5-Template-DBI/patches/patch-aa b/databases/p5-Template-DBI/patches/patch-aa
deleted file mode 100644
index 9017ac8b2fd..00000000000
--- a/databases/p5-Template-DBI/patches/patch-aa
+++ /dev/null
@@ -1,134 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/06/14 22:42:57 sno Exp $
-
-Skipping user interaction for running DBI tests
-
---- Makefile.PL.orig	2009-06-03 20:23:48.000000000 +0000
-+++ Makefile.PL	2009-06-03 20:32:01.000000000 +0000
-@@ -24,7 +24,7 @@
- dbi_config();
- 
- my %opts = (
--    'NAME'	       => 'Template-DBI',
-+    'NAME'	       => 'Template::DBI',
-     'VERSION_FROM' => 'lib/Template/Plugin/DBI.pm',
-     'PMLIBDIRS'    => [ 'lib' ], 
-     'PREREQ_PM'    => { 
-@@ -59,63 +59,63 @@
- sub dbi_config {
-     my ($dsn, $user, $pass) = ('') x 3;
- 
--    if (ttprompt("Do you want to run the DBI tests?\n" .
--	       "It requires access to an existing test database.",
--	       $RUN_TESTS) =~ /y/i) {
--
--        $RUN_TESTS = 1;
--        my ($driver, $dbname);
--        require DBI;
--        my @drivers = DBI->available_drivers();
--        local $" = ', ';
--        
--        my $default = (grep(/m.?sql/i, @drivers))[0] 
--            || $drivers[0] || '';
--        
--        message(<<EOF);
--
--DBI Test Configuration
------------------------
--
--Please enter the driver name for the test database.
--The DBD drivers installed on your system are
--
--    @drivers
--
--EOF
--
--        while (! $driver) {
--            $driver = ttprompt("Enter driver name: ", $default);
--            message("! No such DBD driver\n"), undef $driver
--                unless grep(/^$driver$/, @drivers);
--        }
--        
--        message(<<EOF);
--
--Now enter the data source (DSN) for the test database.
--Many DBD drivers require only a database name (e.g. 'test') while
--others may require an alternate format or additional parameters
--(e.g. 'dbname=test').  Please consult your DBD documentation for
--further details.
--
--EOF
--
--    	my $dbname_eg = $driver eq 'Pg' ? 'dbname=test' : 'test';
--        while (! $dbname) {
--            $dbname = ttprompt('Database name: ', $dbname_eg);
--        }
--    
--        $dsn = "dbi:$driver:$dbname";
--    	$user = ttprompt('Enter user name : ', '');
--    	$pass = ttprompt('Enter password  : ', '');
--    	$user = '' unless defined $user;
--        $pass = '' unless defined $pass;
--    }
--    else {
-+#    if (ttprompt("Do you want to run the DBI tests?\n" .
-+#	       "It requires access to an existing test database.",
-+#	       $RUN_TESTS) =~ /y/i) {
-+#
-+#        $RUN_TESTS = 1;
-+#        my ($driver, $dbname);
-+#        require DBI;
-+#        my @drivers = DBI->available_drivers();
-+#        local $" = ', ';
-+#        
-+#        my $default = (grep(/m.?sql/i, @drivers))[0] 
-+#            || $drivers[0] || '';
-+#        
-+#        message(<<EOF);
-+#
-+#DBI Test Configuration
-+#----------------------
-+#
-+#Please enter the driver name for the test database.
-+#The DBD drivers installed on your system are
-+#
-+#    @drivers
-+#
-+#EOF
-+#
-+#        while (! $driver) {
-+#            $driver = ttprompt("Enter driver name: ", $default);
-+#            message("! No such DBD driver\n"), undef $driver
-+#                unless grep(/^$driver$/, @drivers);
-+#        }
-+#        
-+#        message(<<EOF);
-+#
-+#Now enter the data source (DSN) for the test database.
-+#Many DBD drivers require only a database name (e.g. 'test') while
-+#others may require an alternate format or additional parameters
-+#(e.g. 'dbname=test').  Please consult your DBD documentation for
-+#further details.
-+#
-+#EOF
-+#
-+#    	my $dbname_eg = $driver eq 'Pg' ? 'dbname=test' : 'test';
-+#        while (! $dbname) {
-+#            $dbname = ttprompt('Database name: ', $dbname_eg);
-+#        }
-+#    
-+#        $dsn = "dbi:$driver:$dbname";
-+#    	$user = ttprompt('Enter user name : ', '');
-+#    	$pass = ttprompt('Enter password  : ', '');
-+#    	$user = '' unless defined $user;
-+#        $pass = '' unless defined $pass;
-+#    }
-+#    else {
-         $RUN_TESTS = 0;
--    }
-+#    }
- 
--    message("\nwriting $CONFIG_PATH\n");
-+#    message("\nwriting $CONFIG_PATH\n");
-     open(CFGFILE, ">$CONFIG_PATH") || die "$CONFIG_PATH: $!\n";
-     print CFGFILE <<EOF;
- \$run  = $RUN_TESTS;