Sync with MySQL 4.0:

- get rid of perl dependency
- enhance man pages and scripts installation
- move additional scripts in mysql-scripts port

7 files changed, 97 insertions, 27 deletions

diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile
index 16daa7084996..6ff8784c0c7f 100644
--- a/databases/mysql323-client/Makefile
+++ b/databases/mysql323-client/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	1
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index bb69a2b0dbf8..7197b1bc0dc1 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	3.23.58
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	databases
 MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-3.23/ \
 		http://www.softagency.co.jp/MySQL/Downloads/MySQL-3.23/ \
@@ -94,10 +94,9 @@ CXXFLAGS+=	-fno-exceptions
 .endif
 
 # MySQL-Server part
-.if !defined(CLIENT_ONLY)
-USE_PERL5_RUN=	yes
-
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
+.if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY)
+USE_MYSQL=	yes
+WANT_MYSQL_VER=	323
 
 LATEST_LINK=	mysql323-server
 
@@ -106,6 +105,9 @@ CONFLICTS=	mysql-server-4.* mysql-server-5.*
 PLIST_SUB=	DB_DIR=${DB_DIR} \
 		MYSQL_VERSION=${PORTVERSION}
 
+MAN1=		isamchk.1 isamlog.1 mysqld.1 \
+		safe_mysqld.1 perror.1 replace.1
+
 DOCS=		manual.html manual.txt manual_toc.html
 
 INFO=		mysql
@@ -132,7 +134,9 @@ pre-fetch:
 	@${ECHO} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @docs_dirs@ @sql_server_dirs@ scripts man support-files|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in
 
 post-build:
