Update to 4.1.16 release.

5 files changed, 44 insertions, 32 deletions

diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index dd9b709..63a8a2f 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.15
+PORTVERSION=	4.1.16
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -120,8 +120,8 @@ PLIST_SUB+=	NDB=""
 PLIST_SUB+=	NDB="@comment "
 .endif
 
-MAN1=		isamchk.1 isamlog.1 mysqld.1 \
-		mysqld_safe.1 perror.1 replace.1
+MAN1=		myisamchk.1 myisamlog.1 myisampack.1 mysqld.1 \
+		mysqld_safe.1 mysql.server.1 perror.1 replace.1
 
 INFO=		mysql
 
@@ -149,12 +149,14 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|bin_SCRIPTS =|bin_SCRIPTS = @server_scripts@ mysql_create_system_tables|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|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-data-am: install-pkgincludeHEADERS|install-data-am:|g" ${WRKSRC}/include/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
 .if defined(WITH_PROC_SCOPE_PTH)
 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc
 .endif
+	@${ECHO_CMD} "-- fill_help_tables.sql is broken in 4.1.16 release" \
+		> ${WRKSRC}/scripts/fill_help_tables.sql
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
@@ -168,7 +170,8 @@ LATEST_LINK=	mysql41-client
 
 CONFLICTS=	mysql-client-3.* mysql-client-4.[02-9].* mysql-client-5.*
 
-MAN1=		mysql.1 mysqladmin.1 mysqldump.1 mysqlshow.1
+MAN1=		mysql_config.1 mysql.1 mysqladmin.1 mysqlbinlog.1 \
+		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
@@ -181,7 +184,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|all: config.h|all: config.h all-local|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
+	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/mysys/default.c
 .if defined(WITH_PROC_SCOPE_PTH)
 	@${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/tools/mysqlmanager.c
@@ -206,7 +209,8 @@ 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
+MAN1=		msql2mysql.1 mysql_zap.1 mysqlaccess.1 mysqlhotcopy.1 \
+		mysqld_multi.1 mysql_fix_privilege_tables.1
 
 SCRIPTS=	msql2mysql mysql_fix_extensions mysql_setpermission \
 		mysql_secure_installation mysql_zap mysqlaccess \
@@ -217,7 +221,7 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = scripts @man_dirs@|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
+	@${REINPLACE_CMD} -e "s|man1_MANS =|man1_MANS = ${MAN1}|g" ${WRKSRC}/man/Makefile.in
 .endif
 .endif
 # Common part
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index 98ec6ea..64c35ff 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-server/distinfo
@@ -1,2 +1,3 @@
-MD5 (mysql-4.1.15.tar.gz) = 65a0841e592641b8816f9212aaa40176
-SIZE (mysql-4.1.15.tar.gz) = 17257765
+MD5 (mysql-4.1.16.tar.gz) = 13c5fdd05e28863db3a1261635890b5f
+SHA256 (mysql-4.1.16.tar.gz) = e135f6089a0b49aeb2f3a1396820089c232505cfda010e77a680921750485557
+SIZE (mysql-4.1.16.tar.gz) = 17146702
diff --git a/databases/mysql41-server/files/patch-Docs::Makefile.in b/databases/mysql41-server/files/patch-Docs::Makefile.in
index 916286b..803cbea 100644
--- a/databases/mysql41-server/files/patch-Docs::Makefile.in
+++ b/databases/mysql41-server/files/patch-Docs::Makefile.in
@@ -1,11 +1,20 @@
---- Docs/Makefile.in.orig	Fri May 13 13:33:27 2005
-+++ Docs/Makefile.in	Fri Jun  3 16:54:40 2005
-@@ -481,7 +481,7 @@
- 	uninstall-info-am
- 
+--- Docs/Makefile.in.orig	Wed Nov 30 21:37:04 2005
++++ Docs/Makefile.in	Thu Dec 22 16:03:51 2005
+@@ -324,7 +324,7 @@
+ 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
  
--all:			txt_files
+ GT = $(srcdir)/Support/generate-text-files.pl
+-all: all-am
 +all:
  
- txt_files:		../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
- 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
+ .SUFFIXES:
+ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+@@ -410,7 +410,7 @@
+ install-data: install-data-am
+ uninstall: uninstall-am
+ 
+-install-am: all-am
++install-am:
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ 
+ installcheck: installcheck-am
diff --git a/databases/mysql41-server/files/patch-Makefile.in b/databases/mysql41-server/files/patch-Makefile.in
index 8a273b2..91e8c1b 100644
--- a/databases/mysql41-server/files/patch-Makefile.in
+++ b/databases/mysql41-server/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Tue Dec 14 13:41:10 2004
-+++ Makefile.in	Sun Dec 19 11:48:00 2004
-@@ -338,12 +338,7 @@
+--- Makefile.in.orig	Thu Dec 22 16:04:09 2005
++++ Makefile.in	Thu Dec 22 16:04:29 2005
+@@ -348,12 +348,7 @@
+ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
+ 			README COPYING EXCEPTIONS-CLIENT
  
- # These are built from source in the Docs directory
- EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack \
diff --git a/databases/mysql41-server/files/patch-man::Makefile.in b/databases/mysql41-server/files/patch-man::Makefile.in
index 36ea5bc..2d85a21 100644
--- a/databases/mysql41-server/files/patch-man::Makefile.in
+++ b/databases/mysql41-server/files/patch-man::Makefile.in
@@ -1,13 +1,11 @@
---- man/Makefile.in.orig	Tue Dec 14 13:41:14 2004
-+++ man/Makefile.in	Sun Dec 19 11:53:40 2004
-@@ -313,9 +313,7 @@
+--- man/Makefile.in.orig	Thu Dec 22 16:04:55 2005
++++ man/Makefile.in	Thu Dec 22 16:05:21 2005
+@@ -321,7 +321,7 @@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
  zlib_dir = @zlib_dir@
--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 =
+-man1_MANS = @man1_files@
++man1_MANS =
+ EXTRA_DIST = $(man1_MANS)
+ all: all-am
  
- EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
- 		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \