Update to 2.1017, based on pkg/17295 by Sergey Svishchev.

Changes since 1.2219:
* dbdimp.c: Added a required check for mysql_errno.
  Steve Hay <Steve.Hay@uk.radan.com>
* dbdimp.c: Removed use of mysql_eof. Jay Lawrence <jay@lawrence.net>
* dbdimp.c: Fixed mysql_is_auto_increment.  Paul Walmsley
  <shag-dbdmysql@booyaka.com> and Paul Dubois <paul@kitebird.org>
* dbdimp.c: Added use of mysql_ssl_set.  Chris Hanes <chanes@i-c.net>
* Some fixes in the docs. Paul Dubois <paul@kitebird.com>
* Added mysql_is_auto_increment. (Someone else, but forgot his email, sorry!)
* lib/DBD/mysql.pod: Fixed minor bug in an example.
* Within AutoCommit mode, reconnect is now turned off, because the
  transaction state is unpredictable otherwise.
* dbdimp.c: Added use of SvMAGICAL to dbd_db_quote.
  Rudy Lippan <almighty@randomc.com>
* bind_param now using mysql_real_escape_string
  as well. Dave Rolsky <autarch@urth.org>
* Added mysql_ssl flag to DBI->connect.
* Quoting now based on mysql_real_escape_string. Thanks
  to Dave Rolsky <autarch@urth.org> for suggesting this.
* Portability changes for MySQL 4.
* dbdimp.c: Fixed $dbh->{mysql_insertid}; added t/insertid.t
* Added transaction support for MySQL.  (Bob Lyons <lyons@nextrials.com>)
* dbd/dbdimp.c: Fixed MAXLENGTH warning; used to hint for a not existing
  mysql_maxlength, which should read mysql_max_length.
  (Paul DuBois <paul@snake.net>)
* Fixed installation problem when a directory was specified,
  but did not exist. (Will Partain <partain@dcs.gla.ac.uk>)
* Fixed that mysql_errno wasn't used properly. (Chris Adams
  <cmadams@hiwaay.net>)
* Fixed test suite problem, when user name and password
  have been interpolated. (Bruno Hivert (LMC) <lmcbrhi@lmc.ericsson.se>)
* mysql_insertid and mysql_affectedrows are no longer treated
  as integers, but longs. Thanks to Michael G Schwern <schwern@pobox.com>.

make test gives the same output as for the previous pkgsrc version.
Thanks, atatat!

3 files changed, 8 insertions, 34 deletions

diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 1e94d3d9c3a..5cbf6655a7f 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2002/06/16 22:03:03 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2002/07/07 12:34:49 wiz Exp $
 #
 
-DISTNAME=		Msql-Mysql-modules-1.2219
-PKGNAME=		p5-DBD-mysql-1.2219
+DISTNAME=		DBD-mysql-2.1017
+PKGNAME=		p5-${DISTNAME}
 SVR4_PKGNAME=		p5dmy
 CATEGORIES=		databases perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=DBD/}
@@ -17,20 +17,9 @@ DEPENDS+=		p5-Data-ShowTable-3.3:../../devel/p5-Data-ShowTable
 BUILDLINK_DEPENDS.mysql-client?=	mysql-client>=3.23.49nb1
 
 USE_PERL5=		# defined
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Msql-Mysql-modules/.packlist
+PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/DBD/mysql/.packlist
 
-MYSQL_HEADERDIR=	${PREFIX}/include/mysql
-MYSQL_LIBDIR=		${PREFIX}/lib/mysql
-
-MAKE_ENV+=		MYSQL_HEADERDIR="${MYSQL_HEADERDIR}"
-MAKE_ENV+=		MYSQL_LIBDIR="${MYSQL_LIBDIR}"
-MAKE_ENV+=		IN_MYSQL_DISTRIBUTION=1
-
-MAKE_PARAMS+=		--noprompt
-MAKE_PARAMS+=		--mysql-install
-MAKE_PARAMS+=		--nomsql-install --nomsql1-install
-MAKE_PARAMS+=		--mysql-incdir=${MYSQL_HEADERDIR}
-MAKE_PARAMS+=		--mysql-libdir=${MYSQL_LIBDIR}
+MAKE_PARAMS+=		--nocatchstderr
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
diff --git a/databases/p5-DBD-mysql/distinfo b/databases/p5-DBD-mysql/distinfo
index 38fcde2b9dd..a5d7c294faf 100644
--- a/databases/p5-DBD-mysql/distinfo
+++ b/databases/p5-DBD-mysql/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/04/14 14:11:19 veego Exp $
+$NetBSD: distinfo,v 1.5 2002/07/07 12:34:49 wiz Exp $
 
-SHA1 (Msql-Mysql-modules-1.2219.tar.gz) = 23d9b4b44e5c02930b7b1f60dd70a99ad25e966f
-Size (Msql-Mysql-modules-1.2219.tar.gz) = 195634 bytes
-SHA1 (patch-aa) = 2aabc77faf189de8fac6590955d9837eff8ad16b
+SHA1 (DBD-mysql-2.1017.tar.gz) = 7417e03bcbb77f0613d8616a617cbc8596854c8c
+Size (DBD-mysql-2.1017.tar.gz) = 93638 bytes
diff --git a/databases/p5-DBD-mysql/patches/patch-aa b/databases/p5-DBD-mysql/patches/patch-aa
deleted file mode 100644
index a199e54462c..00000000000
--- a/databases/p5-DBD-mysql/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/04/14 14:11:19 veego Exp $
-
---- lib/DBD/mysql/Install.pm-orig	Sat Apr  7 14:31:06 2001
-+++ lib/DBD/mysql/Install.pm	Sun Apr 14 16:04:24 2002
-@@ -407,6 +407,9 @@
- 	$Config::Config{'osname'} =~ /^sco\d+/) {
- 	# Some extra libraries need added for SCO and Unixware
- 	$sysliblist .= " -lc";
-+    } elsif ($Config::Config{'osname'} eq 'netbsd') {
-+	# We need to link with -Wl,-R if we're on NetBSD
-+	$linkwith = "-Wl,-R$libdir";
-     } elsif ($Config::Config{'osname'} eq 'solaris') {
- 	# We need to link with -R if we're on Solaris.......Brain-damaged....
- 	$linkwith = "-R$libdir";