Update to 5.0.16.

For information about changes please see:
http://dev.mysql.com/doc/refman/5.0/en/news-5-0-16.html

10 files changed, 104 insertions, 78 deletions

diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index 309b1013630..b58bab0e436 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.2 2005/11/09 19:48:44 tv Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/12/02 08:13:26 xtraeme Exp $
 
-DISTNAME=		mysql-5.0.15
+DISTNAME=		mysql-5.0.16
 CATEGORIES=		databases
 MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.0/ \
 			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-5.0/ \
@@ -72,7 +72,7 @@ CONFIGURE_ARGS+=	--enable-assembler
 .endif
 
 # Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+=		F77=${FALSE}
+CONFIGURE_ENV+=		F77=${FALSE:Q}
 
 CPPFLAGS+=		-Dunix
 CFLAGS+=		-DUSE_OLD_FUNCTIONS # 3.23.x compat
@@ -99,9 +99,8 @@ LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
 SUBST_CLASSES+=		mk scripts
 SUBST_STAGE.mk=		post-patch
-SUBST_FILES.mk=		dbug/Makefile.in heap/Makefile.in isam/Makefile.in \
-			merge/Makefile.in mysys/Makefile.in \
-			strings/Makefile.in
+SUBST_FILES.mk=		dbug/Makefile.in heap/Makefile.in	\
+			mysys/Makefile.in strings/Makefile.in
 SUBST_SED.mk=		-e "/^install-exec:/s/install-pkglibLIBRARIES//"
 SUBST_MESSAGE.mk=	"Fixing Makefiles."
 SUBST_STAGE.scripts=	post-patch
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo
index e50499a35f7..fed02ace453 100644
--- a/databases/mysql5-client/distinfo
+++ b/databases/mysql5-client/distinfo
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
 
-SHA1 (mysql-5.0.15.tar.gz) = b6092615de6ef5f861f91810413007c1c63058cf
-RMD160 (mysql-5.0.15.tar.gz) = 6a8007f5d12b945b8c3560d27abe98d41abecaf5
-Size (mysql-5.0.15.tar.gz) = 18813065 bytes
+SHA1 (mysql-5.0.16.tar.gz) = 28f7a20ffefcade3c1cce7250e9d3ea1fa33ab37
+RMD160 (mysql-5.0.16.tar.gz) = ec3108fc8fe043db54329af66a7f99e2da8c716c
+Size (mysql-5.0.16.tar.gz) = 19031670 bytes
 SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
 SHA1 (patch-ac) = c97ef88d13cba67b79cdb40fc23facf29edbe0b8
 SHA1 (patch-ad) = aab3c8771e398ecab6b7f6c1a85ffaf60f324053
-SHA1 (patch-ae) = 29c830c2eb6cc1ff74cbc4f9d9daa6555734e544
-SHA1 (patch-af) = 6134efe7043eec4cf2acd8eb272108d38bab5be8
+SHA1 (patch-ae) = 1b0b3886e0a4a8e52a3ab5bdf59db281b05caf6a
+SHA1 (patch-af) = bafd3a6bfad180473549278dd5c92a8d7ac889ef
 SHA1 (patch-ag) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
 SHA1 (patch-ah) = bd34391e522ae12ee63ec6a734f7a31116b2918d
 SHA1 (patch-ai) = 242c97ab4658838a6001d9c288e01209abfcee77
 SHA1 (patch-aj) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a
+SHA1 (patch-ak) = a09c2bf961d0e40e328d246e821efc36461dbdf8
diff --git a/databases/mysql5-client/patches/patch-ae b/databases/mysql5-client/patches/patch-ae
index 9ebeff55fdd..3e74805fdda 100644
--- a/databases/mysql5-client/patches/patch-ae
+++ b/databases/mysql5-client/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+$NetBSD: patch-ae,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
 