@@ -161,18 +165,15 @@ post-install:
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/Docs/Flags/*.gif ${DOCSDIR}/Flags
 .endif
-	@${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
-	@install-info ${PREFIX}/info/mysql.info ${PREFIX}/info/dir
 
-# MySQL-Client part
 .else
+# MySQL-Client part
+.if defined(CLIENT_ONLY)
 LATEST_LINK=	mysql323-client
 
 CONFLICTS=	mysql-client-4.* mysql-client-5.*
 
-MAN1=		isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1  \
-		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
-		perror.1 replace.1 safe_mysqld.1
+MAN1=		mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
@@ -180,11 +181,37 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests scripts man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = mysql_config mysqlbug|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 
 post-install:
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh
 	@${CHMOD} 750 ${PREFIX}/etc/rc.d/000.mysql-client.sh
+
+.else
+# MySQL-Scripts part
+USE_MYSQL=	yes
+WANT_MYSQL_VER=	323
+USE_PERL5=	yes
+
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-Mysql
+
+LATEST_LINK=	mysql323-scripts
+
+CONFLICTS=	mysql-scripts-4.* mysql-scripts-5.*
+
+MAN1=		mysql_zap.1 mysqlaccess.1 mysqld_multi.1
+
+SCRIPTS=	msql2mysql mysql_setpermission mysql_zap mysqlaccess \
+		mysql_convert_table_format mysql_find_rows mysqlhotcopy \
+		mysqldumpslow mysqld_multi
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = ${SCRIPTS}|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
+.endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/mysql323-server/files/patch-man::Makefile.in b/databases/mysql323-server/files/patch-man::Makefile.in
new file mode 100644
index 000000000000..ce45c659d000
--- /dev/null
+++ b/databases/mysql323-server/files/patch-man::Makefile.in
@@ -0,0 +1,13 @@
+--- man/Makefile.in.orig	Thu Sep 11 13:49:30 2003
++++ man/Makefile.in	Sun Feb 29 12:05:54 2004
+@@ -188,9 +188,7 @@
+ thread_dirs = @thread_dirs@
+ uname_prog = @uname_prog@
+ 
+-man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
+-		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
+-		perror.1 replace.1 safe_mysqld.1
++man_MANS =
+ 
+ 
+ EXTRA_DIST = $(man_MANS)
diff --git a/databases/mysql323-server/files/patch-scripts::Makefile.in b/databases/mysql323-server/files/patch-scripts::Makefile.in
new file mode 100644
index 000000000000..8e18b201ea5b
--- /dev/null
+++ b/databases/mysql323-server/files/patch-scripts::Makefile.in
@@ -0,0 +1,32 @@
+--- scripts/Makefile.in.orig	Thu Sep 11 13:49:32 2003
++++ scripts/Makefile.in	Sun Feb 29 12:11:38 2004
+@@ -187,19 +187,7 @@
+ thread_dirs = @thread_dirs@
+ uname_prog = @uname_prog@
+ 
+-bin_SCRIPTS = @server_scripts@ \
+-			msql2mysql \
+-			mysql_config \
+-			mysql_fix_privilege_tables \
+-			mysql_setpermission \
+-			mysql_zap \
+-			mysqlaccess \
+-			mysqlbug \
+-			mysql_convert_table_format \
+-			mysql_find_rows \
+-			mysqlhotcopy \
+-			mysqldumpslow \
+-			mysqld_multi
++bin_SCRIPTS =
+ 
+ 
+ EXTRA_SCRIPTS = make_binary_distribution.sh \
+@@ -353,7 +341,7 @@
+ uninstall: uninstall-am
+ 
+ install-am: all-am
+-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
+ 
+ installcheck: installcheck-am
+ install-strip:
diff --git a/databases/mysql323-server/pkg-plist b/databases/mysql323-server/pkg-plist
index 2401ea803f3a..695b3f197fdc 100644
--- a/databases/mysql323-server/pkg-plist
+++ b/databases/mysql323-server/pkg-plist
@@ -1,23 +1,11 @@
 bin/comp_err
 bin/isamchk
 bin/isamlog
-bin/msql2mysql
 bin/my_print_defaults
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
-bin/mysql_config
-bin/mysql_convert_table_format
-bin/mysql_find_rows
-bin/mysql_fix_privilege_tables
 bin/mysql_install_db
-bin/mysql_setpermission
-bin/mysql_zap
-bin/mysqlaccess
-bin/mysqlbug
-bin/mysqld_multi
-bin/mysqldumpslow
-bin/mysqlhotcopy
 bin/pack_isam
 bin/perror
 bin/replace
@@ -129,7 +117,6 @@ share/mysql/japanese/errmsg.sys
 share/mysql/japanese/errmsg.txt
 share/mysql/korean/errmsg.sys
 share/mysql/korean/errmsg.txt
-share/mysql/make_binary_distribution
 share/mysql/mi_test_all
 share/mysql/mi_test_all.res
 share/mysql/my-huge.cnf
@@ -159,6 +146,7 @@ share/mysql/swedish/errmsg.sys
 share/mysql/swedish/errmsg.txt
 share/mysql/ukrainian/errmsg.sys
 share/mysql/ukrainian/errmsg.txt
+@unexec rmdir %D/lib/mysql 2> /dev/null || true
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/Flags
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/mysql/charsets
diff --git a/databases/mysql323-server/pkg-plist.client b/databases/mysql323-server/pkg-plist.client
index a7f3c1e20480..1eda7465a2c2 100644
--- a/databases/mysql323-server/pkg-plist.client
+++ b/databases/mysql323-server/pkg-plist.client
@@ -1,6 +1,8 @@
 bin/mysql
+bin/mysql_config
 bin/mysqladmin
 bin/mysqlbinlog
+bin/mysqlbug
 bin/mysqlcheck
 bin/mysqldump
 bin/mysqlimport
diff --git a/databases/mysql323-server/pkg-plist.scripts b/databases/mysql323-server/pkg-plist.scripts
new file mode 100644
index 000000000000..849199e8fe75
--- /dev/null
+++ b/databases/mysql323-server/pkg-plist.scripts
@@ -0,0 +1,9 @@
+bin/msql2mysql
+bin/mysql_convert_table_format
+bin/mysql_find_rows
+bin/mysql_setpermission
+bin/mysql_zap
+bin/mysqlaccess
+bin/mysqld_multi
+bin/mysqldumpslow
+bin/mysqlhotcopy