Upgrade to 1.1833, and make it compatible with perl5.00501.

6 files changed, 66 insertions, 64 deletions

diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index c5e9918c9cfd..fa21ff7ee877 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    p5-Mysql-modules
-# Version required:			1.1831
+# Version required:			1.1833
 # Date created:				September 29th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.4 1997/09/17 13:58:57 jfitz Exp $
+# $Id: Makefile,v 1.5 1998/07/04 19:07:02 steve Exp $
 #
 
-DISTNAME=	Msql-Mysql-modules-1.1831
-PKGNAME=	p5-Mysql-modules-1.1831
+DISTNAME=	Msql-Mysql-modules-1.1833
+PKGNAME=	p5-Mysql-modules-1.1833
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBD
@@ -15,17 +15,16 @@ MASTER_SITE_SUBDIR=	DBD
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS=	${PREFIX}/lib/mysql/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}
+		${PREFIX}/lib/perl5/site_perl/5.005/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable/ \
+		${PREFIX}/lib/perl5/site_perl/5.005/i386-freebsd/DBI.pm:${PORTSDIR}/databases/p5-DBI/
 
-IS_INTERACTIVE=	YES
+CONFIGURE_ENV+=	PREFIX=${PREFIX} MYSQL_HOME=${PREFIX} IN_MYSQL_DISTRIBUTION=1
 USE_PERL5=	YES
 
 MAN1=		pmysql.1 dbimon.1
 MAN3=		Bundle::Msql.3 Bundle::Mysql.3 DBD::mSQL.3 DBD::mysql.3 \
 		Msql.3 Mysql.3
-MAN3PREFIX=	${PREFIX}/lib/perl5
+MAN3PREFIX=	${PREFIX}/lib/perl5/5.00501
 
 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 90437e0802f7..3c4d0fd3a85c 100644
--- a/databases/p5-DBD-mysql/distinfo
+++ b/databases/p5-DBD-mysql/distinfo
@@ -1 +1 @@
-MD5 (Msql-Mysql-modules-1.1831.tar.gz) = 601177bb8c436d24c03099f96d7dd4aa
+MD5 (Msql-Mysql-modules-1.1833.tar.gz) = ffd726b27e9a01c441c0fc32f05645af
diff --git a/databases/p5-DBD-mysql/pkg-plist b/databases/p5-DBD-mysql/pkg-plist
index aa8292008631..e8d80195238c 100644
--- a/databases/p5-DBD-mysql/pkg-plist
+++ b/databases/p5-DBD-mysql/pkg-plist
@@ -1,26 +1,28 @@
 bin/dbimon
 bin/pmysql
