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, 108 insertions, 33 deletions

diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile
index c7f06b1749e1..7362acc9af88 100644
--- a/databases/mysql41-client/Makefile
+++ b/databases/mysql41-client/Makefile
@@ -6,7 +6,6 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	0
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index abb334893b20..84e9024e9fd3 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	mysql
 PORTVERSION=	4.1.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
 		http://www.softagency.co.jp/MySQL/Downloads/MySQL-4.1/ \
@@ -102,10 +102,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-DBD-mysql41
+.if !defined(CLIENT_ONLY) && !defined(SCRIPTS_ONLY)
+USE_MYSQL=	yes
+WANT_MYSQL_VER=	41
 
 LATEST_LINK=	mysql41-server
 
@@ -113,6 +112,9 @@ CONFLICTS=	mysql-server-3.* mysql-server-4.[02-9].* mysql-server-5.*
 
 PLIST_SUB=	DB_DIR=${DB_DIR}
 
+MAN1=		isamchk.1 isamlog.1 mysqld.1 \
+		mysqld_safe.1 perror.1 replace.1
+
 DOCS=		manual.html manual.txt manual_toc.html
 
 INFO=		mysql
@@ -139,7 +141,10 @@ 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 @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|install-exec-am install-data-am|install-exec-am|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:
@@ -177,15 +182,14 @@ post-install:
 	@${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=	mysql41-client
 
 CONFLICTS=	mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.*
 
-MAN1=		isamchk.1 isamlog.1 mysql.1 mysql_zap.1 mysqlaccess.1  \
-		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqld_safe.1 mysqldump.1 \
-		mysql_fix_privilege_tables.1 mysqlshow.1 perror.1 replace.1
+MAN1=		mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
@@ -193,11 +197,40 @@ 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 mysql_fix_privilege_tables 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=	41
+USE_PERL5=	yes
+
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql41
+
+LATEST_LINK=	mysql41-scripts
+
+CONFLICTS=	mysql-scripts-3.* mysql-scripts-4.[02-9].* mysql-scripts-5.*
+
+MAN1=		mysql_zap.1 mysqlaccess.1 mysqld_multi.1 mysql_fix_privilege_tables.1
+
+SCRIPTS=	msql2mysql mysql_fix_extensions mysql_setpermission \
+		mysql_secure_installation mysql_zap mysqlaccess \
+		mysql_convert_table_format mysql_find_rows mysqlhotcopy \
+		mysqldumpslow mysql_explain_log mysql_tableinfo mysqld_multi \
+		mysql_create_system_tables
+
+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|install-exec-am install-data-am|install-exec-am|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/mysql41-server/files/patch-man::Makefile.in b/databases/mysql41-server/files/patch-man::Makefile.in
new file mode 100644
index 000000000000..86d18cec61b2
--- /dev/null
+++ b/databases/mysql41-server/files/patch-man::Makefile.in
@@ -0,0 +1,13 @@
+--- man/Makefile.in.orig	Mon Feb 23 14:54:10 2004
++++ man/Makefile.in	Mon Feb 23 14:54:34 2004
+@@ -272,9 +272,7 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+ 
+-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 mysqld_safe.1 mysql_fix_privilege_tables.1
++man_MANS =
+ 
+ 
+ EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
diff --git a/databases/mysql41-server/files/patch-scripts::Makefile.in b/databases/mysql41-server/files/patch-scripts::Makefile.in
new file mode 100644
index 000000000000..4077597e4be2
--- /dev/null
+++ b/databases/mysql41-server/files/patch-scripts::Makefile.in
@@ -0,0 +1,29 @@
+--- scripts/Makefile.in.orig	Mon Dec  1 13:55:32 2003
++++ scripts/Makefile.in	Sun Feb 29 00:35:51 2004
+@@ -203,25 +203,7 @@
+ vio_dir = @vio_dir@
+ vio_libs = @vio_libs@
+ 
+-bin_SCRIPTS = @server_scripts@ \
+-			msql2mysql \
+-			mysql_config \
+-			mysql_fix_privilege_tables \
+-			mysql_fix_extensions \
+-			mysql_setpermission \
+-			mysql_secure_installation \
+-			mysql_zap \
+-			mysqlaccess \
+-			mysqlbug \
+-			mysql_convert_table_format \
+-			mysql_find_rows \
+-			mysqlhotcopy \
+-			mysqldumpslow \
+-			mysql_explain_log \
+-			mysql_tableinfo \
+-			mysqld_multi \
+-			make_win_src_distribution \
+-			mysql_create_system_tables
++bin_SCRIPTS =
+ 
+ 
+ EXTRA_SCRIPTS = make_binary_distribution.sh \
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index aa0a0f84b32d..0f2ee9c4bc82 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-server/pkg-plist
@@ -1,31 +1,13 @@
 bin/comp_err
 bin/isamchk
 bin/isamlog
-bin/make_win_src_distribution
-bin/msql2mysql
 bin/my_print_defaults
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
-bin/mysql_config
-bin/mysql_convert_table_format
-bin/mysql_create_system_tables
-bin/mysql_explain_log
-bin/mysql_find_rows
-bin/mysql_fix_extensions
-bin/mysql_fix_privilege_tables
 bin/mysql_install_db
-bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_tableinfo
 bin/mysql_waitpid
-bin/mysql_zap
-bin/mysqlaccess
-bin/mysqlbug
-bin/mysqld_multi
 bin/mysqld_safe
-bin/mysqldumpslow
-bin/mysqlhotcopy
 bin/pack_isam
 bin/perror
 bin/replace
@@ -136,7 +118,6 @@ share/mysql/english/errmsg.sys
 share/mysql/english/errmsg.txt
 share/mysql/estonian/errmsg.sys
 share/mysql/estonian/errmsg.txt
-share/mysql/fill_help_tables.sql
 share/mysql/french/errmsg.sys
 share/mysql/french/errmsg.txt
 share/mysql/german/errmsg.sys
@@ -158,7 +139,6 @@ share/mysql/my-large.cnf
 share/mysql/my-medium.cnf
 share/mysql/my-small.cnf
 share/mysql/mysql-log-rotate
-share/mysql/mysql_fix_privilege_tables.sql
 share/mysql/mysql.server
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian-ny/errmsg.txt
@@ -180,6 +160,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
@@ -205,6 +186,6 @@ share/mysql/ukrainian/errmsg.txt
 @dirrm share/mysql/spanish
 @dirrm share/mysql/swedish
 @dirrm share/mysql/ukrainian
-@dirrm share/mysql
+@unexec rmdir %D/share/mysql 2> /dev/null || true
 @exec [ -d %%DB_DIR%% ] || %D/bin/mysql_install_db --ldata=%%DB_DIR%%
 @unexec /usr/bin/killall mysqld > /dev/null 2>&1 || true
diff --git a/databases/mysql41-server/pkg-plist.client b/databases/mysql41-server/pkg-plist.client
index 533b94e70c5e..0d99cd176c93 100644
--- a/databases/mysql41-server/pkg-plist.client
+++ b/databases/mysql41-server/pkg-plist.client
@@ -1,6 +1,9 @@
 bin/mysql
+bin/mysql_config
+bin/mysql_fix_privilege_tables
 bin/mysqladmin
 bin/mysqlbinlog
+bin/mysqlbug
 bin/mysqlcheck
 bin/mysqldump
 bin/mysqlimport
@@ -44,5 +47,8 @@ lib/mysql/libmysqlclient.so.14
 lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.so
 lib/mysql/libmysqlclient_r.so.14
+share/mysql/fill_help_tables.sql
+share/mysql/mysql_fix_privilege_tables.sql
 @dirrm include/mysql
 @dirrm lib/mysql
+@dirrm share/mysql
diff --git a/databases/mysql41-server/pkg-plist.scripts b/databases/mysql41-server/pkg-plist.scripts
new file mode 100644
index 000000000000..5a8bc1cfb7de
--- /dev/null
+++ b/databases/mysql41-server/pkg-plist.scripts
@@ -0,0 +1,14 @@
+bin/msql2mysql
+bin/mysql_convert_table_format
+bin/mysql_create_system_tables
+bin/mysql_explain_log
+bin/mysql_find_rows
+bin/mysql_fix_extensions
+bin/mysql_secure_installation
+bin/mysql_setpermission
+bin/mysql_tableinfo
+bin/mysql_zap
+bin/mysqlaccess
+bin/mysqld_multi
+bin/mysqldumpslow
+bin/mysqlhotcopy