30 files changed, 520 insertions, 310 deletions

diff --git a/databases/mysql322-client/Makefile b/databases/mysql322-client/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql322-client/Makefile
+++ b/databases/mysql322-client/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql322-server/Makefile
+++ b/databases/mysql322-server/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql322-server/pkg-plist b/databases/mysql322-server/pkg-plist
index e80389ed8a15..c79a7bae346d 100644
--- a/databases/mysql322-server/pkg-plist
+++ b/databases/mysql322-server/pkg-plist
@@ -1,9 +1,9 @@
 bin/add_file_priv
 bin/add_long_password
-bin/make_binary_distribution
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_binary_distribution
 bin/msql2mysql
 bin/mysql
 bin/mysql.server
@@ -12,73 +12,84 @@ bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbug
 bin/mysqldump
-bin/mysqlshow
 bin/mysqlimport
+bin/mysqlshow
 bin/perror
 bin/replace
 bin/safe_mysqld
 bin/which1
 bin/zap
 etc/rc.d/mysql.sh
+include/mysql/dbug.h
+include/mysql/errmsg.h
 include/mysql/m_ctype.h.in
 include/mysql/m_string.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
-include/mysql/dbug.h
-include/mysql/errmsg.h
 include/mysql/mysql_version.h
+@unexec install-info --delete %D/info/mysql.info %D/info/dir
+info/mysql.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/mysql.info %D/info/dir
+lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
-lib/mysql/libdbug.a
 libexec/mysqld
+man/man1/mysql.1.gz
+share/doc/mysql/include.texi
 share/doc/mysql/manual.html
 share/doc/mysql/manual.ps
 share/doc/mysql/manual.texi
 share/doc/mysql/manual.txt
 share/doc/mysql/manual_toc.html
-share/doc/mysql/include.texi
+share/mysql/czech/errmsg.sys
+share/mysql/czech/errmsg.txt
+share/mysql/dutch/errmsg.sys
+share/mysql/dutch/errmsg.txt
 share/mysql/english/errmsg.sys
 share/mysql/english/errmsg.txt
 share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
-share/mysql/swedish/errmsg.sys
-share/mysql/swedish/errmsg.txt
-share/mysql/czech/errmsg.sys
-share/mysql/czech/errmsg.txt
-share/mysql/polish/errmsg.sys
-share/mysql/polish/errmsg.txt
-share/mysql/spanish/errmsg.sys
-share/mysql/spanish/errmsg.txt
-share/mysql/norwegian/errmsg.sys
-share/mysql/norwegian/errmsg.txt
+share/mysql/mysql/db.frm
+share/mysql/mysql/host.frm
+share/mysql/mysql/user.frm
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
+share/mysql/norwegian/errmsg.sys
+share/mysql/norwegian/errmsg.txt
+share/mysql/polish/errmsg.sys
+share/mysql/polish/errmsg.txt
 share/mysql/portuguese/errmsg.sys
 share/mysql/portuguese/errmsg.txt
-share/mysql/dutch/errmsg.sys
-share/mysql/dutch/errmsg.txt
 share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
+share/mysql/spanish/errmsg.sys
+share/mysql/spanish/errmsg.txt
+share/mysql/swedish/errmsg.sys
+share/mysql/swedish/errmsg.txt
 @dirrm include/mysql
 @dirrm lib/mysql
 @dirrm share/doc/mysql
+@dirrm share/mysql/czech
+@dirrm share/mysql/dutch
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
-@dirrm share/mysql/swedish
-@dirrm share/mysql/czech
-@dirrm share/mysql/polish
-@dirrm share/mysql/spanish
+@dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
+@dirrm share/mysql/polish
 @dirrm share/mysql/portuguese
-@dirrm share/mysql/dutch
 @dirrm share/mysql/russian
+@dirrm share/mysql/spanish
+@dirrm share/mysql/swedish
 @dirrm share/mysql
+@exec %D/bin/mysql_install_db
+@exec /usr/bin/killall mysqld
diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql323-client/Makefile
+++ b/databases/mysql323-client/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist
index e80389ed8a15..c79a7bae346d 100644
--- a/databases/mysql323-server/pkg-plist
+++ b/databases/mysql323-server/pkg-plist
@@ -1,9 +1,9 @@
 bin/add_file_priv
 bin/add_long_password
-bin/make_binary_distribution
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_binary_distribution
 bin/msql2mysql
 bin/mysql
 bin/mysql.server
@@ -12,73 +12,84 @@ bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbug
 bin/mysqldump
-bin/mysqlshow
 bin/mysqlimport
+bin/mysqlshow
 bin/perror
 bin/replace
 bin/safe_mysqld
 bin/which1
 bin/zap
 etc/rc.d/mysql.sh
+include/mysql/dbug.h
+include/mysql/errmsg.h
 include/mysql/m_ctype.h.in
 include/mysql/m_string.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
-include/mysql/dbug.h
-include/mysql/errmsg.h
 include/mysql/mysql_version.h
+@unexec install-info --delete %D/info/mysql.info %D/info/dir
+info/mysql.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/mysql.info %D/info/dir
+lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
-lib/mysql/libdbug.a
 libexec/mysqld
+man/man1/mysql.1.gz
+share/doc/mysql/include.texi
 share/doc/mysql/manual.html
 share/doc/mysql/manual.ps
 share/doc/mysql/manual.texi
 share/doc/mysql/manual.txt
 share/doc/mysql/manual_toc.html
-share/doc/mysql/include.texi
+share/mysql/czech/errmsg.sys
+share/mysql/czech/errmsg.txt
+share/mysql/dutch/errmsg.sys
+share/mysql/dutch/errmsg.txt
 share/mysql/english/errmsg.sys
 share/mysql/english/errmsg.txt
 share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
-share/mysql/swedish/errmsg.sys
-share/mysql/swedish/errmsg.txt
-share/mysql/czech/errmsg.sys
-share/mysql/czech/errmsg.txt
-share/mysql/polish/errmsg.sys
-share/mysql/polish/errmsg.txt
-share/mysql/spanish/errmsg.sys
-share/mysql/spanish/errmsg.txt
-share/mysql/norwegian/errmsg.sys
-share/mysql/norwegian/errmsg.txt
+share/mysql/mysql/db.frm
+share/mysql/mysql/host.frm
+share/mysql/mysql/user.frm
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
+share/mysql/norwegian/errmsg.sys
+share/mysql/norwegian/errmsg.txt
+share/mysql/polish/errmsg.sys
+share/mysql/polish/errmsg.txt
 share/mysql/portuguese/errmsg.sys
 share/mysql/portuguese/errmsg.txt
-share/mysql/dutch/errmsg.sys
-share/mysql/dutch/errmsg.txt
 share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
+share/mysql/spanish/errmsg.sys
+share/mysql/spanish/errmsg.txt
+share/mysql/swedish/errmsg.sys
+share/mysql/swedish/errmsg.txt
 @dirrm include/mysql
 @dirrm lib/mysql
 @dirrm share/doc/mysql
+@dirrm share/mysql/czech
+@dirrm share/mysql/dutch
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
-@dirrm share/mysql/swedish
-@dirrm share/mysql/czech
-@dirrm share/mysql/polish
-@dirrm share/mysql/spanish
+@dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
+@dirrm share/mysql/polish
 @dirrm share/mysql/portuguese
-@dirrm share/mysql/dutch
 @dirrm share/mysql/russian
+@dirrm share/mysql/spanish
+@dirrm share/mysql/swedish
 @dirrm share/mysql
+@exec %D/bin/mysql_install_db
+@exec /usr/bin/killall mysqld
diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql40-client/Makefile
+++ b/databases/mysql40-client/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist
index e80389ed8a15..c79a7bae346d 100644
--- a/databases/mysql40-server/pkg-plist
+++ b/databases/mysql40-server/pkg-plist
@@ -1,9 +1,9 @@
 bin/add_file_priv
 bin/add_long_password
-bin/make_binary_distribution
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_binary_distribution
 bin/msql2mysql
 bin/mysql
 bin/mysql.server
@@ -12,73 +12,84 @@ bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbug
 bin/mysqldump
-bin/mysqlshow
 bin/mysqlimport
+bin/mysqlshow
 bin/perror
 bin/replace
 bin/safe_mysqld
 bin/which1
 bin/zap
 etc/rc.d/mysql.sh
+include/mysql/dbug.h
+include/mysql/errmsg.h
 include/mysql/m_ctype.h.in
 include/mysql/m_string.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
-include/mysql/dbug.h
-include/mysql/errmsg.h
 include/mysql/mysql_version.h
+@unexec install-info --delete %D/info/mysql.info %D/info/dir
+info/mysql.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/mysql.info %D/info/dir
+lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
-lib/mysql/libdbug.a
 libexec/mysqld
+man/man1/mysql.1.gz
+share/doc/mysql/include.texi
 share/doc/mysql/manual.html
 share/doc/mysql/manual.ps
 share/doc/mysql/manual.texi
 share/doc/mysql/manual.txt
 share/doc/mysql/manual_toc.html
-share/doc/mysql/include.texi
+share/mysql/czech/errmsg.sys
+share/mysql/czech/errmsg.txt
+share/mysql/dutch/errmsg.sys
+share/mysql/dutch/errmsg.txt
 share/mysql/english/errmsg.sys
 share/mysql/english/errmsg.txt
 share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