---- scripts/Makefile.in.orig	2005-10-31 09:12:57.000000000 +0100
-+++ scripts/Makefile.in	2005-10-31 09:13:33.000000000 +0100
-@@ -337,23 +337,10 @@
- yassl_dir = @yassl_dir@
- yassl_integer_extra_cxxflags = @yassl_integer_extra_cxxflags@
+--- scripts/Makefile.in.orig	2005-11-29 20:46:22.000000000 +0100
++++ scripts/Makefile.in	2005-11-29 20:47:23.000000000 +0100
+@@ -341,23 +341,10 @@
+ yassl_libs = @yassl_libs@
+ yassl_libs_with_path = @yassl_libs_with_path@
  zlib_dir = @zlib_dir@
 -bin_SCRIPTS = @server_scripts@ \
 -			msql2mysql \
diff --git a/databases/mysql5-client/patches/patch-af b/databases/mysql5-client/patches/patch-af
index 37d4f0c1fd4..5570a08a2d5 100644
--- a/databases/mysql5-client/patches/patch-af
+++ b/databases/mysql5-client/patches/patch-af
@@ -1,16 +1,15 @@
-$NetBSD: patch-af,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+$NetBSD: patch-af,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
 
---- man/Makefile.in.orig	2005-10-31 09:11:58.000000000 +0100
-+++ man/Makefile.in	2005-10-31 09:12:27.000000000 +0100
-@@ -334,9 +334,8 @@
- yassl_dir = @yassl_dir@
- yassl_integer_extra_cxxflags = @yassl_integer_extra_cxxflags@
+--- man/Makefile.in.orig	2005-11-29 20:47:54.000000000 +0100
++++ man/Makefile.in	2005-11-29 20:49:58.000000000 +0100
+@@ -338,7 +338,9 @@
+ yassl_libs = @yassl_libs@
+ yassl_libs_with_path = @yassl_libs_with_path@
  zlib_dir = @zlib_dir@
--man_MANS = mysql.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 =	mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \
-+		mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
+-man1_MANS = @man1_files@
++man1_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \
++	    mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
++
+ EXTRA_DIST = $(man1_MANS)
+ all: all-am
  
- EXTRA_DIST = mysql.1.in mysql_zap.1.in \
- 		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
diff --git a/databases/mysql5-client/patches/patch-ak b/databases/mysql5-client/patches/patch-ak
new file mode 100644
index 00000000000..fbaf8e1d64d
--- /dev/null
+++ b/databases/mysql5-client/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2005/12/02 08:13:26 xtraeme Exp $
+
+--- mysys/Makefile.in.orig	2005-12-02 08:52:03.000000000 +0100
++++ mysys/Makefile.in	2005-12-02 08:52:12.000000000 +0100
+@@ -473,7 +473,7 @@
+ INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
+ 			-I$(top_srcdir)/include -I$(srcdir)
+ 
+-pkglib_LIBRARIES = libmysys.a
++pkglib_LIBRARIES =
+ LDADD = libmysys.a ../dbug/libdbug.a \
+ 			../strings/libmystrings.a
+ 
diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile
index 11a88f5cbc1..49175b864b0 100644
--- a/databases/mysql5-server/Makefile
+++ b/databases/mysql5-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 #PKGREVISION=		1
@@ -7,7 +7,7 @@ COMMENT=		MySQL 5, a free SQL database (server)
 
 CONFLICTS=		{mysql-server-[0-9]*,mysql3-server-[0-9]*}
 
-.include "../mysql5-client/Makefile.common"
+.include "../../databases/mysql5-client/Makefile.common"
 
 CONFIGURE_ARGS+=	--with-libwrap
 CONFIGURE_ARGS+=	--with-raid
diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST
index d9d2f158fe2..986ceda608e 100644
--- a/databases/mysql5-server/PLIST
+++ b/databases/mysql5-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -37,6 +37,7 @@ share/mysql-test/client-cert.pem
 share/mysql-test/client-key.pem
 share/mysql-test/include/big_test.inc
 share/mysql-test/include/check_var_limit.inc
+share/mysql-test/include/common-tests.inc
 share/mysql-test/include/ctype_common.inc
 share/mysql-test/include/ctype_filesort.inc
 share/mysql-test/include/ctype_innodb_like.inc
@@ -44,6 +45,7 @@ share/mysql-test/include/ctype_like_escape.inc
 share/mysql-test/include/endspace.inc
 share/mysql-test/include/federated.inc
 share/mysql-test/include/federated_cleanup.inc
+share/mysql-test/include/gis_generic.inc
 share/mysql-test/include/have_archive.inc
 share/mysql-test/include/have_bdb.inc
 share/mysql-test/include/have_big5.inc
@@ -64,7 +66,6 @@ share/mysql-test/include/have_lowercase0.inc
 share/mysql-test/include/have_multi_ndb.inc
 share/mysql-test/include/have_ndb.inc
 share/mysql-test/include/have_openssl.inc
-share/mysql-test/include/have_openssl_1.inc
 share/mysql-test/include/have_outfile.inc
 share/mysql-test/include/have_query_cache.inc
 share/mysql-test/include/have_sjis.inc
@@ -112,6 +113,7 @@ share/mysql-test/r/analyse.result
 share/mysql-test/r/analyze.result
 share/mysql-test/r/ansi.result
 share/mysql-test/r/archive.result
+share/mysql-test/r/archive_gis.result
 share/mysql-test/r/auto_increment.result
 share/mysql-test/r/backup.result
 share/mysql-test/r/bdb-alter-table-1.result
@@ -120,6 +122,7 @@ share/mysql-test/r/bdb-crash.result
 share/mysql-test/r/bdb-deadlock.result
 share/mysql-test/r/bdb.result
 share/mysql-test/r/bdb_cache.result
+share/mysql-test/r/bdb_gis.result
 share/mysql-test/r/bench_count_distinct.result
 share/mysql-test/r/big_test.require
 share/mysql-test/r/bigint.result
@@ -135,6 +138,7 @@ share/mysql-test/r/check_var_limit.require
 share/mysql-test/r/client_xml.result
 share/mysql-test/r/comments.result
 share/mysql-test/r/compare.result
+share/mysql-test/r/compress.result
 share/mysql-test/r/connect.result
 share/mysql-test/r/consistent_snapshot.result
 share/mysql-test/r/constraints.result
@@ -149,6 +153,7 @@ share/mysql-test/r/ctype_collate.result
 share/mysql-test/r/ctype_cp1250_ch.result
 share/mysql-test/r/ctype_cp1251.result
 share/mysql-test/r/ctype_cp932.result
+share/mysql-test/r/ctype_cp932_binlog.result
 share/mysql-test/r/ctype_create.result
 share/mysql-test/r/ctype_eucjpms.result
 share/mysql-test/r/ctype_gbk.result
@@ -253,7 +258,6 @@ share/mysql-test/r/have_met_timezone.require
 share/mysql-test/r/have_moscow_leap_timezone.require
 share/mysql-test/r/have_ndb.require
 share/mysql-test/r/have_openssl.require
-share/mysql-test/r/have_openssl_1.require
 share/mysql-test/r/have_outfile.require
 share/mysql-test/r/have_query_cache.require
 share/mysql-test/r/have_raid.require
@@ -289,6 +293,7 @@ share/mysql-test/r/innodb-lock.result
 share/mysql-test/r/innodb-replace.result
 share/mysql-test/r/innodb.result
 share/mysql-test/r/innodb_cache.result
+share/mysql-test/r/innodb_gis.result
 share/mysql-test/r/innodb_handler.result
 share/mysql-test/r/insert.result
 share/mysql-test/r/insert_select-binlog.result
@@ -329,6 +334,7 @@ share/mysql-test/r/mysql.result
 share/mysql-test/r/mysql_protocols.result
 share/mysql-test/r/mysqlbinlog.result
 share/mysql-test/r/mysqlbinlog2.result
+share/mysql-test/r/mysqlcheck.result
 share/mysql-test/r/mysqldump-max.result
 share/mysql-test/r/mysqldump.result
 share/mysql-test/r/mysqlshow.result
