Refresh the lists of man pages. Closes PR 38998.

(Because of the partitioning into client and server packages, the man
pages have to be partitioned to match; this interferes with the
configure script's handling of them so the list of pages ends up
hardcoded in these patches. And it seems the lists haven't been
updated since the first mysql 5.x package.)

8 files changed, 109 insertions, 18 deletions

diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index bf2d5e73dbe..751b149562f 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2015/06/12 10:48:36 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2015/06/18 04:29:51 dholland Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	4
+PKGREVISION=	5
 COMMENT=	MySQL 5, a free SQL database (client)
 
 CONFLICTS=	mysql3-client-[0-9]*
diff --git a/databases/mysql51-client/PLIST b/databases/mysql51-client/PLIST
index 31d188fe1fe..036279ac0bf 100644
--- a/databases/mysql51-client/PLIST
+++ b/databases/mysql51-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/09/21 15:57:30 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/06/18 04:29:51 dholland Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -57,13 +57,29 @@ include/mysql/typelib.h
 info/mysql.info
 lib/mysql/libmysqlclient.la
 lib/mysql/libmysqlclient_r.la
+man/man1/msql2mysql.1
 man/man1/mysql.1
+man/man1/mysql_config.1
+man/man1/mysql_convert_table_format.1
+man/man1/mysql_find_rows.1
+man/man1/mysql_fix_extensions.1
 man/man1/mysql_fix_privilege_tables.1
+man/man1/mysql_setpermission.1
+man/man1/mysql_upgrade.1
 man/man1/mysql_zap.1
 man/man1/mysqlaccess.1
 man/man1/mysqladmin.1
+man/man1/mysqlbinlog.1
+man/man1/mysqlbug.1
+man/man1/mysqlcheck.1
 man/man1/mysqldump.1
+man/man1/mysqldumpslow.1
+man/man1/mysqlhotcopy.1
+man/man1/mysqlimport.1
+man/man1/mysqlman.1
 man/man1/mysqlshow.1
+man/man1/mysqlslap.1
+man/man1/mysqltest.1
 share/examples/mysql/my-huge.cnf
 share/examples/mysql/my-innodb-heavy-4G.cnf
 share/examples/mysql/my-large.cnf
diff --git a/databases/mysql51-client/distinfo b/databases/mysql51-client/distinfo
index 88014f01684..9d6ccf6fe5c 100644
--- a/databases/mysql51-client/distinfo
+++ b/databases/mysql51-client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2013/10/01 11:00:39 adam Exp $
+$NetBSD: distinfo,v 1.27 2015/06/18 04:29:51 dholland Exp $
 
 SHA1 (mysql-5.1.72.tar.gz) = af1f46e56402b38a085ac592cd7df3aa25e9cea2
 RMD160 (mysql-5.1.72.tar.gz) = a5ba8bedf4027af90a4612a1a7f3a848999cfbf5
@@ -17,7 +17,7 @@ SHA1 (patch-ak) = af5309d7a5b48042368936c7540f90df3dc4aafe
 SHA1 (patch-am) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af
 SHA1 (patch-an) = a608060cee7aadaf8bcde84016a73131a75dea32
 SHA1 (patch-ao) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a
-SHA1 (patch-ap) = 8d27b99a54071dce99f3b287676ed88c93028cc0
+SHA1 (patch-ap) = 6ebebc93e7bbcf4cd5bb7c9284c7587558a61784
 SHA1 (patch-aq) = d04016a2ab84709aee0c08aef71c2f79e82fc6f3
 SHA1 (patch-ar) = bc0e2083ec285be8adac1027e63bf076e4c57211
 SHA1 (patch-as) = 5eb3a9308b13a25fa813db0ed4a06f8e43db74f6
diff --git a/databases/mysql51-client/patches/patch-ap b/databases/mysql51-client/patches/patch-ap
index 7551cac44ef..73418338cf0 100644
--- a/databases/mysql51-client/patches/patch-ap
+++ b/databases/mysql51-client/patches/patch-ap
@@ -1,17 +1,23 @@
-$NetBSD: patch-ap,v 1.3 2010/09/21 15:57:30 taca Exp $
+$NetBSD: patch-ap,v 1.4 2015/06/18 04:29:51 dholland Exp $
 