-share/mysql/swedish/errmsg.sys
-share/mysql/swedish/errmsg.txt
-share/mysql/czech/errmsg.sys
-share/mysql/czech/errmsg.txt
-share/mysql/polish/errmsg.sys
-share/mysql/polish/errmsg.txt
-share/mysql/spanish/errmsg.sys
-share/mysql/spanish/errmsg.txt
-share/mysql/norwegian/errmsg.sys
-share/mysql/norwegian/errmsg.txt
+share/mysql/mysql/db.frm
+share/mysql/mysql/host.frm
+share/mysql/mysql/user.frm
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
+share/mysql/norwegian/errmsg.sys
+share/mysql/norwegian/errmsg.txt
+share/mysql/polish/errmsg.sys
+share/mysql/polish/errmsg.txt
 share/mysql/portuguese/errmsg.sys
 share/mysql/portuguese/errmsg.txt
-share/mysql/dutch/errmsg.sys
-share/mysql/dutch/errmsg.txt
 share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
+share/mysql/spanish/errmsg.sys
+share/mysql/spanish/errmsg.txt
+share/mysql/swedish/errmsg.sys
+share/mysql/swedish/errmsg.txt
 @dirrm include/mysql
 @dirrm lib/mysql
 @dirrm share/doc/mysql
+@dirrm share/mysql/czech
+@dirrm share/mysql/dutch
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
-@dirrm share/mysql/swedish
-@dirrm share/mysql/czech
-@dirrm share/mysql/polish
-@dirrm share/mysql/spanish
+@dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
+@dirrm share/mysql/polish
 @dirrm share/mysql/portuguese
-@dirrm share/mysql/dutch
 @dirrm share/mysql/russian
+@dirrm share/mysql/spanish
+@dirrm share/mysql/swedish
 @dirrm share/mysql
+@exec %D/bin/mysql_install_db
+@exec /usr/bin/killall mysqld
diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql41-client/Makefile
+++ b/databases/mysql41-client/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index e80389ed8a15..c79a7bae346d 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-server/pkg-plist
@@ -1,9 +1,9 @@
 bin/add_file_priv
 bin/add_long_password
-bin/make_binary_distribution
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_binary_distribution
 bin/msql2mysql
 bin/mysql
 bin/mysql.server
@@ -12,73 +12,84 @@ bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbug
 bin/mysqldump
-bin/mysqlshow
 bin/mysqlimport
+bin/mysqlshow
 bin/perror
 bin/replace
 bin/safe_mysqld
 bin/which1
 bin/zap
 etc/rc.d/mysql.sh
+include/mysql/dbug.h
+include/mysql/errmsg.h
 include/mysql/m_ctype.h.in
 include/mysql/m_string.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
-include/mysql/dbug.h
-include/mysql/errmsg.h
 include/mysql/mysql_version.h
+@unexec install-info --delete %D/info/mysql.info %D/info/dir
+info/mysql.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/mysql.info %D/info/dir
+lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
-lib/mysql/libdbug.a
 libexec/mysqld
+man/man1/mysql.1.gz
+share/doc/mysql/include.texi
 share/doc/mysql/manual.html
 share/doc/mysql/manual.ps
 share/doc/mysql/manual.texi
 share/doc/mysql/manual.txt
 share/doc/mysql/manual_toc.html
-share/doc/mysql/include.texi
+share/mysql/czech/errmsg.sys
+share/mysql/czech/errmsg.txt
+share/mysql/dutch/errmsg.sys
+share/mysql/dutch/errmsg.txt
 share/mysql/english/errmsg.sys
 share/mysql/english/errmsg.txt
 share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
-share/mysql/swedish/errmsg.sys
-share/mysql/swedish/errmsg.txt
-share/mysql/czech/errmsg.sys
-share/mysql/czech/errmsg.txt
-share/mysql/polish/errmsg.sys
-share/mysql/polish/errmsg.txt
-share/mysql/spanish/errmsg.sys
-share/mysql/spanish/errmsg.txt
-share/mysql/norwegian/errmsg.sys
-share/mysql/norwegian/errmsg.txt
+share/mysql/mysql/db.frm
+share/mysql/mysql/host.frm
+share/mysql/mysql/user.frm
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
+share/mysql/norwegian/errmsg.sys
+share/mysql/norwegian/errmsg.txt
+share/mysql/polish/errmsg.sys
+share/mysql/polish/errmsg.txt
 share/mysql/portuguese/errmsg.sys
 share/mysql/portuguese/errmsg.txt
-share/mysql/dutch/errmsg.sys
-share/mysql/dutch/errmsg.txt
 share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
+share/mysql/spanish/errmsg.sys
+share/mysql/spanish/errmsg.txt
+share/mysql/swedish/errmsg.sys
+share/mysql/swedish/errmsg.txt
 @dirrm include/mysql
 @dirrm lib/mysql
 @dirrm share/doc/mysql
+@dirrm share/mysql/czech
+@dirrm share/mysql/dutch
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
-@dirrm share/mysql/swedish
-@dirrm share/mysql/czech
-@dirrm share/mysql/polish
-@dirrm share/mysql/spanish
+@dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
+@dirrm share/mysql/polish
 @dirrm share/mysql/portuguese
-@dirrm share/mysql/dutch
 @dirrm share/mysql/russian
