diff -ruN mysql40-server.orig/Makefile mysql40-server/Makefile
--- mysql40-server.orig/Makefile	Tue Mar 25 17:38:00 2003
+++ mysql40-server/Makefile	Tue Mar 25 17:37:55 2003
@@ -44,7 +44,8 @@
 		--with-mysqlfs \
 		--with-vio \
 		--with-low-memory \
-		--with-comment='FreeBSD port: ${PKGNAME}'
+		--with-comment='FreeBSD port: ${PKGNAME}' \
+		--enable-thread-safe-client
 
 .include <bsd.port.pre.mk>
 
@@ -78,9 +79,6 @@
 .else
 LIB_DEPENDS+=   lthread.2:${PORTSDIR}/devel/linuxthreads
 .endif
-.endif
-.if defined(THREAD_SAFE_CLIENT)
-CONFIGURE_ARGS+=--enable-thread-safe-client
 .endif
 
 CFLAGS+=	-O3 -fno-omit-frame-pointer
diff -ruN mysql40-server.orig/pkg-plist.client mysql40-server/pkg-plist.client
--- mysql40-server.orig/pkg-plist.client	Tue Mar 25 17:38:00 2003
+++ mysql40-server/pkg-plist.client	Tue Mar 25 17:37:55 2003
@@ -36,5 +36,8 @@
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
 lib/mysql/libmysqlclient.so.12
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
+lib/mysql/libmysqlclient_r.so.12
 @dirrm include/mysql
 @dirrm lib/mysql
diff -ruN mysql40-client.orig/Makefile mysql40-client/Makefile
--- mysql40-client.orig/Makefile	Tue Mar 25 17:38:08 2003
+++ mysql40-client/Makefile	Tue Mar 25 17:38:14 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mysql
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-client
 
 MASTERDIR=	${.CURDIR}/../mysql40-server