7 files changed, 94 insertions, 11 deletions

diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 9a93941d0e4b..63a4c59960bd 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mysql
-PORTVERSION=	4.1.4
+PORTVERSION=	4.1.5
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	ftp://planetmirror.com/pub/mysql/Downloads/MySQL-4.1/ \
@@ -31,6 +31,7 @@ PKGINSTALL?=	${WRKDIR}/pkg-install
 DB_DIR?=	/var/db/mysql
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
 
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
diff --git a/databases/mysql41-server/distinfo b/databases/mysql41-server/distinfo
index 0aa71450242a..070c5df59655 100644
--- a/databases/mysql41-server/distinfo
+++ b/databases/mysql41-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (mysql-4.1.4-gamma.tar.gz) = 2d41f9a6dad81daeda45af92ae86bacd
-SIZE (mysql-4.1.4-gamma.tar.gz) = 19548013
+MD5 (mysql-4.1.5-gamma.tar.gz) = 93ad89451363586634679458acd11625
+SIZE (mysql-4.1.5-gamma.tar.gz) = 19436415
diff --git a/databases/mysql41-server/files/patch-sql::Makefile.in b/databases/mysql41-server/files/patch-sql::Makefile.in
new file mode 100644
index 000000000000..f985188d1655
--- /dev/null
+++ b/databases/mysql41-server/files/patch-sql::Makefile.in
@@ -0,0 +1,39 @@
+--- sql/Makefile.in.orig	Thu Aug 26 22:47:18 2004
++++ sql/Makefile.in		Sun Sep 19 15:03:56 2004
+@@ -378,7 +378,7 @@
+ 			gstream.cc spatial.cc sql_help.cc protocol_cursor.cc \
+ 			tztime.cc my_time.c \
+ 			examples/ha_example.cc examples/ha_archive.cc \
+-			examples/ha_tina.cc
++			examples/ha_tina.cc mylibwrap.c
+ 
+ 
+ gen_lex_hash_SOURCES = gen_lex_hash.cc
+@@ -450,7 +450,8 @@
+ 	pack.$(OBJEXT) stacktrace.$(OBJEXT) repl_failsafe.$(OBJEXT) \
+ 	gstream.$(OBJEXT) spatial.$(OBJEXT) sql_help.$(OBJEXT) \
+ 	protocol_cursor.$(OBJEXT) tztime.$(OBJEXT) my_time.$(OBJEXT) \
+-	ha_example.$(OBJEXT) ha_archive.$(OBJEXT) ha_tina.$(OBJEXT)
++	ha_example.$(OBJEXT) ha_archive.$(OBJEXT) ha_tina.$(OBJEXT) \
++	mylibwrap.$(OBJEXT)
+ mysqld_OBJECTS = $(am_mysqld_OBJECTS)
+ mysqld_DEPENDENCIES = $(top_builddir)/myisam/libmyisam.a \
+ 	$(top_builddir)/myisammrg/libmyisammrg.a \
+@@ -518,7 +519,8 @@
+ @AMDEP_TRUE@	./$(DEPDIR)/stacktrace.Po ./$(DEPDIR)/strfunc.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/table.Po ./$(DEPDIR)/thr_malloc.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/time.Po ./$(DEPDIR)/tztime.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/uniques.Po ./$(DEPDIR)/unireg.Po
++@AMDEP_TRUE@	./$(DEPDIR)/uniques.Po ./$(DEPDIR)/unireg.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/mylibwrap.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+@@ -748,6 +750,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tztime.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniques.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unireg.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mylibwrap.Po@am__quote@
+ 
+ distclean-depend:
+ 	-rm -rf ./$(DEPDIR)
diff --git a/databases/mysql41-server/files/patch-sql::mylibwrap.c b/databases/mysql41-server/files/patch-sql::mylibwrap.c
new file mode 100644
index 000000000000..39a31185a52d
--- /dev/null
+++ b/databases/mysql41-server/files/patch-sql::mylibwrap.c
@@ -0,0 +1,23 @@
+--- sql/mylibwrap.c.orig	Thu Jan  1 01:00:00 1970
++++ sql/mylibwrap.c		Sun Sep 19 15:37:22 2004
+@@ -0,0 +1,20 @@
++#include <tcpd.h>
++#include "mylibwrap.h"
++
++void
++my_fromhost(struct request_info *req)
++{
++	fromhost(req);
++}
++
++int
++my_hosts_access(struct request_info *req)
++{
++	return hosts_access(req);
++}
++
++char *
++my_eval_client(struct request_info *req)
++{
++	return eval_client(req);
++}
diff --git a/databases/mysql41-server/files/patch-sql::mylibwrap.h b/databases/mysql41-server/files/patch-sql::mylibwrap.h
new file mode 100644
index 000000000000..1fa9e8cecf50
--- /dev/null
+++ b/databases/mysql41-server/files/patch-sql::mylibwrap.h
@@ -0,0 +1,12 @@
+--- sql/mylibwrap.h.orig	Thu Jan  1 01:00:00 1970
++++ sql/mylibwrap.h		Sun Sep 19 15:04:21 2004
+@@ -0,0 +1,9 @@
++#ifdef __cplusplus
++extern "C" {
++#endif
++extern void my_fromhost(struct request_info *);
++extern int my_hosts_access(struct request_info *);
++extern char *my_eval_client(struct request_info *);
++#ifdef __cplusplus
++}
++#endif
diff --git a/databases/mysql41-server/files/patch-sql::mysqld.cc b/databases/mysql41-server/files/patch-sql::mysqld.cc
index 1d0288494fb5..e9c1222d3773 100644
--- a/databases/mysql41-server/files/patch-sql::mysqld.cc
+++ b/databases/mysql41-server/files/patch-sql::mysqld.cc
@@ -1,12 +1,19 @@
---- sql/mysqld.cc.orig	Wed Feb  5 01:55:03 2003
-+++ sql/mysqld.cc	Wed Feb  5 01:57:06 2003
-@@ -104,7 +104,8 @@
+--- sql/mysqld.cc.orig	Thu Sep 16 23:47:47 2004
++++ sql/mysqld.cc	Tue Sep 21 23:56:49 2004
+@@ -115,15 +115,7 @@
  int allow_severity = LOG_INFO;
  int deny_severity = LOG_WARNING;
  
 -#ifdef __STDC__
-+#include <osreldate.h>
-+#if defined(__STDC__) && __FreeBSD_version < 500000
- #define my_fromhost(A)	   fromhost(A)
- #define my_hosts_access(A) hosts_access(A)
- #define my_eval_client(A)  eval_client(A)
+-#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__ */
++#include "mylibwrap.h"
+ #endif /* HAVE_LIBWRAP */
+ 
+ #ifdef HAVE_SYS_MMAN_H
diff --git a/databases/mysql41-server/pkg-plist b/databases/mysql41-server/pkg-plist
index 520d0a89cc3b..d9b414c536c8 100644
--- a/databases/mysql41-server/pkg-plist
+++ b/databases/mysql41-server/pkg-plist
@@ -48,6 +48,7 @@ include/mysql/ndb/ndbapi/NdbReceiver.hpp
 include/mysql/ndb/ndbapi/NdbResultSet.hpp
 include/mysql/ndb/ndbapi/NdbScanFilter.hpp
 include/mysql/ndb/ndbapi/NdbScanOperation.hpp
+include/mysql/ndb/ndbapi/ndb_cluster_connection.hpp
 include/mysql/ndb/ndbapi/ndbapi_limits.h
 include/mysql/ndb/ndbapi/ndberror.h
 lib/mysql/libdbug.a