9 files changed, 62 insertions, 19 deletions

diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index bb9329b3c669..24991d53587f 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -38,6 +38,8 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--program-prefix='' \
 		--with-innodb
 
+.include <bsd.port.pre.mk>
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -56,8 +58,12 @@ CFLAGS+=	-mcpu=pentiumpro -O3
 .if defined(WITH_LINUXTHREADS)
 CONFIGURE_ARGS+=--with-named-thread-libs='-DHAVE_GLIBC2_STYLE_GETHOSTBYNAME_R -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads -L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
+.if ${OSVERSION} > 500000
+LIB_DEPENDS+=	lthread.3:${PORTSDIR}/devel/linuxthreads
+.else
 LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
 .endif
+.endif
 .if defined(THREAD_SAFE_CLIENT)
 CONFIGURE_ARGS+=--enable-thread-safe-client
 .endif
@@ -67,7 +73,6 @@ CONFIGURE_ENV+=	PERL=${PERL} \
 		CFLAGS="${CFLAGS}" \
 		CONFIGURE_ARGS="${CONFIGURE_ARGS}"
 
-.include <bsd.port.pre.mk>
 # without including these flags mysqld may crash under heavy load
 # and multiple connections at the same time
 CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
@@ -96,8 +101,6 @@ pre-fetch:
 	@${ECHO} "	DB_DIR=directory	Set alternate directory for database files"
 	@${ECHO} "				(default is /var/db/mysql)."
 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
-	@${ECHO} "				This is _NOT_ recommended for production"
-	@${ECHO} "				servers. Expect problems when enabled."
 	@${ECHO} "	SKIP_INSTALL_DB=yes	Skip mysql_install_db"
 	@${ECHO} "				(i. e. leave ${DB_DIR} alone)."
 	@${ECHO} "				This is useful for upgrades."
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 00fd6e4621f2..3db2a1958982 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -47,6 +47,8 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-server-suffix='' \
 		--program-prefix=''
 
+.include <bsd.port.pre.mk>
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -72,7 +74,11 @@ CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE
 CFLAGS+=	-I${LOCALBASE}/include/pthread/linuxthreads
-LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
+.if ${OSVERSION} > 500000
+LIB_DEPENDS+=   lthread.3:${PORTSDIR}/devel/linuxthreads
+.else
+LIB_DEPENDS+=   lthread.2:${PORTSDIR}/devel/linuxthreads
+.endif
 .endif
 .if defined(THREAD_SAFE_CLIENT)
 CONFIGURE_ARGS+=--enable-thread-safe-client
@@ -81,7 +87,6 @@ CONFIGURE_ARGS+=--enable-thread-safe-client
 CFLAGS+=	-O3 -fno-omit-frame-pointer
 CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 
-.include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 400002
 CXXFLAGS+=	-fno-exceptions
 .endif
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 00fd6e4621f2..3db2a1958982 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -47,6 +47,8 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-server-suffix='' \
 		--program-prefix=''
 
+.include <bsd.port.pre.mk>
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -72,7 +74,11 @@ CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE
 CFLAGS+=	-I${LOCALBASE}/include/pthread/linuxthreads
-LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
+.if ${OSVERSION} > 500000
+LIB_DEPENDS+=   lthread.3:${PORTSDIR}/devel/linuxthreads
+.else
+LIB_DEPENDS+=   lthread.2:${PORTSDIR}/devel/linuxthreads
+.endif
 .endif
 .if defined(THREAD_SAFE_CLIENT)
 CONFIGURE_ARGS+=--enable-thread-safe-client
@@ -81,7 +87,6 @@ CONFIGURE_ARGS+=--enable-thread-safe-client
 CFLAGS+=	-O3 -fno-omit-frame-pointer
 CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 
-.include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 400002
 CXXFLAGS+=	-fno-exceptions
 .endif
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 00fd6e4621f2..3db2a1958982 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -47,6 +47,8 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-server-suffix='' \
 		--program-prefix=''
 
+.include <bsd.port.pre.mk>
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -72,7 +74,11 @@ CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE
 CFLAGS+=	-I${LOCALBASE}/include/pthread/linuxthreads
-LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
+.if ${OSVERSION} > 500000
+LIB_DEPENDS+=   lthread.3:${PORTSDIR}/devel/linuxthreads
+.else
+LIB_DEPENDS+=   lthread.2:${PORTSDIR}/devel/linuxthreads
+.endif
 .endif
 .if defined(THREAD_SAFE_CLIENT)
 CONFIGURE_ARGS+=--enable-thread-safe-client
@@ -81,7 +87,6 @@ CONFIGURE_ARGS+=--enable-thread-safe-client
 CFLAGS+=	-O3 -fno-omit-frame-pointer
 CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 
-.include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 400002
 CXXFLAGS+=	-fno-exceptions
 .endif
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 00fd6e4621f2..3db2a1958982 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -47,6 +47,8 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-server-suffix='' \
 		--program-prefix=''
 
+.include <bsd.port.pre.mk>
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -72,7 +74,11 @@ CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE
 CFLAGS+=	-I${LOCALBASE}/include/pthread/linuxthreads
-LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
+.if ${OSVERSION} > 500000
+LIB_DEPENDS+=   lthread.3:${PORTSDIR}/devel/linuxthreads
+.else
+LIB_DEPENDS+=   lthread.2:${PORTSDIR}/devel/linuxthreads
+.endif
 .endif
 .if defined(THREAD_SAFE_CLIENT)
 CONFIGURE_ARGS+=--enable-thread-safe-client
@@ -81,7 +87,6 @@ CONFIGURE_ARGS+=--enable-thread-safe-client
 CFLAGS+=	-O3 -fno-omit-frame-pointer
 CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 
-.include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 400002
 CXXFLAGS+=	-fno-exceptions
 .endif
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 00fd6e4621f2..3db2a1958982 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -47,6 +47,8 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-server-suffix='' \
 		--program-prefix=''
 
+.include <bsd.port.pre.mk>
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -72,7 +74,11 @@ CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE
 CFLAGS+=	-I${LOCALBASE}/include/pthread/linuxthreads
-LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
+.if ${OSVERSION} > 500000
+LIB_DEPENDS+=   lthread.3:${PORTSDIR}/devel/linuxthreads
+.else
+LIB_DEPENDS+=   lthread.2:${PORTSDIR}/devel/linuxthreads
+.endif
 .endif
 .if defined(THREAD_SAFE_CLIENT)
 CONFIGURE_ARGS+=--enable-thread-safe-client
@@ -81,7 +87,6 @@ CONFIGURE_ARGS+=--enable-thread-safe-client
 CFLAGS+=	-O3 -fno-omit-frame-pointer
 CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 
-.include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 400002
 CXXFLAGS+=	-fno-exceptions
 .endif
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 00fd6e4621f2..3db2a1958982 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -47,6 +47,8 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-server-suffix='' \
 		--program-prefix=''
 
+.include <bsd.port.pre.mk>
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -72,7 +74,11 @@ CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE
 CFLAGS+=	-I${LOCALBASE}/include/pthread/linuxthreads
-LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
+.if ${OSVERSION} > 500000
+LIB_DEPENDS+=   lthread.3:${PORTSDIR}/devel/linuxthreads
+.else
+LIB_DEPENDS+=   lthread.2:${PORTSDIR}/devel/linuxthreads
+.endif
 .endif
 .if defined(THREAD_SAFE_CLIENT)
 CONFIGURE_ARGS+=--enable-thread-safe-client
@@ -81,7 +87,6 @@ CONFIGURE_ARGS+=--enable-thread-safe-client
 CFLAGS+=	-O3 -fno-omit-frame-pointer
 CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 
-.include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 400002
 CXXFLAGS+=	-fno-exceptions
 .endif
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 00fd6e4621f2..3db2a1958982 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -47,6 +47,8 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-server-suffix='' \
 		--program-prefix=''
 
+.include <bsd.port.pre.mk>
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -72,7 +74,11 @@ CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE
 CFLAGS+=	-I${LOCALBASE}/include/pthread/linuxthreads
-LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
+.if ${OSVERSION} > 500000
+LIB_DEPENDS+=   lthread.3:${PORTSDIR}/devel/linuxthreads
+.else
+LIB_DEPENDS+=   lthread.2:${PORTSDIR}/devel/linuxthreads
+.endif
 .endif
 .if defined(THREAD_SAFE_CLIENT)
 CONFIGURE_ARGS+=--enable-thread-safe-client
@@ -81,7 +87,6 @@ CONFIGURE_ARGS+=--enable-thread-safe-client
 CFLAGS+=	-O3 -fno-omit-frame-pointer
 CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 
-.include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 400002
 CXXFLAGS+=	-fno-exceptions
 .endif
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 00fd6e4621f2..3db2a1958982 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -47,6 +47,8 @@ CONFIGURE_ARGS=	--localstatedir=${DB_DIR} \
 		--with-server-suffix='' \
 		--program-prefix=''
 
+.include <bsd.port.pre.mk>
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=--enable-assembler --with-berkeley-db
 .endif
@@ -72,7 +74,11 @@ CONFIGURE_ARGS+=-D_THREAD_SAFE -I${LOCALBASE}/include/pthread/linuxthreads
 CONFIGURE_ARGS+=-L${LOCALBASE}/lib -llthread -llgcc_r'
 CFLAGS+=	-D__USE_UNIX98 -D_REENTRANT -D_THREAD_SAFE
 CFLAGS+=	-I${LOCALBASE}/include/pthread/linuxthreads
-LIB_DEPENDS+=	lthread.2:${PORTSDIR}/devel/linuxthreads
+.if ${OSVERSION} > 500000
+LIB_DEPENDS+=   lthread.3:${PORTSDIR}/devel/linuxthreads
+.else
+LIB_DEPENDS+=   lthread.2:${PORTSDIR}/devel/linuxthreads
+.endif
 .endif
 .if defined(THREAD_SAFE_CLIENT)
 CONFIGURE_ARGS+=--enable-thread-safe-client
@@ -81,7 +87,6 @@ CONFIGURE_ARGS+=--enable-thread-safe-client
 CFLAGS+=	-O3 -fno-omit-frame-pointer
 CXXFLAGS=	${CFLAGS} -felide-constructors -fno-rtti
 
-.include <bsd.port.pre.mk>
 .if ${OSVERSION} >= 400002
 CXXFLAGS+=	-fno-exceptions
 .endif