-* Tweak installig manual pages for client package.
+* Install only the man pages corresponding to the binaries that appear
+in the client package. Note: this list will need to be refreshed
+manually if new man pages appear in the distfile.
 
 --- man/Makefile.in.orig	2010-07-09 12:38:13.000000000 +0000
 +++ man/Makefile.in
-@@ -381,8 +381,9 @@ yassl_libs = @yassl_libs@
+@@ -381,8 +381,13 @@ yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  yassl_thread_cxxflags = @yassl_thread_cxxflags@
  zlib_dir = @zlib_dir@
 -man1_MANS = @man1_files@
 -man8_MANS = @man8_files@
-+man1_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \
-+	mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
++man1_MANS = msql2mysql.1 mysql.1 mysql_config.1 mysql_convert_table_format.1 \
++	mysql_find_rows.1 mysql_fix_extensions.1 mysql_fix_privilege_tables.1 \
++	mysql_setpermission.1 mysql_upgrade.1 mysql_zap.1 mysqlaccess.1 \
++	mysqladmin.1 mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 mysqldump.1 \
++	mysqldumpslow.1 mysqlhotcopy.1 mysqlimport.1 mysqlman.1 mysqlshow.1 \
++	mysqlslap.1 mysqltest.1
 +man8_MANS = 
  EXTRA_DIST = $(man1_MANS) $(man8_MANS)
  all: all-am
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 1db66d6c123..0491c8bc86a 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2015/03/22 07:44:43 fhajny Exp $
+# $NetBSD: Makefile,v 1.27 2015/06/18 04:29:51 dholland Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	4
+PKGREVISION=	5
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=		mysql3-server-[0-9]*
diff --git a/databases/mysql51-server/PLIST b/databases/mysql51-server/PLIST
index 267fc24dfe9..bba8c3600c8 100644
--- a/databases/mysql51-server/PLIST
+++ b/databases/mysql51-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2014/03/11 14:05:00 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.26 2015/06/18 04:29:51 dholland Exp $
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -86,7 +86,51 @@ ${PLIST.manager}libexec/mysqlmanager
 ${PLIST.ndb}libexec/ndb_cpcd
 ${PLIST.ndb}libexec/ndb_mgmd
 ${PLIST.ndb}libexec/ndbd
+man/man1/comp_err.1
+man/man1/innochecksum.1
+man/man1/my_print_defaults.1
+man/man1/myisam_ftdump.1
+man/man1/myisamchk.1
+man/man1/myisamlog.1
+man/man1/myisampack.1
+man/man1/mysql-stress-test.pl.1
+man/man1/mysql-test-run.pl.1
+man/man1/mysql.server.1
+man/man1/mysql_client_test.1
+man/man1/mysql_client_test_embedded.1
+man/man1/mysql_install_db.1
+man/man1/mysql_secure_installation.1
+man/man1/mysql_tzinfo_to_sql.1
+man/man1/mysql_waitpid.1
 man/man1/mysqld_multi.1
+man/man1/mysqld_safe.1
+man/man1/mysqltest_embedded.1
+man/man1/ndb-common-options.1
+man/man1/ndb_blob_tool.1
+man/man1/ndb_config.1
+man/man1/ndb_cpcd.1
+man/man1/ndb_delete_all.1
+man/man1/ndb_desc.1
+man/man1/ndb_drop_index.1
+man/man1/ndb_drop_table.1
+man/man1/ndb_error_reporter.1
+man/man1/ndb_index_stat.1
+man/man1/ndb_mgm.1
+man/man1/ndb_print_backup_file.1
+man/man1/ndb_print_schema_file.1
+man/man1/ndb_print_sys_file.1
+man/man1/ndb_restore.1
+man/man1/ndb_select_all.1
+man/man1/ndb_select_count.1
+man/man1/ndb_show_tables.1
+man/man1/ndb_size.pl.1
+man/man1/ndb_waiter.1
+man/man1/ndbd_redo_log_reader.1
+man/man1/ndbinfo_select_all.1
+man/man1/perror.1
+man/man1/replace.1
+man/man1/resolve_stack_dump.1
+man/man1/resolveip.1
 man/man8/mysqld.8
 man/man8/mysqlmanager.8
 ${PLIST.ndb}man/man8/ndb_mgmd.8
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index d3acedc4e07..4878796cd1b 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2013/10/01 11:00:39 adam Exp $
+$NetBSD: distinfo,v 1.31 2015/06/18 04:29:51 dholland Exp $
 
 SHA1 (mysql-5.1.72.tar.gz) = af1f46e56402b38a085ac592cd7df3aa25e9cea2
 RMD160 (mysql-5.1.72.tar.gz) = a5ba8bedf4027af90a4612a1a7f3a848999cfbf5
