- If ${OSVERSION} >= 320000 then use native threads (libc_r) by default.

  Set MIT_PTHREADS to use the supplied mit-pthreads.
  This is a workaround for PR ports/12824.

- replace one occurance of gcc with ${CC}

- don't use CFLAGS twice somewhere in mit-pthreads compilation
  (There is still one place left where CFLAGS are used twice.)

11 files changed, 361 insertions, 140 deletions

diff --git a/databases/mysql322-server/Makefile b/databases/mysql322-server/Makefile
index bb5c94571cf6..551928682032 100644
--- a/databases/mysql322-server/Makefile
+++ b/databases/mysql322-server/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		CXXFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
 .if !defined(CLIENT_ONLY)
@@ -42,32 +41,54 @@ RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql322-client
 
 .include <bsd.port.pre.mk>
 
-.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+.if ${OSVERSION} >= 320000
+.if defined(MIT_PTHREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
+.else
 CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+	@${ECHO} "You may set MIT_PTHREADS (make MIT_PTHREADS=yes)"
+	@${ECHO} "to compile mysql with the supplied mit-pthreads."
+	@${ECHO} "(You don't want to set this unless you have a good reason)."
+	@${ECHO}
+.endif
+.elif ${OSVERSION} >= 300000
+.if defined(NATIVE_THREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
 .else
 CONFIGURE_ARGS+=	--with-mit-threads=yes
-.endif
 
-.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 pre-fetch:
 	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
 	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
 	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
-	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "Warning: There are some bugs in libc_r which prevent"
 	@${ECHO} "         'mysqladmin shutdown' from working properly and"
 	@${ECHO} "         killing mysqld might not work."
 	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "Using native FreeBSD threads (libc_r)."
-	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+.endif
+.else
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
 pre-fetch:
 	@${ECHO}
-	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
-	@${ECHO} "are still too buggy to use with mysql."
-	@${ECHO} "Using mit-pthreads."
+	@${ECHO} "Using supplied mit-pthreads."
 	@${ECHO}
 .endif
 
diff --git a/databases/mysql322-server/files/patch-ao b/databases/mysql322-server/files/patch-ao
new file mode 100644
index 000000000000..dee1e2e0f763
--- /dev/null
+++ b/databases/mysql322-server/files/patch-ao
@@ -0,0 +1,11 @@
+--- mit-pthreads/config/Makefile.in.orig	Mon Mar  2 19:44:34 1998
++++ mit-pthreads/config/Makefile.in	Fri Sep  3 21:45:05 1999
+@@ -5,8 +5,6 @@
+ #NOPIC=
+ #NOPROFILE=1
+ CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/include -I${srcdir}/include -DPTHREAD_KERNEL
+-CDEBUGFLAGS= @CFLAGS@
+-CFLAGS+= ${CDEBUGFLAGS}
+ # CFLAGS+= ${CPPFLAGS} <- done by bsd.lib.mk
+ CFLAGS+= ${CPPFLAGS} 
+ LIBDIR= $(exec_prefix)/lib
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index bb5c94571cf6..551928682032 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		CXXFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
 .if !defined(CLIENT_ONLY)
@@ -42,32 +41,54 @@ RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql322-client
 
 .include <bsd.port.pre.mk>
 
-.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+.if ${OSVERSION} >= 320000
+.if defined(MIT_PTHREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
+.else
 CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+	@${ECHO} "You may set MIT_PTHREADS (make MIT_PTHREADS=yes)"
+	@${ECHO} "to compile mysql with the supplied mit-pthreads."
+	@${ECHO} "(You don't want to set this unless you have a good reason)."
+	@${ECHO}
+.endif
+.elif ${OSVERSION} >= 300000
+.if defined(NATIVE_THREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
 .else
 CONFIGURE_ARGS+=	--with-mit-threads=yes
-.endif
 
-.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 pre-fetch:
 	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
 	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
 	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
-	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "Warning: There are some bugs in libc_r which prevent"
 	@${ECHO} "         'mysqladmin shutdown' from working properly and"
 	@${ECHO} "         killing mysqld might not work."
 	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "Using native FreeBSD threads (libc_r)."
-	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+.endif
+.else
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
 pre-fetch:
 	@${ECHO}
-	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
-	@${ECHO} "are still too buggy to use with mysql."
-	@${ECHO} "Using mit-pthreads."
+	@${ECHO} "Using supplied mit-pthreads."
 	@${ECHO}
 .endif
 
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index bb5c94571cf6..551928682032 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		CXXFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
 .if !defined(CLIENT_ONLY)
@@ -42,32 +41,54 @@ RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql322-client
 
 .include <bsd.port.pre.mk>
 
-.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+.if ${OSVERSION} >= 320000
+.if defined(MIT_PTHREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
+.else
 CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+	@${ECHO} "You may set MIT_PTHREADS (make MIT_PTHREADS=yes)"
+	@${ECHO} "to compile mysql with the supplied mit-pthreads."
+	@${ECHO} "(You don't want to set this unless you have a good reason)."
+	@${ECHO}
+.endif
+.elif ${OSVERSION} >= 300000
+.if defined(NATIVE_THREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
 .else
 CONFIGURE_ARGS+=	--with-mit-threads=yes
-.endif
 
-.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 pre-fetch:
 	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
 	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
 	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
-	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "Warning: There are some bugs in libc_r which prevent"
 	@${ECHO} "         'mysqladmin shutdown' from working properly and"
 	@${ECHO} "         killing mysqld might not work."
 	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "Using native FreeBSD threads (libc_r)."
-	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+.endif
+.else
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
 pre-fetch:
 	@${ECHO}
-	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
-	@${ECHO} "are still too buggy to use with mysql."
-	@${ECHO} "Using mit-pthreads."
+	@${ECHO} "Using supplied mit-pthreads."
 	@${ECHO}
 .endif
 
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index bb5c94571cf6..551928682032 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		CXXFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
 .if !defined(CLIENT_ONLY)
@@ -42,32 +41,54 @@ RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql322-client
 
 .include <bsd.port.pre.mk>
 
-.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+.if ${OSVERSION} >= 320000
+.if defined(MIT_PTHREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
+.else
 CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+	@${ECHO} "You may set MIT_PTHREADS (make MIT_PTHREADS=yes)"
+	@${ECHO} "to compile mysql with the supplied mit-pthreads."
+	@${ECHO} "(You don't want to set this unless you have a good reason)."
+	@${ECHO}
+.endif
+.elif ${OSVERSION} >= 300000
+.if defined(NATIVE_THREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
 .else
 CONFIGURE_ARGS+=	--with-mit-threads=yes
-.endif
 
-.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 pre-fetch:
 	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
 	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
 	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
-	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "Warning: There are some bugs in libc_r which prevent"
 	@${ECHO} "         'mysqladmin shutdown' from working properly and"
 	@${ECHO} "         killing mysqld might not work."
 	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "Using native FreeBSD threads (libc_r)."
-	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+.endif
+.else
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
 pre-fetch:
 	@${ECHO}
-	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
-	@${ECHO} "are still too buggy to use with mysql."
-	@${ECHO} "Using mit-pthreads."
+	@${ECHO} "Using supplied mit-pthreads."
 	@${ECHO}
 .endif
 
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index bb5c94571cf6..551928682032 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		CXXFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
 .if !defined(CLIENT_ONLY)
@@ -42,32 +41,54 @@ RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql322-client
 
 .include <bsd.port.pre.mk>
 
-.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+.if ${OSVERSION} >= 320000
+.if defined(MIT_PTHREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
+.else
 CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+	@${ECHO} "You may set MIT_PTHREADS (make MIT_PTHREADS=yes)"
+	@${ECHO} "to compile mysql with the supplied mit-pthreads."
+	@${ECHO} "(You don't want to set this unless you have a good reason)."
+	@${ECHO}
+.endif
+.elif ${OSVERSION} >= 300000
+.if defined(NATIVE_THREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
 .else
 CONFIGURE_ARGS+=	--with-mit-threads=yes
-.endif
 
-.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 pre-fetch:
 	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
 	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
 	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
-	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "Warning: There are some bugs in libc_r which prevent"
 	@${ECHO} "         'mysqladmin shutdown' from working properly and"
 	@${ECHO} "         killing mysqld might not work."
 	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "Using native FreeBSD threads (libc_r)."
-	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+.endif
+.else
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
 pre-fetch:
 	@${ECHO}
-	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
-	@${ECHO} "are still too buggy to use with mysql."
-	@${ECHO} "Using mit-pthreads."
+	@${ECHO} "Using supplied mit-pthreads."
 	@${ECHO}
 .endif
 
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index bb5c94571cf6..551928682032 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		CXXFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
 .if !defined(CLIENT_ONLY)
@@ -42,32 +41,54 @@ RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql322-client
 
 .include <bsd.port.pre.mk>
 
-.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+.if ${OSVERSION} >= 320000
+.if defined(MIT_PTHREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
+.else
 CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+	@${ECHO} "You may set MIT_PTHREADS (make MIT_PTHREADS=yes)"
+	@${ECHO} "to compile mysql with the supplied mit-pthreads."
+	@${ECHO} "(You don't want to set this unless you have a good reason)."
+	@${ECHO}
+.endif
+.elif ${OSVERSION} >= 300000
+.if defined(NATIVE_THREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
 .else
 CONFIGURE_ARGS+=	--with-mit-threads=yes
-.endif
 
-.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 pre-fetch:
 	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
 	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
 	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
-	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "Warning: There are some bugs in libc_r which prevent"
 	@${ECHO} "         'mysqladmin shutdown' from working properly and"
 	@${ECHO} "         killing mysqld might not work."
 	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "Using native FreeBSD threads (libc_r)."
-	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+.endif
+.else
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
 pre-fetch:
 	@${ECHO}
-	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
-	@${ECHO} "are still too buggy to use with mysql."
-	@${ECHO} "Using mit-pthreads."
+	@${ECHO} "Using supplied mit-pthreads."
 	@${ECHO}
 .endif
 
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index bb5c94571cf6..551928682032 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		CXXFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
 .if !defined(CLIENT_ONLY)
@@ -42,32 +41,54 @@ RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql322-client
 
 .include <bsd.port.pre.mk>
 
-.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+.if ${OSVERSION} >= 320000
+.if defined(MIT_PTHREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
+.else
 CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+	@${ECHO} "You may set MIT_PTHREADS (make MIT_PTHREADS=yes)"
+	@${ECHO} "to compile mysql with the supplied mit-pthreads."
+	@${ECHO} "(You don't want to set this unless you have a good reason)."
+	@${ECHO}
+.endif
+.elif ${OSVERSION} >= 300000
+.if defined(NATIVE_THREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
 .else
 CONFIGURE_ARGS+=	--with-mit-threads=yes
-.endif
 
-.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 pre-fetch:
 	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
 	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
 	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
-	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "Warning: There are some bugs in libc_r which prevent"
 	@${ECHO} "         'mysqladmin shutdown' from working properly and"
 	@${ECHO} "         killing mysqld might not work."
 	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "Using native FreeBSD threads (libc_r)."
-	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+.endif
+.else
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
 pre-fetch:
 	@${ECHO}
-	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
-	@${ECHO} "are still too buggy to use with mysql."
-	@${ECHO} "Using mit-pthreads."
+	@${ECHO} "Using supplied mit-pthreads."
 	@${ECHO}
 .endif
 
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index bb5c94571cf6..551928682032 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		CXXFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
 .if !defined(CLIENT_ONLY)
@@ -42,32 +41,54 @@ RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql322-client
 
 .include <bsd.port.pre.mk>
 
-.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+.if ${OSVERSION} >= 320000
+.if defined(MIT_PTHREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
+.else
 CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+	@${ECHO} "You may set MIT_PTHREADS (make MIT_PTHREADS=yes)"
+	@${ECHO} "to compile mysql with the supplied mit-pthreads."
+	@${ECHO} "(You don't want to set this unless you have a good reason)."
+	@${ECHO}
+.endif
+.elif ${OSVERSION} >= 300000
+.if defined(NATIVE_THREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
 .else
 CONFIGURE_ARGS+=	--with-mit-threads=yes
-.endif
 
-.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 pre-fetch:
 	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
 	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
 	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
-	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "Warning: There are some bugs in libc_r which prevent"
 	@${ECHO} "         'mysqladmin shutdown' from working properly and"
 	@${ECHO} "         killing mysqld might not work."
 	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "Using native FreeBSD threads (libc_r)."
-	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+.endif
+.else
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
 pre-fetch:
 	@${ECHO}
-	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
-	@${ECHO} "are still too buggy to use with mysql."
-	@${ECHO} "Using mit-pthreads."
+	@${ECHO} "Using supplied mit-pthreads."
 	@${ECHO}
 .endif
 
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index bb5c94571cf6..551928682032 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		CXXFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
 .if !defined(CLIENT_ONLY)
@@ -42,32 +41,54 @@ RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql322-client
 
 .include <bsd.port.pre.mk>
 
-.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+.if ${OSVERSION} >= 320000
+.if defined(MIT_PTHREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
+.else
 CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+	@${ECHO} "You may set MIT_PTHREADS (make MIT_PTHREADS=yes)"
+	@${ECHO} "to compile mysql with the supplied mit-pthreads."
+	@${ECHO} "(You don't want to set this unless you have a good reason)."
+	@${ECHO}
+.endif
+.elif ${OSVERSION} >= 300000
+.if defined(NATIVE_THREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
 .else
 CONFIGURE_ARGS+=	--with-mit-threads=yes
-.endif
 
-.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 pre-fetch:
 	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
 	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
 	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
-	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "Warning: There are some bugs in libc_r which prevent"
 	@${ECHO} "         'mysqladmin shutdown' from working properly and"
 	@${ECHO} "         killing mysqld might not work."
 	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "Using native FreeBSD threads (libc_r)."
-	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+.endif
+.else
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
 pre-fetch:
 	@${ECHO}
-	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
-	@${ECHO} "are still too buggy to use with mysql."
-	@${ECHO} "Using mit-pthreads."
+	@${ECHO} "Using supplied mit-pthreads."
 	@${ECHO}
 .endif
 
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index bb5c94571cf6..551928682032 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 CONFIGURE_ENV+=	PERL=${PERL} \
 		PERL5=${PERL} \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		CXXFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
 .if !defined(CLIENT_ONLY)
@@ -42,32 +41,54 @@ RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql322-client
 
 .include <bsd.port.pre.mk>
 
-.if defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
+.if ${OSVERSION} >= 320000
+.if defined(MIT_PTHREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
+.else
 CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
+	@${ECHO} "You may set MIT_PTHREADS (make MIT_PTHREADS=yes)"
+	@${ECHO} "to compile mysql with the supplied mit-pthreads."
+	@${ECHO} "(You don't want to set this unless you have a good reason)."
+	@${ECHO}
+.endif
+.elif ${OSVERSION} >= 300000
+.if defined(NATIVE_THREADS)
+CONFIGURE_ARGS+=	--with-mit-threads=no
+
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "Using native FreeBSD threads (libc_r)."
+	@${ECHO}
 .else
 CONFIGURE_ARGS+=	--with-mit-threads=yes
-.endif
 
-.if !defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
 pre-fetch:
 	@${ECHO}
+	@${ECHO} "Using supplied mit-pthreads."
+	@${ECHO}
 	@${ECHO} "You may set NATIVE_THREADS (make NATIVE_THREADS=yes)"
 	@${ECHO} "to compile mysql with the native FreeBSD threads (libc_r)."
-	@${ECHO} "Warning: There are still some bugs in libc_r which prevent"
+	@${ECHO} "Warning: There are some bugs in libc_r which prevent"
 	@${ECHO} "         'mysqladmin shutdown' from working properly and"
 	@${ECHO} "         killing mysqld might not work."
 	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} >= 300000
-pre-fetch:
-	@${ECHO}
-	@${ECHO} "Using native FreeBSD threads (libc_r)."
-	@${ECHO}
-.elif defined(NATIVE_THREADS) && ${OSVERSION} < 300000
+.endif
+.else
+CONFIGURE_ARGS+=	--with-mit-threads=yes
+
 pre-fetch:
 	@${ECHO}
-	@${ECHO} "Sorry, native FreeBSD threads (libc_r) in 2.2-branch"
-	@${ECHO} "are still too buggy to use with mysql."
-	@${ECHO} "Using mit-pthreads."
+	@${ECHO} "Using supplied mit-pthreads."
 	@${ECHO}
 .endif