Mass upgrade of CPAN ports:

	p5-Apache		->	1.00b2
	p5-Array-PrintCols	->	2.0
	p5-C-Scan		->	0.4
	p5-DBD-Pg		->	0.62
	p5-Data-Flow		->	0.05
	p5-Devel-Peek		->	0.83
	p5-HTML-Stream		->	1.40
	p5-HTTPD-Tools		->	0.55
	p5-Image-Size		->	2.4
	p5-IniConf		->	0.92
	p5-Msql			->	1.1809
	p5-Mysql		->	1.1809
	p5-PGP			->	0.3a
	p5-Pg			->	1.6.1
	p5-Tk			->	402.002
	p5-WWW-Search		->	1.010
	p5-libwww		->	5.12

5 files changed, 39 insertions, 74 deletions

diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 1057a14455c0..0024c0b567f4 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -1,27 +1,29 @@
-# New ports collection makefile for:    p5-MySQL
-# Version required:			1.17
-# Date created:				June 17th 1997
+# New ports collection makefile for:    p5-Mysql-modules
+# Version required:			1.1809
+# Date created:				September 29th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1997/06/18 19:39:25 jfitz Exp $
+#   $Id: Makefile,v 1.14 1997/09/13 17:55:20 jfitz Exp $
 #
 
-DISTNAME=	Mysqlperl-1.17
-PKGNAME=	p5-Mysql-1.17
+DISTNAME=	Mysql-modules-1.1809
+PKGNAME=	p5-Mysql-modules-1.1809
 CATEGORIES=	databases perl5
-MASTER_SITES=	http://www.tcx.se/Contrib/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	DBD
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
-BUILD_DEPENDS=	${PREFIX}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql
+BUILD_DEPENDS=	${PREFIX}/lib/libmysqlclient.a:${PORTSDIR}/databases/mysql/ \
+		${PREFIX}/lib/perl5/site_perl/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable/ \
+		${PREFIX}/lib/perl5/site_perl/DBI.pm:${PORTSDIR}/databases/p5-DBI/
+CONFIGURE_ENV+=	PREFIX=${PREFIX} MSQL_HOME=${PREFIX}
 
 USE_PERL5=	YES
 
-MAN3=		Mysql.3
-MANPREFIX=	${PREFIX}/lib/perl5
-
-CONFIGURE_ENV+=	PREFIX=${PREFIX}
+MAN1=		pmsql.1 dbimon.1
+MAN3=		Mysql.3 DBD::mSQL.3
+MAN3PREFIX=	${PREFIX}/lib/perl5
 
 do-configure:
 		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
diff --git a/databases/p5-DBD-mysql/distinfo b/databases/p5-DBD-mysql/distinfo
index 71ed1556874a..3ead7771bd96 100644
--- a/databases/p5-DBD-mysql/distinfo
+++ b/databases/p5-DBD-mysql/distinfo
@@ -1 +1 @@
-MD5 (Mysqlperl-1.17.tgz) = a92064386ff373a31fb1fe854e81e461
+MD5 (Mysql-modules-1.1809.tar.gz) = 53372267db84fb9d4c0807407a8a286d
diff --git a/databases/p5-DBD-mysql/pkg-comment b/databases/p5-DBD-mysql/pkg-comment
index 5487f8277445..1b5acbde68be 100644
--- a/databases/p5-DBD-mysql/pkg-comment
+++ b/databases/p5-DBD-mysql/pkg-comment
@@ -1 +1 @@
-perl5 interface to the MySQL database
+perl5 modules for accessing MiniSQL (mSQL) databases.
diff --git a/databases/p5-DBD-mysql/pkg-descr b/databases/p5-DBD-mysql/pkg-descr
index 72e2acba0c74..c87518913b6d 100644
--- a/databases/p5-DBD-mysql/pkg-descr
+++ b/databases/p5-DBD-mysql/pkg-descr
@@ -1,58 +1,13 @@
-What you achieve with MysqlPerl
-------------------------------
-
-MysqlPerl is an interface between the perl programming language and the
-MySQL programming API that comes with the MySQL relational database
-management system. All functions provided by the MySQL programming API
-are supported.
-
-From perl you activate the interface with the statement
-
-    use Mysql;
-
-After that you can connect to multiple msql database servers and send
-multiple queries to any of them via an simple object oriented
-interface. Two types of objects are available: database handles and
-statement handles. Perl returns a database handle to the Connect
-method like so:
-
-    $dbh = Mysql->connect($hostname,$databasename);
-
-Once you have connected to a database, you get a statement handle
-with:
-
-    $sth = $dbh->query("select foo from bar");
-
-You can open as many queries as you like simultaneously by selecting a
-different scalar to hold the object:
-
-    $another_sth = $dbh->Query("select bar from foo");
-
-
-The statement handle allows you to step through the virtual table
-returned from the database with the FetchRow method:
-
-    @row = $sth->fetchrow;
-or
-    %hash = $sth->fetchhash;
-
-You can access all metadata that MySQL supplies for a given table. To
-find out the number of rows or the number of fields returned by a
-query you simply say:
-
-    $numrows = $sth->numrows;
-    $numfields = $sth->numfields;
-
-To find out the size in bytes for the field with the offset 0 (the
-first field of a query), you say:
-
-    $length = $sth->length->[0];
-
-The list of the names for each column is returned by
-
-    @list => $sth->name;
-
-As for other metadata available, consult the manpage that comes with
-MysqlPerl and study the examples in the file t/msql.t, which is the
-extensive testscript to test your installation, but is heavily
-commented, so you may use it as a tutorial.
+Msql.pm and DBD::mSQL implement two different approaches to
+communicate with an mSQL server. DBD::mSQL is built upon the DBI, the
+generic Perl Database Interface. It brings you an identical interface
+to a broad variety of databases and is in this regard comparable to
+ODBC. The advantage of the DBI approach is portability and
+interoperability. Msql.pm is the elder species. It was written before
+DBI was available but it was inspired by an early draft of the DBI
+specification. As it has been circulating longer it is more mature and
+pretty stable. It's also more complete than DBD::mSQL.
+
+Some day in the future DBD::mSQL will probably be the clearly superior
+competitor in this package. Today you have to decide on your own about
+the trade-offs.
diff --git a/databases/p5-DBD-mysql/pkg-plist b/databases/p5-DBD-mysql/pkg-plist
index fcdf2c198273..4b8e82c51fb8 100644
--- a/databases/p5-DBD-mysql/pkg-plist
+++ b/databases/p5-DBD-mysql/pkg-plist
@@ -1,8 +1,16 @@
+bin/dbimon
+bin/pmsql
+lib/perl5/man/man3/DBD::mysql.3.gz
 lib/perl5/man/man3/Mysql.3.gz
+lib/perl5/site_perl/DBD/mysql.pm
 lib/perl5/site_perl/Mysql.pm
 lib/perl5/site_perl/Mysql/Statement.pm
+lib/perl5/site_perl/i386-freebsd/auto/DBD/mysql/mysql.bs
+lib/perl5/site_perl/i386-freebsd/auto/DBD/mysql/mysql.so
 lib/perl5/site_perl/i386-freebsd/auto/Mysql/Mysql.bs
 lib/perl5/site_perl/i386-freebsd/auto/Mysql/Mysql.so
+man/man1/pmsql.1.gz
+man/man1/dbimon.1.gz
 lib/perl5/site_perl/i386-freebsd/auto/Mysql/.packlist
+@dirrm lib/perl5/site_perl/i386-freebsd/auto/DBD/mysql
 @dirrm lib/perl5/site_perl/i386-freebsd/auto/Mysql
-@dirrm lib/perl5/site_perl/Mysql