+@dirrm share/mysql/spanish
+@dirrm share/mysql/swedish
 @dirrm share/mysql
+@exec %D/bin/mysql_install_db
+@exec /usr/bin/killall mysqld
diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql50-client/Makefile
+++ b/databases/mysql50-client/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql50-server/pkg-plist b/databases/mysql50-server/pkg-plist
index e80389ed8a15..c79a7bae346d 100644
--- a/databases/mysql50-server/pkg-plist
+++ b/databases/mysql50-server/pkg-plist
@@ -1,9 +1,9 @@
 bin/add_file_priv
 bin/add_long_password
-bin/make_binary_distribution
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_binary_distribution
 bin/msql2mysql
 bin/mysql
 bin/mysql.server
@@ -12,73 +12,84 @@ bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbug
 bin/mysqldump
-bin/mysqlshow
 bin/mysqlimport
+bin/mysqlshow
 bin/perror
 bin/replace
 bin/safe_mysqld
 bin/which1
 bin/zap
 etc/rc.d/mysql.sh
+include/mysql/dbug.h
+include/mysql/errmsg.h
 include/mysql/m_ctype.h.in
 include/mysql/m_string.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
-include/mysql/dbug.h
-include/mysql/errmsg.h
 include/mysql/mysql_version.h
+@unexec install-info --delete %D/info/mysql.info %D/info/dir
+info/mysql.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/mysql.info %D/info/dir
+lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
-lib/mysql/libdbug.a
 libexec/mysqld
+man/man1/mysql.1.gz
+share/doc/mysql/include.texi
 share/doc/mysql/manual.html
 share/doc/mysql/manual.ps
 share/doc/mysql/manual.texi
 share/doc/mysql/manual.txt
 share/doc/mysql/manual_toc.html
-share/doc/mysql/include.texi
+share/mysql/czech/errmsg.sys
+share/mysql/czech/errmsg.txt
+share/mysql/dutch/errmsg.sys
+share/mysql/dutch/errmsg.txt
 share/mysql/english/errmsg.sys
 share/mysql/english/errmsg.txt
 share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
-share/mysql/swedish/errmsg.sys
-share/mysql/swedish/errmsg.txt
-share/mysql/czech/errmsg.sys
-share/mysql/czech/errmsg.txt
-share/mysql/polish/errmsg.sys
-share/mysql/polish/errmsg.txt
-share/mysql/spanish/errmsg.sys
-share/mysql/spanish/errmsg.txt
-share/mysql/norwegian/errmsg.sys
-share/mysql/norwegian/errmsg.txt
+share/mysql/mysql/db.frm
+share/mysql/mysql/host.frm
+share/mysql/mysql/user.frm
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
+share/mysql/norwegian/errmsg.sys
+share/mysql/norwegian/errmsg.txt
+share/mysql/polish/errmsg.sys
+share/mysql/polish/errmsg.txt
 share/mysql/portuguese/errmsg.sys
 share/mysql/portuguese/errmsg.txt
-share/mysql/dutch/errmsg.sys
-share/mysql/dutch/errmsg.txt
 share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
+share/mysql/spanish/errmsg.sys
+share/mysql/spanish/errmsg.txt
+share/mysql/swedish/errmsg.sys
+share/mysql/swedish/errmsg.txt
 @dirrm include/mysql
 @dirrm lib/mysql
 @dirrm share/doc/mysql
+@dirrm share/mysql/czech
+@dirrm share/mysql/dutch
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
-@dirrm share/mysql/swedish
-@dirrm share/mysql/czech
-@dirrm share/mysql/polish
-@dirrm share/mysql/spanish
+@dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
+@dirrm share/mysql/polish
 @dirrm share/mysql/portuguese
-@dirrm share/mysql/dutch
 @dirrm share/mysql/russian
+@dirrm share/mysql/spanish
+@dirrm share/mysql/swedish
 @dirrm share/mysql
+@exec %D/bin/mysql_install_db
+@exec /usr/bin/killall mysqld
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql51-server/pkg-plist b/databases/mysql51-server/pkg-plist
index e80389ed8a15..c79a7bae346d 100644
--- a/databases/mysql51-server/pkg-plist
+++ b/databases/mysql51-server/pkg-plist
@@ -1,9 +1,9 @@
 bin/add_file_priv
 bin/add_long_password
-bin/make_binary_distribution
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_binary_distribution
 bin/msql2mysql
 bin/mysql
 bin/mysql.server
@@ -12,73 +12,84 @@ bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbug
 bin/mysqldump
-bin/mysqlshow
 bin/mysqlimport
+bin/mysqlshow
 bin/perror
 bin/replace
 bin/safe_mysqld
 bin/which1
 bin/zap
 etc/rc.d/mysql.sh
+include/mysql/dbug.h
+include/mysql/errmsg.h
 include/mysql/m_ctype.h.in
 include/mysql/m_string.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
-include/mysql/dbug.h
-include/mysql/errmsg.h
 include/mysql/mysql_version.h