@@ -348,6 +354,7 @@ share/mysql-test/r/ndb_condition_pushdown.result
 share/mysql-test/r/ndb_config.result
 share/mysql-test/r/ndb_database.result
 share/mysql-test/r/ndb_default_cluster.require
+share/mysql-test/r/ndb_gis.result
 share/mysql-test/r/ndb_grant.result
 share/mysql-test/r/ndb_index.result
 share/mysql-test/r/ndb_index_ordered.result
@@ -397,6 +404,7 @@ share/mysql-test/r/query_cache_merge.result
 share/mysql-test/r/query_cache_notembedded.result
 share/mysql-test/r/raid.result
 share/mysql-test/r/range.result
+share/mysql-test/r/read_only.result
 share/mysql-test/r/rename.result
 share/mysql-test/r/repair.result
 share/mysql-test/r/replace.result
@@ -514,6 +522,8 @@ share/mysql-test/r/sp-threads.result
 share/mysql-test/r/sp.result
 share/mysql-test/r/sp_trans.result
 share/mysql-test/r/sql_mode.result
+share/mysql-test/r/ssl.result
+share/mysql-test/r/ssl_compress.result
 share/mysql-test/r/status.result
 share/mysql-test/r/strict.result
 share/mysql-test/r/subselect.result
@@ -581,6 +591,7 @@ share/mysql-test/std_data/loaddata2.dat
 share/mysql-test/std_data/loaddata3.dat
 share/mysql-test/std_data/loaddata4.dat
 share/mysql-test/std_data/loaddata5.dat
+share/mysql-test/std_data/loaddata_dq.dat
 share/mysql-test/std_data/loaddata_pair.dat
 share/mysql-test/std_data/master-bin.000001
 share/mysql-test/std_data/ndb_config_mycnf1.cnf
@@ -600,6 +611,7 @@ share/mysql-test/t/analyse.test
 share/mysql-test/t/analyze.test
 share/mysql-test/t/ansi.test
 share/mysql-test/t/archive.test
+share/mysql-test/t/archive_gis.test
 share/mysql-test/t/auto_increment.test
 share/mysql-test/t/backup-master.sh
 share/mysql-test/t/backup.test
@@ -611,6 +623,7 @@ share/mysql-test/t/bdb-deadlock.test
 share/mysql-test/t/bdb.test
 share/mysql-test/t/bdb_cache-master.opt
 share/mysql-test/t/bdb_cache.test
+share/mysql-test/t/bdb_gis.test
 share/mysql-test/t/bench_count_distinct.test
 share/mysql-test/t/bigint.test
 share/mysql-test/t/binary.test
@@ -625,6 +638,7 @@ share/mysql-test/t/check.test
 share/mysql-test/t/client_xml.test
 share/mysql-test/t/comments.test
 share/mysql-test/t/compare.test
+share/mysql-test/t/compress.test
 share/mysql-test/t/connect.test
 share/mysql-test/t/consistent_snapshot.test
 share/mysql-test/t/constraints.test
@@ -640,6 +654,7 @@ share/mysql-test/t/ctype_collate.test
 share/mysql-test/t/ctype_cp1250_ch.test
 share/mysql-test/t/ctype_cp1251.test
 share/mysql-test/t/ctype_cp932.test
+share/mysql-test/t/ctype_cp932_binlog.test
 share/mysql-test/t/ctype_create.test
 share/mysql-test/t/ctype_eucjpms.test
 share/mysql-test/t/ctype_gbk.test
@@ -763,6 +778,7 @@ share/mysql-test/t/innodb-replace.test
 share/mysql-test/t/innodb.test
 share/mysql-test/t/innodb_cache-master.opt
 share/mysql-test/t/innodb_cache.test
+share/mysql-test/t/innodb_gis.test
 share/mysql-test/t/innodb_handler.test
 share/mysql-test/t/insert.test
 share/mysql-test/t/insert_select-binlog.test
@@ -816,6 +832,7 @@ share/mysql-test/t/mysql_protocols.test
 share/mysql-test/t/mysqlbinlog-master.opt
 share/mysql-test/t/mysqlbinlog.test
 share/mysql-test/t/mysqlbinlog2.test