-lib/perl5/man/man3/Bundle::Msql.3.gz
-lib/perl5/man/man3/Bundle::Mysql.3.gz
-lib/perl5/man/man3/DBD::mSQL.3.gz
-lib/perl5/man/man3/DBD::mysql.3.gz
-lib/perl5/man/man3/Msql.3.gz
-lib/perl5/man/man3/Mysql.3.gz
-lib/perl5/site_perl/Bundle/Msql.pm
-lib/perl5/site_perl/Bundle/Mysql.pm
-lib/perl5/site_perl/DBD/mSQL.pm
-lib/perl5/site_perl/DBD/mysql.pm
-lib/perl5/site_perl/Msql.pm
-lib/perl5/site_perl/Msql/Statement.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/Msql-Mysql-modules/.packlist
-lib/perl5/site_perl/i386-freebsd/auto/Mysql/Mysql.bs
-lib/perl5/site_perl/i386-freebsd/auto/Mysql/Mysql.so
+lib/perl5/5.00501/man/man3/Bundle::Msql.3.gz
+lib/perl5/5.00501/man/man3/Bundle::Mysql.3.gz
+lib/perl5/5.00501/man/man3/DBD::mSQL.3.gz
+lib/perl5/5.00501/man/man3/DBD::mysql.3.gz
+lib/perl5/5.00501/man/man3/Msql.3.gz
+lib/perl5/5.00501/man/man3/Mysql.3.gz
+lib/perl5/site_perl/5.005/i386-freebsd/Msql.pm
+lib/perl5/site_perl/5.005/i386-freebsd/Mysql.pm
+lib/perl5/site_perl/5.005/i386-freebsd/Bundle/Msql.pm
+lib/perl5/site_perl/5.005/i386-freebsd/Bundle/Mysql.pm
+lib/perl5/site_perl/5.005/i386-freebsd/DBD/mSQL.pm
+lib/perl5/site_perl/5.005/i386-freebsd/DBD/mysql.pm
+lib/perl5/site_perl/5.005/i386-freebsd/Msql/Statement.pm
+lib/perl5/site_perl/5.005/i386-freebsd/Mysql/Statement.pm
+lib/perl5/site_perl/5.005/i386-freebsd/auto/DBD/mysql/mysql.bs
+lib/perl5/site_perl/5.005/i386-freebsd/auto/DBD/mysql/mysql.so
+lib/perl5/site_perl/5.005/i386-freebsd/auto/Msql-Mysql-modules/.packlist
+lib/perl5/site_perl/5.005/i386-freebsd/auto/Mysql/Mysql.bs
+lib/perl5/site_perl/5.005/i386-freebsd/auto/Mysql/Mysql.so
 man/man1/dbimon.1.gz
 man/man1/pmysql.1.gz
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/DBD/mysql
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Msql-Mysql-modules
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Mysql
+@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/DBD/mysql
+@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/Msql-Mysql-modules
+@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/Mysql
+@dirrm lib/perl5/site_perl/5.005/i386-freebsd/Mysql
+@dirrm lib/perl5/site_perl/5.005/i386-freebsd/Msql
diff --git a/databases/p5-Mysql/Makefile b/databases/p5-Mysql/Makefile
index c5e9918c9cfd..fa21ff7ee877 100644
--- a/databases/p5-Mysql/Makefile
+++ b/databases/p5-Mysql/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    p5-Mysql-modules
-# Version required:			1.1831
+# Version required:			1.1833
 # Date created:				September 29th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.4 1997/09/17 13:58:57 jfitz Exp $
+# $Id: Makefile,v 1.5 1998/07/04 19:07:02 steve Exp $
 #
 
-DISTNAME=	Msql-Mysql-modules-1.1831
-PKGNAME=	p5-Mysql-modules-1.1831
+DISTNAME=	Msql-Mysql-modules-1.1833
+PKGNAME=	p5-Mysql-modules-1.1833
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBD
@@ -15,17 +15,16 @@ MASTER_SITE_SUBDIR=	DBD
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS=	${PREFIX}/lib/mysql/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}
+		${PREFIX}/lib/perl5/site_perl/5.005/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable/ \
+		${PREFIX}/lib/perl5/site_perl/5.005/i386-freebsd/DBI.pm:${PORTSDIR}/databases/p5-DBI/
 
-IS_INTERACTIVE=	YES
+CONFIGURE_ENV+=	PREFIX=${PREFIX} MYSQL_HOME=${PREFIX} IN_MYSQL_DISTRIBUTION=1
 USE_PERL5=	YES
 
 MAN1=		pmysql.1 dbimon.1
 MAN3=		Bundle::Msql.3 Bundle::Mysql.3 DBD::mSQL.3 DBD::mysql.3 \
 		Msql.3 Mysql.3
-MAN3PREFIX=	${PREFIX}/lib/perl5
+MAN3PREFIX=	${PREFIX}/lib/perl5/5.00501
 
 do-configure:
 		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