+@unexec install-info --delete %D/info/mysql.info %D/info/dir
+info/mysql.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/mysql.info %D/info/dir
+lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
-lib/mysql/libdbug.a
 libexec/mysqld
+man/man1/mysql.1.gz
+share/doc/mysql/include.texi
 share/doc/mysql/manual.html
 share/doc/mysql/manual.ps
 share/doc/mysql/manual.texi
 share/doc/mysql/manual.txt
 share/doc/mysql/manual_toc.html
-share/doc/mysql/include.texi
+share/mysql/czech/errmsg.sys
+share/mysql/czech/errmsg.txt
+share/mysql/dutch/errmsg.sys
+share/mysql/dutch/errmsg.txt
 share/mysql/english/errmsg.sys
 share/mysql/english/errmsg.txt
 share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
-share/mysql/swedish/errmsg.sys
-share/mysql/swedish/errmsg.txt
-share/mysql/czech/errmsg.sys
-share/mysql/czech/errmsg.txt
-share/mysql/polish/errmsg.sys
-share/mysql/polish/errmsg.txt
-share/mysql/spanish/errmsg.sys
-share/mysql/spanish/errmsg.txt
-share/mysql/norwegian/errmsg.sys
-share/mysql/norwegian/errmsg.txt
+share/mysql/mysql/db.frm
+share/mysql/mysql/host.frm
+share/mysql/mysql/user.frm
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
+share/mysql/norwegian/errmsg.sys
+share/mysql/norwegian/errmsg.txt
+share/mysql/polish/errmsg.sys
+share/mysql/polish/errmsg.txt
 share/mysql/portuguese/errmsg.sys
 share/mysql/portuguese/errmsg.txt
-share/mysql/dutch/errmsg.sys
-share/mysql/dutch/errmsg.txt
 share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
+share/mysql/spanish/errmsg.sys
+share/mysql/spanish/errmsg.txt
+share/mysql/swedish/errmsg.sys
+share/mysql/swedish/errmsg.txt
 @dirrm include/mysql
 @dirrm lib/mysql
 @dirrm share/doc/mysql
+@dirrm share/mysql/czech
+@dirrm share/mysql/dutch
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
-@dirrm share/mysql/swedish
-@dirrm share/mysql/czech
-@dirrm share/mysql/polish
-@dirrm share/mysql/spanish
+@dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
+@dirrm share/mysql/polish
 @dirrm share/mysql/portuguese
-@dirrm share/mysql/dutch
 @dirrm share/mysql/russian
+@dirrm share/mysql/spanish
+@dirrm share/mysql/swedish
 @dirrm share/mysql
+@exec %D/bin/mysql_install_db
+@exec /usr/bin/killall mysqld
diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql54-client/Makefile
+++ b/databases/mysql54-client/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql54-server/pkg-plist b/databases/mysql54-server/pkg-plist
index e80389ed8a15..c79a7bae346d 100644
--- a/databases/mysql54-server/pkg-plist
+++ b/databases/mysql54-server/pkg-plist
@@ -1,9 +1,9 @@
 bin/add_file_priv
 bin/add_long_password
-bin/make_binary_distribution
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_binary_distribution
 bin/msql2mysql
 bin/mysql
 bin/mysql.server
@@ -12,73 +12,84 @@ bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbug
 bin/mysqldump
-bin/mysqlshow
 bin/mysqlimport
+bin/mysqlshow
 bin/perror
 bin/replace
 bin/safe_mysqld
 bin/which1
 bin/zap
 etc/rc.d/mysql.sh
+include/mysql/dbug.h
+include/mysql/errmsg.h
 include/mysql/m_ctype.h.in
 include/mysql/m_string.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
-include/mysql/dbug.h
-include/mysql/errmsg.h
 include/mysql/mysql_version.h
+@unexec install-info --delete %D/info/mysql.info %D/info/dir
+info/mysql.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/mysql.info %D/info/dir
+lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
-lib/mysql/libdbug.a
 libexec/mysqld
+man/man1/mysql.1.gz
+share/doc/mysql/include.texi
 share/doc/mysql/manual.html
 share/doc/mysql/manual.ps
 share/doc/mysql/manual.texi
 share/doc/mysql/manual.txt
 share/doc/mysql/manual_toc.html
-share/doc/mysql/include.texi
+share/mysql/czech/errmsg.sys
+share/mysql/czech/errmsg.txt
+share/mysql/dutch/errmsg.sys
+share/mysql/dutch/errmsg.txt
 share/mysql/english/errmsg.sys
 share/mysql/english/errmsg.txt
 share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