@@ -12,7 +12,7 @@ SHA1 (patch-af) = 1e13ba542b4fc2a1d59fc822d06c76bc4e92dc23
 SHA1 (patch-ag) = 85df1a0080376c5aff1a963e5532cb2c1ec5949d
 SHA1 (patch-ah) = a608060cee7aadaf8bcde84016a73131a75dea32
 SHA1 (patch-ai) = 4c5acf2b0e05765a1fe9e30558d163886e1aa492
-SHA1 (patch-aj) = b8f35d3a1bc45eb5336ae6a842898b257d2660db
+SHA1 (patch-aj) = 6534cf0279e3cd89ccf95ee19bac28e9bfc49dad
 SHA1 (patch-ak) = 3c740b78afacfe05aa082c5b235c10c51ac94641
 SHA1 (patch-al) = ca9406a8b01dffb3f515f132fa7aaef66c78f2be
 SHA1 (patch-am) = 2cf10915f5dc3caf11bb8c7c7255842da646b247
diff --git a/databases/mysql51-server/patches/patch-aj b/databases/mysql51-server/patches/patch-aj
index a78bd200de3..21e9097cdab 100644
--- a/databases/mysql51-server/patches/patch-aj
+++ b/databases/mysql51-server/patches/patch-aj
@@ -1,13 +1,38 @@
-$NetBSD: patch-aj,v 1.2 2010/08/11 23:18:04 taca Exp $
+$NetBSD: patch-aj,v 1.3 2015/06/18 04:29:51 dholland Exp $
+
+* Install only the man pages corresponding to the binaries that appear
+in the server package. Note: this list will need to be refreshed
+manually if new man pages appear in the distfile.
+
+Note: owing to complications the section 1 ndb and embedded server man
+pages are installed unconditionally, ignoring the package options. The
+configure script knows how to turn them off; but it does not know how
+to partition the pages between the client and server packges, and
+doing both would be Interesting(TM). (And not particularly worthwhile
+as this is an old mysql package and probably won't hang around all
+that much longer...)
 
 --- man/Makefile.in.orig	2010-07-09 12:38:13.000000000 +0000
 +++ man/Makefile.in
-@@ -381,7 +381,7 @@ yassl_libs = @yassl_libs@
+@@ -381,7 +381,20 @@ yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  yassl_thread_cxxflags = @yassl_thread_cxxflags@
  zlib_dir = @zlib_dir@
 -man1_MANS = @man1_files@
-+man1_MANS = mysqld_multi.1
++man1_MANS = comp_err.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 \
++	myisamchk.1 myisamlog.1 myisampack.1 mysql-stress-test.pl.1 \
++	mysql-test-run.pl.1 mysql.server.1 mysql_client_test.1 \
++	mysql_client_test_embedded.1 mysql_install_db.1 \
++	mysql_secure_installation.1 mysql_tzinfo_to_sql.1 \
++	mysql_waitpid.1 mysqld_multi.1 mysqld_safe.1 mysqltest_embedded.1 \
++	ndb-common-options.1 ndb_blob_tool.1 ndb_config.1 ndb_cpcd.1 \
++	ndb_delete_all.1 ndb_desc.1 ndb_drop_index.1 ndb_drop_table.1 \
++	ndb_error_reporter.1 ndb_index_stat.1 ndb_mgm.1 \
++	ndb_print_backup_file.1 ndb_print_schema_file.1 \
++	ndb_print_sys_file.1 ndb_restore.1 ndb_select_all.1 \
++	ndb_select_count.1 ndb_show_tables.1 ndb_size.pl.1 ndb_waiter.1 \
++	ndbd_redo_log_reader.1 ndbinfo_select_all.1 perror.1 replace.1 \
++	resolve_stack_dump.1 resolveip.1
  man8_MANS = @man8_files@
  EXTRA_DIST = $(man1_MANS) $(man8_MANS)
  all: all-am