diff --git a/databases/p5-Mysql/distinfo b/databases/p5-Mysql/distinfo
index 90437e0802f7..3c4d0fd3a85c 100644
--- a/databases/p5-Mysql/distinfo
+++ b/databases/p5-Mysql/distinfo
@@ -1 +1 @@
-MD5 (Msql-Mysql-modules-1.1831.tar.gz) = 601177bb8c436d24c03099f96d7dd4aa
+MD5 (Msql-Mysql-modules-1.1833.tar.gz) = ffd726b27e9a01c441c0fc32f05645af
diff --git a/databases/p5-Mysql/pkg-plist b/databases/p5-Mysql/pkg-plist
index aa8292008631..e8d80195238c 100644
--- a/databases/p5-Mysql/pkg-plist
+++ b/databases/p5-Mysql/pkg-plist
@@ -1,26 +1,28 @@
 bin/dbimon
 bin/pmysql
-lib/perl5/man/man3/Bundle::Msql.3.gz
-lib/perl5/man/man3/Bundle::Mysql.3.gz
-lib/perl5/man/man3/DBD::mSQL.3.gz
-lib/perl5/man/man3/DBD::mysql.3.gz
-lib/perl5/man/man3/Msql.3.gz
-lib/perl5/man/man3/Mysql.3.gz
-lib/perl5/site_perl/Bundle/Msql.pm
-lib/perl5/site_perl/Bundle/Mysql.pm
-lib/perl5/site_perl/DBD/mSQL.pm
-lib/perl5/site_perl/DBD/mysql.pm
-lib/perl5/site_perl/Msql.pm
-lib/perl5/site_perl/Msql/Statement.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/Msql-Mysql-modules/.packlist
-lib/perl5/site_perl/i386-freebsd/auto/Mysql/Mysql.bs
-lib/perl5/site_perl/i386-freebsd/auto/Mysql/Mysql.so
+lib/perl5/5.00501/man/man3/Bundle::Msql.3.gz
+lib/perl5/5.00501/man/man3/Bundle::Mysql.3.gz
+lib/perl5/5.00501/man/man3/DBD::mSQL.3.gz
+lib/perl5/5.00501/man/man3/DBD::mysql.3.gz
+lib/perl5/5.00501/man/man3/Msql.3.gz
+lib/perl5/5.00501/man/man3/Mysql.3.gz
+lib/perl5/site_perl/5.005/i386-freebsd/Msql.pm
+lib/perl5/site_perl/5.005/i386-freebsd/Mysql.pm
+lib/perl5/site_perl/5.005/i386-freebsd/Bundle/Msql.pm
+lib/perl5/site_perl/5.005/i386-freebsd/Bundle/Mysql.pm
+lib/perl5/site_perl/5.005/i386-freebsd/DBD/mSQL.pm
+lib/perl5/site_perl/5.005/i386-freebsd/DBD/mysql.pm
+lib/perl5/site_perl/5.005/i386-freebsd/Msql/Statement.pm
+lib/perl5/site_perl/5.005/i386-freebsd/Mysql/Statement.pm
+lib/perl5/site_perl/5.005/i386-freebsd/auto/DBD/mysql/mysql.bs
+lib/perl5/site_perl/5.005/i386-freebsd/auto/DBD/mysql/mysql.so
+lib/perl5/site_perl/5.005/i386-freebsd/auto/Msql-Mysql-modules/.packlist
+lib/perl5/site_perl/5.005/i386-freebsd/auto/Mysql/Mysql.bs
+lib/perl5/site_perl/5.005/i386-freebsd/auto/Mysql/Mysql.so
 man/man1/dbimon.1.gz
 man/man1/pmysql.1.gz
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/DBD/mysql
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Msql-Mysql-modules
-@dirrm lib/perl5/site_perl/i386-freebsd/auto/Mysql
+@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/DBD/mysql
+@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/Msql-Mysql-modules
+@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/Mysql
+@dirrm lib/perl5/site_perl/5.005/i386-freebsd/Mysql
+@dirrm lib/perl5/site_perl/5.005/i386-freebsd/Msql