-share/mysql/swedish/errmsg.sys
-share/mysql/swedish/errmsg.txt
-share/mysql/czech/errmsg.sys
-share/mysql/czech/errmsg.txt
-share/mysql/polish/errmsg.sys
-share/mysql/polish/errmsg.txt
-share/mysql/spanish/errmsg.sys
-share/mysql/spanish/errmsg.txt
-share/mysql/norwegian/errmsg.sys
-share/mysql/norwegian/errmsg.txt
+share/mysql/mysql/db.frm
+share/mysql/mysql/host.frm
+share/mysql/mysql/user.frm
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
+share/mysql/norwegian/errmsg.sys
+share/mysql/norwegian/errmsg.txt
+share/mysql/polish/errmsg.sys
+share/mysql/polish/errmsg.txt
 share/mysql/portuguese/errmsg.sys
 share/mysql/portuguese/errmsg.txt
-share/mysql/dutch/errmsg.sys
-share/mysql/dutch/errmsg.txt
 share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
+share/mysql/spanish/errmsg.sys
+share/mysql/spanish/errmsg.txt
+share/mysql/swedish/errmsg.sys
+share/mysql/swedish/errmsg.txt
 @dirrm include/mysql
 @dirrm lib/mysql
 @dirrm share/doc/mysql
+@dirrm share/mysql/czech
+@dirrm share/mysql/dutch
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
-@dirrm share/mysql/swedish
-@dirrm share/mysql/czech
-@dirrm share/mysql/polish
-@dirrm share/mysql/spanish
+@dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
+@dirrm share/mysql/polish
 @dirrm share/mysql/portuguese
-@dirrm share/mysql/dutch
 @dirrm share/mysql/russian
+@dirrm share/mysql/spanish
+@dirrm share/mysql/swedish
 @dirrm share/mysql
+@exec %D/bin/mysql_install_db
+@exec /usr/bin/killall mysqld
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
index e80389ed8a15..c79a7bae346d 100644
--- a/databases/mysql55-server/pkg-plist
+++ b/databases/mysql55-server/pkg-plist
@@ -1,9 +1,9 @@
 bin/add_file_priv
 bin/add_long_password
-bin/make_binary_distribution
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_binary_distribution
 bin/msql2mysql
 bin/mysql
 bin/mysql.server
@@ -12,73 +12,84 @@ bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbug
 bin/mysqldump
-bin/mysqlshow
 bin/mysqlimport
+bin/mysqlshow
 bin/perror
 bin/replace
 bin/safe_mysqld
 bin/which1
 bin/zap
 etc/rc.d/mysql.sh
+include/mysql/dbug.h
+include/mysql/errmsg.h
 include/mysql/m_ctype.h.in
 include/mysql/m_string.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
-include/mysql/dbug.h
-include/mysql/errmsg.h
 include/mysql/mysql_version.h
+@unexec install-info --delete %D/info/mysql.info %D/info/dir
+info/mysql.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/mysql.info %D/info/dir
+lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
-lib/mysql/libdbug.a
 libexec/mysqld
+man/man1/mysql.1.gz
+share/doc/mysql/include.texi
 share/doc/mysql/manual.html
 share/doc/mysql/manual.ps
 share/doc/mysql/manual.texi
 share/doc/mysql/manual.txt
 share/doc/mysql/manual_toc.html
-share/doc/mysql/include.texi
+share/mysql/czech/errmsg.sys
+share/mysql/czech/errmsg.txt
+share/mysql/dutch/errmsg.sys
+share/mysql/dutch/errmsg.txt
 share/mysql/english/errmsg.sys
 share/mysql/english/errmsg.txt
 share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
-share/mysql/swedish/errmsg.sys
-share/mysql/swedish/errmsg.txt
-share/mysql/czech/errmsg.sys
-share/mysql/czech/errmsg.txt
-share/mysql/polish/errmsg.sys
-share/mysql/polish/errmsg.txt
-share/mysql/spanish/errmsg.sys
-share/mysql/spanish/errmsg.txt
-share/mysql/norwegian/errmsg.sys
-share/mysql/norwegian/errmsg.txt
+share/mysql/mysql/db.frm
+share/mysql/mysql/host.frm
+share/mysql/mysql/user.frm
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
+share/mysql/norwegian/errmsg.sys
+share/mysql/norwegian/errmsg.txt
+share/mysql/polish/errmsg.sys
+share/mysql/polish/errmsg.txt
 share/mysql/portuguese/errmsg.sys
 share/mysql/portuguese/errmsg.txt
-share/mysql/dutch/errmsg.sys
-share/mysql/dutch/errmsg.txt
 share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
+share/mysql/spanish/errmsg.sys
+share/mysql/spanish/errmsg.txt
+share/mysql/swedish/errmsg.sys
+share/mysql/swedish/errmsg.txt
 @dirrm include/mysql
 @dirrm lib/mysql
 @dirrm share/doc/mysql
+@dirrm share/mysql/czech
+@dirrm share/mysql/dutch
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
-@dirrm share/mysql/swedish
-@dirrm share/mysql/czech
-@dirrm share/mysql/polish
-@dirrm share/mysql/spanish
+@dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
+@dirrm share/mysql/polish
 @dirrm share/mysql/portuguese
