Massive changes to mSQL and related ports:

- msql-beta is now dead.  Now that v2.0 release is out, it has been folded into ports/databases/msql.
- p5-DBD-mSQL is dead.  It has been rolled into p5-Msql
- The version number of p5-Msql has moved from 1.1702 to 0.91.  This new version numbering scheme is related to the "Msql-modules" distfile on CPAN, whereas the old version numbering scheme was based on the "MsqlPerl" distfile (which is no longer available)

6 files changed, 37 insertions, 86 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 94d6bb7a7370..4c9acdf47468 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,13 +1,11 @@
-# $Id: Makefile,v 1.16 1997/06/13 17:54:40 jfitz Exp $
+# $Id: Makefile,v 1.17 1997/06/18 19:41:11 jfitz Exp $
 #
     SUBDIR += db
     SUBDIR += exodus
     SUBDIR += gdbm
     SUBDIR += gnats
     SUBDIR += msql
-    SUBDIR += msql-beta
     SUBDIR += mysql
-    SUBDIR += p5-DBD-mSQL
     SUBDIR += p5-DBD-mysql
     SUBDIR += p5-DBD-Pg
     SUBDIR += p5-DBI
diff --git a/databases/p5-Msql/Makefile b/databases/p5-Msql/Makefile
index 50931ab00bc8..15c975efa8aa 100644
--- a/databases/p5-Msql/Makefile
+++ b/databases/p5-Msql/Makefile
@@ -1,36 +1,27 @@
 # New ports collection makefile for:    p5-Msql
-# Version required:			1.1702
+# Version required:			0.91
 # Date created:				September 29th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.11 1997/06/15 03:14:05 jfitz Exp $
+#   $Id: Makefile,v 1.12 1997/06/24 18:43:25 jfitz Exp $
 #
 
-DISTNAME=	MsqlPerl-1.1702
-PKGNAME=	p5-Msql-1.1702
+DISTNAME=	Msql-modules-0.91
+PKGNAME=	p5-Msql-0.91
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Msql
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
-# Uncomment this if you want to build against the msql-beta (v2) port instead
-# of the original v1.16 port
-#USE_MSQLBETA=	YES
-
-.if defined(USE_MSQLBETA)
-BUILD_DEPENDS=	${PREFIX}/lib/libmsql.a:${PORTSDIR}/databases/msql-beta/
-CONFIGURE_ENV+=	USE_MSQLBETA=${USE_MSQLBETA}
-.else
-BUILD_DEPENDS=	${PREFIX}/Minerva/lib/libmsql.a:${PORTSDIR}/databases/msql/
-.endif
-
-CONFIGURE_ENV+=	PREFIX=${PREFIX}
+BUILD_DEPENDS=	${PREFIX}/lib/libmsql.a:${PORTSDIR}/databases/msql/ \
+		${PREFIX}/lib/perl5/site_perl/DBI.pm:${PORTSDIR}/databases/p5-DBI/
+CONFIGURE_ENV+=	PREFIX=${PREFIX} MSQL_HOME=${PREFIX}
 
 USE_PERL5=	YES
 
 MAN1=		pmsql.1
-MAN3=		Msql.3
+MAN3=		Msql.3 DBD::mSQL.3 Msql::Integrat.3
 MAN3PREFIX=	${PREFIX}/lib/perl5
 
 do-configure:
diff --git a/databases/p5-Msql/distinfo b/databases/p5-Msql/distinfo
index f6dfd6068da6..93eda0cee77f 100644
--- a/databases/p5-Msql/distinfo
+++ b/databases/p5-Msql/distinfo
@@ -1 +1 @@
-MD5 (MsqlPerl-1.1702.tar.gz) = adb71a45fbbdb7b7a6f853505b26ed72
+MD5 (Msql-modules-0.91.tar.gz) = 8470cc16cc6d37d03d513e8d6965f3ce
diff --git a/databases/p5-Msql/pkg-comment b/databases/p5-Msql/pkg-comment
index c79e93043cab..1b5acbde68be 100644
--- a/databases/p5-Msql/pkg-comment
+++ b/databases/p5-Msql/pkg-comment
@@ -1 +1 @@
-perl5 module for accessing MiniSQL (mSQL) databases.
+perl5 modules for accessing MiniSQL (mSQL) databases.
diff --git a/databases/p5-Msql/pkg-descr b/databases/p5-Msql/pkg-descr
index fd86725e90bc..c87518913b6d 100644
--- a/databases/p5-Msql/pkg-descr
+++ b/databases/p5-Msql/pkg-descr
@@ -1,58 +1,13 @@
-What you achieve with MsqlPerl
-------------------------------
-
-MsqlPerl is an interface between the perl programming language and the
-mSQL programming API that comes with the mSQL relational database
-management system. All functions provided by the mSQL programming API
-are supported.
-
-From perl you activate the interface with the statement
-
-    use Msql;
-
-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 = Msql->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 mSQL 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
-MsqlPerl 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-Msql/pkg-plist b/databases/p5-Msql/pkg-plist
index c28b25e23269..d71df8bab740 100644
--- a/databases/p5-Msql/pkg-plist
+++ b/databases/p5-Msql/pkg-plist
@@ -1,10 +1,17 @@
 bin/pmsql
-lib/perl5/site_perl/i386-freebsd/auto/Msql/Msql.so
-lib/perl5/site_perl/i386-freebsd/auto/Msql/Msql.bs
-lib/perl5/site_perl/i386-freebsd/auto/Msql/.packlist
-lib/perl5/site_perl/Msql/Statement.pm
+lib/perl5/man/man3/DBD::mSQL.3.gz
+lib/perl5/man/man3/Msql.3.gz
+lib/perl5/man/man3/Msql::Integrat.3.gz
+lib/perl5/site_perl/DBD/mSQL.pm
 lib/perl5/site_perl/Msql.pm
+lib/perl5/site_perl/Msql/Integrat.pm
+lib/perl5/site_perl/Msql/Statement.pm
+lib/perl5/site_perl/i386-freebsd/auto/DBD/mSQL/mSQL.bs
+lib/perl5/site_perl/i386-freebsd/auto/DBD/mSQL/mSQL.so
+lib/perl5/site_perl/i386-freebsd/auto/Msql/Msql.bs
+lib/perl5/site_perl/i386-freebsd/auto/Msql/Msql.so
 man/man1/pmsql.1.gz
-lib/perl5/man/man3/Msql.3.gz
+lib/perl5/site_perl/i386-freebsd/auto/Msql/Integrat/.packlist
+@dirrm lib/perl5/site_perl/i386-freebsd/auto/Msql/Integrat
+@dirrm lib/perl5/site_perl/i386-freebsd/auto/DBD/mSQL
 @dirrm lib/perl5/site_perl/i386-freebsd/auto/Msql
-@dirrm lib/perl5/site_perl/Msql