5 files changed, 6 insertions, 41 deletions

diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 93e0f4e6ef83..c082526e15da 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.8a
+PORTVERSION=	4.1.9
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
@@ -194,7 +194,7 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/mysql
 CONFIGURE_ARGS+=--without-server
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include strings regex @sql_client_dirs@ scripts man|g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ scripts man|g" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in
 	@${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
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index d702aa88f161..0d0f95169348 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (mysql-4.1.8a.tar.gz) = 2886edbe5cc826727fbb79a79d41145c
-SIZE (mysql-4.1.8a.tar.gz) = 22945198
+MD5 (mysql-4.1.9.tar.gz) = 7bc44befe155d619c4e4705f68874278
+SIZE (mysql-4.1.9.tar.gz) = 22308321
diff --git a/databases/mysql41-server/files/patch-Makefile.in b/databases/mysql41-server/files/patch-Makefile.in
index 4ae2c3ea9443..40726234d2a4 100644
--- a/databases/mysql41-server/files/patch-Makefile.in
+++ b/databases/mysql41-server/files/patch-Makefile.in
@@ -7,7 +7,7 @@
 -SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
 -			@readline_topdir@ sql-common \
 -			@thread_dirs@ pstack \
--			@sql_server_dirs@ @sql_client_dirs@ scripts man tests \
+-			@sql_union_dirs@ scripts man tests \
 -			netware @libmysqld_dirs@ \
 -			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
 +SUBDIRS =
diff --git a/databases/mysql41-server/files/patch-sql::mysqld.cc b/databases/mysql41-server/files/patch-sql::mysqld.cc
index c98d38bcbd10..e79f985fcb69 100644
--- a/databases/mysql41-server/files/patch-sql::mysqld.cc
+++ b/databases/mysql41-server/files/patch-sql::mysqld.cc
@@ -9,39 +9,3 @@
  #include <syslog.h>
  #ifdef NEED_SYS_SYSLOG_H
  #include <sys/syslog.h>
-@@ -136,15 +136,6 @@
- int allow_severity = LOG_INFO;
- int deny_severity = LOG_WARNING;
- 
--#ifdef __STDC__
--#define my_fromhost(A)	   fromhost(A)
--#define my_hosts_access(A) hosts_access(A)
--#define my_eval_client(A)  eval_client(A)
--#else
--#define my_fromhost(A)	   fromhost()
--#define my_hosts_access(A) hosts_access()
--#define my_eval_client(A)  eval_client()
--#endif /* __STDC__ */
- #endif /* HAVE_LIBWRAP */
- 
- #ifdef HAVE_SYS_MMAN_H
-@@ -3565,8 +3556,8 @@
- 	struct request_info req;
- 	signal(SIGCHLD, SIG_DFL);
- 	request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL);
--	my_fromhost(&req);
--	if (!my_hosts_access(&req))
-+	fromhost(&req);
-+	if (!hosts_access(&req))
- 	{
- 	  /*
- 	    This may be stupid but refuse() includes an exit(0)
-@@ -3574,7 +3565,7 @@
- 	    clean_exit() - same stupid thing ...
- 	  */
- 	  syslog(deny_severity, "refused connect from %s",
--		 my_eval_client(&req));
-+		 eval_client(&req));
- 
- 	  /*
- 	    C++ sucks (the gibberish in front just translates the supplied
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index d470f6b2a260..cca1edc36581 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-server/pkg-plist
@@ -32,6 +32,7 @@ etc/rc.d/mysql-server.sh
 %%NDB%%include/mysql/ndb/mgmapi/mgmapi_config_parameters.h
 %%NDB%%include/mysql/ndb/mgmapi/mgmapi_config_parameters_debug.h
 %%NDB%%include/mysql/ndb/mgmapi/mgmapi_debug.h
+%%NDB%%include/mysql/ndb/ndb_init.h
 %%NDB%%include/mysql/ndb/ndb_types.h
 %%NDB%%include/mysql/ndb/ndb_version.h
 %%NDB%%include/mysql/ndb/ndbapi/Ndb.hpp