+share/mysql-test/t/mysqlcheck.test
 share/mysql-test/t/mysqldump-max.test
 share/mysql-test/t/mysqldump.test
 share/mysql-test/t/mysqlshow.test
@@ -835,6 +852,7 @@ share/mysql-test/t/ndb_charset.test
 share/mysql-test/t/ndb_condition_pushdown.test
 share/mysql-test/t/ndb_config.test
 share/mysql-test/t/ndb_database.test
+share/mysql-test/t/ndb_gis.test
 share/mysql-test/t/ndb_index.test
 share/mysql-test/t/ndb_index_ordered.test
 share/mysql-test/t/ndb_index_unique.test
@@ -852,6 +870,7 @@ share/mysql-test/t/ndb_truncate.test
 share/mysql-test/t/ndb_types.test
 share/mysql-test/t/ndb_update.test
 share/mysql-test/t/negation_elimination.test
+share/mysql-test/t/not_embedded_server-master.opt
 share/mysql-test/t/not_embedded_server.test
 share/mysql-test/t/null.test
 share/mysql-test/t/null_key.test
@@ -881,6 +900,7 @@ share/mysql-test/t/query_cache_merge.test
 share/mysql-test/t/query_cache_notembedded.test
 share/mysql-test/t/raid.test
 share/mysql-test/t/range.test
+share/mysql-test/t/read_only.test
 share/mysql-test/t/rename.test
 share/mysql-test/t/repair.test
 share/mysql-test/t/replace.test
@@ -1049,6 +1069,8 @@ share/mysql-test/t/sp-threads.test
 share/mysql-test/t/sp.test
 share/mysql-test/t/sp_trans.test
 share/mysql-test/t/sql_mode.test
+share/mysql-test/t/ssl.test
+share/mysql-test/t/ssl_compress.test
 share/mysql-test/t/status.test
 share/mysql-test/t/strict.test
 share/mysql-test/t/subselect.test
diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo
index aac94c1cc83..5755df45cd9 100644
--- a/databases/mysql5-server/distinfo
+++ b/databases/mysql5-server/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
 
-SHA1 (mysql-5.0.15.tar.gz) = b6092615de6ef5f861f91810413007c1c63058cf
-RMD160 (mysql-5.0.15.tar.gz) = 6a8007f5d12b945b8c3560d27abe98d41abecaf5
-Size (mysql-5.0.15.tar.gz) = 18813065 bytes
+SHA1 (mysql-5.0.16.tar.gz) = 28f7a20ffefcade3c1cce7250e9d3ea1fa33ab37
+RMD160 (mysql-5.0.16.tar.gz) = ec3108fc8fe043db54329af66a7f99e2da8c716c
+Size (mysql-5.0.16.tar.gz) = 19031670 bytes
 SHA1 (patch-aa) = 5a8dbc480982f6e9bead88a60c714f27584c3e43
 SHA1 (patch-ab) = 56cd26b3eb125e7d9b7775c9e148118bbd3dc6b3
 SHA1 (patch-ac) = dd8cc3e1fdeba9ca2f6ab1e0a66be79877c43289
 SHA1 (patch-ad) = 36fb22fa10f2d379decf8e6fc86fc966472930e2
 SHA1 (patch-ae) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-af) = 33c7caa6fe6a61da2a60a63a058cfdbd85af1e2d
-SHA1 (patch-ag) = 178e2e96460b63abd001bd48b5af6f051762652b
-SHA1 (patch-ah) = 08d9f45260cb3cbece19561d021ffeb53b918835
+SHA1 (patch-ag) = 0aae848374602101225da51afcf02c4f686136db
+SHA1 (patch-ah) = 5638e1410d35eb36d2adf862718918ebb2eb19eb
 SHA1 (patch-ai) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
 SHA1 (patch-aj) = 07e4016a0629b7737ad4956962c15e97ddcc6f5d
 SHA1 (patch-ak) = 516460b0aa9f641d74f83c5514f258a980033e41
diff --git a/databases/mysql5-server/patches/patch-ag b/databases/mysql5-server/patches/patch-ag
index 61c8fa98317..e11c873fafa 100644
--- a/databases/mysql5-server/patches/patch-ag
+++ b/databases/mysql5-server/patches/patch-ag
@@ -1,21 +1,15 @@
-$NetBSD: patch-ag,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+$NetBSD: patch-ag,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
 
---- include/Makefile.in.orig	2005-10-31 09:40:49.000000000 +0100
-+++ include/Makefile.in	2005-10-31 09:41:21.000000000 +0100
-@@ -338,14 +338,8 @@
- yassl_dir = @yassl_dir@
- yassl_integer_extra_cxxflags = @yassl_integer_extra_cxxflags@
+--- man/Makefile.in.orig	2005-11-29 21:02:07.000000000 +0100
++++ man/Makefile.in	2005-11-29 21:02:39.000000000 +0100
+@@ -338,8 +338,8 @@
+ yassl_libs = @yassl_libs@
+ yassl_libs_with_path = @yassl_libs_with_path@
  zlib_dir = @zlib_dir@
--BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h
--pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \
--			mysql.h mysql_com.h mysql_embed.h \
--		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
--			errmsg.h my_global.h my_net.h my_alloc.h \
--			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
--			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
--			mysql_time.h $(BUILT_SOURCES)
-+BUILT_SOURCES =
-+pkginclude_HEADERS =
+-man1_MANS = @man1_files@
+-EXTRA_DIST = $(man1_MANS)
++man1_MANS = mysqld.1 mysqld_multi.1
++EXTRA_DIST = mysqld.1.in mysqld_multi.1.in
+ all: all-am
  
- noinst_HEADERS = config-win.h config-os2.h config-netware.h \
- 			heap.h my_bitmap.h\
+ .SUFFIXES:
diff --git a/databases/mysql5-server/patches/patch-ah b/databases/mysql5-server/patches/patch-ah
index 7532b670439..d42f0b45b6e 100644
--- a/databases/mysql5-server/patches/patch-ah
+++ b/databases/mysql5-server/patches/patch-ah
@@ -1,21 +1,19 @@
-$NetBSD: patch-ah,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+$NetBSD: patch-ah,v 1.2 2005/12/02 08:13:26 xtraeme Exp $
 
---- man/Makefile.in.orig	2005-10-31 09:41:52.000000000 +0100
-+++ man/Makefile.in	2005-10-31 09:42:12.000000000 +0100
-@@ -334,14 +334,8 @@
- yassl_dir = @yassl_dir@
- yassl_integer_extra_cxxflags = @yassl_integer_extra_cxxflags@
+--- include/Makefile.in.orig	2005-12-02 07:54:42.000000000 +0100
++++ include/Makefile.in	2005-12-02 07:55:26.000000000 +0100
+@@ -343,13 +343,7 @@
+ yassl_libs_with_path = @yassl_libs_with_path@
  zlib_dir = @zlib_dir@
--man_MANS = mysql.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
--
--EXTRA_DIST = mysql.1.in mysql_zap.1.in \
--		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
--		mysqldump.1.in mysqlshow.1.in perror.1.in replace.1.in mysqlman.1.in \
--		mysqld_safe.1.in mysql_fix_privilege_tables.1.in
-+man_MANS = mysqld.1 mysqld_multi.1
-+EXTRA_DIST = mysqld.1.in mysqld_multi.1.in
+ BUILT_SOURCES = mysql_version.h m_ctype.h my_config.h
+-pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \
+-			mysql.h mysql_com.h mysql_embed.h \
+-		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
+-			errmsg.h my_global.h my_net.h my_alloc.h \
+-			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
+-			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
+-			mysql_time.h $(BUILT_SOURCES)
++pkginclude_HEADERS = 
  
- CLEANFILES = $(man_MANS)
- SUFFIXES = .in
+ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
+ 			heap.h my_bitmap.h\