-@dirrm share/mysql/dutch
 @dirrm share/mysql/russian
+@dirrm share/mysql/spanish
+@dirrm share/mysql/swedish
 @dirrm share/mysql
+@exec %D/bin/mysql_install_db
+@exec /usr/bin/killall mysqld
diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql60-client/Makefile
+++ b/databases/mysql60-client/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index e80389ed8a15..c79a7bae346d 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -1,9 +1,9 @@
 bin/add_file_priv
 bin/add_long_password
-bin/make_binary_distribution
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_binary_distribution
 bin/msql2mysql
 bin/mysql
 bin/mysql.server
@@ -12,73 +12,84 @@ bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbug
 bin/mysqldump
-bin/mysqlshow
 bin/mysqlimport
+bin/mysqlshow
 bin/perror
 bin/replace
 bin/safe_mysqld
 bin/which1
 bin/zap
 etc/rc.d/mysql.sh
+include/mysql/dbug.h
+include/mysql/errmsg.h
 include/mysql/m_ctype.h.in
 include/mysql/m_string.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
-include/mysql/dbug.h
-include/mysql/errmsg.h
 include/mysql/mysql_version.h
+@unexec install-info --delete %D/info/mysql.info %D/info/dir
+info/mysql.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/mysql.info %D/info/dir
+lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
-lib/mysql/libdbug.a
 libexec/mysqld
+man/man1/mysql.1.gz
+share/doc/mysql/include.texi
 share/doc/mysql/manual.html
 share/doc/mysql/manual.ps
 share/doc/mysql/manual.texi
 share/doc/mysql/manual.txt
 share/doc/mysql/manual_toc.html
-share/doc/mysql/include.texi
+share/mysql/czech/errmsg.sys
+share/mysql/czech/errmsg.txt
+share/mysql/dutch/errmsg.sys
+share/mysql/dutch/errmsg.txt
 share/mysql/english/errmsg.sys
 share/mysql/english/errmsg.txt
 share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
-share/mysql/swedish/errmsg.sys
-share/mysql/swedish/errmsg.txt
-share/mysql/czech/errmsg.sys
-share/mysql/czech/errmsg.txt
-share/mysql/polish/errmsg.sys
-share/mysql/polish/errmsg.txt
-share/mysql/spanish/errmsg.sys
-share/mysql/spanish/errmsg.txt
-share/mysql/norwegian/errmsg.sys
-share/mysql/norwegian/errmsg.txt
+share/mysql/mysql/db.frm
+share/mysql/mysql/host.frm
+share/mysql/mysql/user.frm
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
+share/mysql/norwegian/errmsg.sys
+share/mysql/norwegian/errmsg.txt
+share/mysql/polish/errmsg.sys
+share/mysql/polish/errmsg.txt
 share/mysql/portuguese/errmsg.sys
 share/mysql/portuguese/errmsg.txt
-share/mysql/dutch/errmsg.sys
-share/mysql/dutch/errmsg.txt
 share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
+share/mysql/spanish/errmsg.sys
+share/mysql/spanish/errmsg.txt
+share/mysql/swedish/errmsg.sys
+share/mysql/swedish/errmsg.txt
 @dirrm include/mysql
 @dirrm lib/mysql
 @dirrm share/doc/mysql
+@dirrm share/mysql/czech
+@dirrm share/mysql/dutch
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
-@dirrm share/mysql/swedish
-@dirrm share/mysql/czech
-@dirrm share/mysql/polish
-@dirrm share/mysql/spanish
+@dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
+@dirrm share/mysql/polish
 @dirrm share/mysql/portuguese
-@dirrm share/mysql/dutch
 @dirrm share/mysql/russian
+@dirrm share/mysql/spanish
+@dirrm share/mysql/swedish
 @dirrm share/mysql
+@exec %D/bin/mysql_install_db
+@exec /usr/bin/killall mysqld
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 1b49c8cab250..05680d8383d9 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -3,17 +3,20 @@
 # Date created:				26 Jan 1998
 # Whom:					Josh Tiefenbach <josh@ican.net>
 #
-# $Id: Makefile,v 1.14 1998/01/13 04:48:26 asami Exp $
+# $Id: Makefile,v 1.15 1998/01/26 18:24:42 jfitz Exp $
 #
 
 DISTNAME=	mysql-3.21.21a-beta
 PKGNAME=	mysql-3.21.21b
 CATEGORIES=	databases
 MASTER_SITES=	http://www.buoy.com/mysql/Downloads/MySQL-3.21/ \
-					http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
-					http://www.tcx.se/Downloads/MySQL-3.21/ 
+		http://mysql.polaris.ca/Downloads/MySQL-3.21/ \
+		http://www.tcx.se/Downloads/MySQL-3.21/
+
 MAINTAINER=	josh@ican.net
 
+MAN1=		mysql.1
+
 USE_GMAKE=	YES
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
@@ -31,7 +34,9 @@ pre-install:
 	@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/check_old_version
 
 post-install:
