4 files changed, 23 insertions, 4 deletions

diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index b2596b15ce84..69e50464de8c 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -143,7 +143,7 @@ pre-fetch:
 post-patch:
 	@${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|install-exec-am install-data-am|install-exec-am|g" ${WRKSRC}/scripts/Makefile.in
+	@${REINPLACE_CMD} -e "s|dist_pkgdata_DATA =|dist_pkgdata_DATA = fill_help_tables.sql|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
 
@@ -197,6 +197,7 @@ CONFIGURE_ARGS+=--without-server
 post-patch:
 	@${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|dist_pkgdata_DATA =|dist_pkgdata_DATA = mysql_fix_privilege_tables.sql|g" ${WRKSRC}/scripts/Makefile.in
 	@${REINPLACE_CMD} -e "s|man_MANS =|man_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 
 post-install:
diff --git a/databases/mysql60-server/files/patch-scripts::Makefile.in b/databases/mysql60-server/files/patch-scripts::Makefile.in
index 4077597e4be2..9010d283909f 100644
--- a/databases/mysql60-server/files/patch-scripts::Makefile.in
+++ b/databases/mysql60-server/files/patch-scripts::Makefile.in
@@ -1,5 +1,5 @@
---- scripts/Makefile.in.orig	Mon Dec  1 13:55:32 2003
-+++ scripts/Makefile.in	Sun Feb 29 00:35:51 2004
+--- scripts/Makefile.in.orig	Tue Mar  2 12:25:53 2004
++++ scripts/Makefile.in	Tue Mar  2 12:26:20 2004
 @@ -203,25 +203,7 @@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
@@ -27,3 +27,21 @@
  
  
  EXTRA_SCRIPTS = make_binary_distribution.sh \
+@@ -254,7 +236,7 @@
+ 			mysqlbug
+ 
+ 
+-dist_pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
++dist_pkgdata_DATA =
+ 
+ # mysqlbug should be distributed built so that people can report build
+ # failures with it.
+@@ -510,8 +492,6 @@
+ 
+ all: fill_help_tables.sql make_win_src_distribution make_binary_distribution make_sharedlib_distribution
+ 
+-fill_help_tables.sql: fill_help_tables ../Docs/manual.texi
+-		./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/databases/mysql60-server/pkg-plist b/databases/mysql60-server/pkg-plist
index 0f2ee9c4bc82..8e466ecb4074 100644
--- a/databases/mysql60-server/pkg-plist
+++ b/databases/mysql60-server/pkg-plist
@@ -118,6 +118,7 @@ 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
diff --git a/databases/mysql60-server/pkg-plist.client b/databases/mysql60-server/pkg-plist.client
index 0d99cd176c93..e260e22590c8 100644
--- a/databases/mysql60-server/pkg-plist.client
+++ b/databases/mysql60-server/pkg-plist.client
@@ -47,7 +47,6 @@ 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