-	cd ${WRKSRC} && ${WRKSRC}/scripts/mysql_install_db
+	${MKDIR} -p ${PREFIX}/share/mysql/mysql
+	${CP} ${WRKSRC}/data/mysql/*.frm ${PREFIX}/share/mysql/mysql
+	${PREFIX}/bin/mysql_install_db
 	@ /usr/bin/killall mysqld
 	@ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/mysql.sh
 	@ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/mysql.sh
diff --git a/databases/percona55-server/pkg-plist b/databases/percona55-server/pkg-plist
index e80389ed8a15..c79a7bae346d 100644
--- a/databases/percona55-server/pkg-plist
+++ b/databases/percona55-server/pkg-plist
@@ -1,9 +1,9 @@
 bin/add_file_priv
 bin/add_long_password
-bin/make_binary_distribution
 bin/comp_err
 bin/isamchk
 bin/isamlog
+bin/make_binary_distribution
 bin/msql2mysql
 bin/mysql
 bin/mysql.server
@@ -12,73 +12,84 @@ bin/mysqlaccess
 bin/mysqladmin
 bin/mysqlbug
 bin/mysqldump
-bin/mysqlshow
 bin/mysqlimport
+bin/mysqlshow
 bin/perror
 bin/replace
 bin/safe_mysqld
 bin/which1
 bin/zap
 etc/rc.d/mysql.sh
+include/mysql/dbug.h
+include/mysql/errmsg.h
 include/mysql/m_ctype.h.in
 include/mysql/m_string.h
 include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql_com.h
-include/mysql/dbug.h
-include/mysql/errmsg.h
 include/mysql/mysql_version.h
+@unexec install-info --delete %D/info/mysql.info %D/info/dir
+info/mysql.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/mysql.info %D/info/dir
+lib/mysql/libdbug.a
 lib/mysql/libheap.a
 lib/mysql/libmerge.a
 lib/mysql/libmysqlclient.a
 lib/mysql/libmystrings.a
 lib/mysql/libmysys.a
 lib/mysql/libnisam.a
-lib/mysql/libdbug.a
 libexec/mysqld
+man/man1/mysql.1.gz
+share/doc/mysql/include.texi
 share/doc/mysql/manual.html
 share/doc/mysql/manual.ps
 share/doc/mysql/manual.texi
 share/doc/mysql/manual.txt
 share/doc/mysql/manual_toc.html
-share/doc/mysql/include.texi
+share/mysql/czech/errmsg.sys
+share/mysql/czech/errmsg.txt
+share/mysql/dutch/errmsg.sys
+share/mysql/dutch/errmsg.txt
 share/mysql/english/errmsg.sys
 share/mysql/english/errmsg.txt
 share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
 share/mysql/german/errmsg.txt
-share/mysql/swedish/errmsg.sys
-share/mysql/swedish/errmsg.txt
-share/mysql/czech/errmsg.sys
-share/mysql/czech/errmsg.txt
-share/mysql/polish/errmsg.sys
-share/mysql/polish/errmsg.txt
-share/mysql/spanish/errmsg.sys
-share/mysql/spanish/errmsg.txt
-share/mysql/norwegian/errmsg.sys
-share/mysql/norwegian/errmsg.txt
+share/mysql/mysql/db.frm
+share/mysql/mysql/host.frm
+share/mysql/mysql/user.frm
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
+share/mysql/norwegian/errmsg.sys
+share/mysql/norwegian/errmsg.txt
+share/mysql/polish/errmsg.sys
+share/mysql/polish/errmsg.txt
 share/mysql/portuguese/errmsg.sys
 share/mysql/portuguese/errmsg.txt
-share/mysql/dutch/errmsg.sys
-share/mysql/dutch/errmsg.txt
 share/mysql/russian/errmsg.sys
 share/mysql/russian/errmsg.txt
+share/mysql/spanish/errmsg.sys
+share/mysql/spanish/errmsg.txt
+share/mysql/swedish/errmsg.sys
+share/mysql/swedish/errmsg.txt
 @dirrm include/mysql
 @dirrm lib/mysql
 @dirrm share/doc/mysql
+@dirrm share/mysql/czech
+@dirrm share/mysql/dutch
 @dirrm share/mysql/english
 @dirrm share/mysql/french
 @dirrm share/mysql/german
-@dirrm share/mysql/swedish
-@dirrm share/mysql/czech
-@dirrm share/mysql/polish
-@dirrm share/mysql/spanish
+@dirrm share/mysql/mysql
 @dirrm share/mysql/norwegian
 @dirrm share/mysql/norwegian-ny
+@dirrm share/mysql/polish
 @dirrm share/mysql/portuguese
-@dirrm share/mysql/dutch
 @dirrm share/mysql/russian
+@dirrm share/mysql/spanish
+@dirrm share/mysql/swedish
 @dirrm share/mysql
+@exec %D/bin/mysql_install_db
+@exec /usr/bin/killall mysqld