[pkgsrc/trunk]: pkgsrc/databases/mysql-client Make sure that "libmysqlclient....

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8fb405774a5c
branches:  trunk
changeset: 483644:8fb405774a5c
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Nov 16 17:29:36 2004 +0000

description:
Make sure that "libmysqlclient.so" is not linked against "libpthread".
Bump package revision because of this changes. This fixes PR pkg/28313
by Jarle Greipsland.

diffstat:

 databases/mysql-client/Makefile        |  10 ++++++++--
 databases/mysql-client/Makefile.common |   8 +++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r 744416f02045 -r 8fb405774a5c databases/mysql-client/Makefile
--- a/databases/mysql-client/Makefile   Tue Nov 16 16:21:40 2004 +0000
+++ b/databases/mysql-client/Makefile   Tue Nov 16 17:29:36 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2004/11/12 14:19:07 xtraeme Exp $
+# $NetBSD: Makefile,v 1.36 2004/11/16 17:29:36 tron Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-client-/}
 SVR4_PKGNAME=          mysqc
-PKGREVISION=           1
+PKGREVISION=           2
 COMMENT=               MySQL 4, a free SQL database (client)
 
 CONFLICTS=             {mysql-client-[0-9]*,mysql3-client-[0-9]*}
@@ -17,6 +17,12 @@
 
 INFO_FILES=            mysql.info
 
+post-configure:
+       ${SED} -e 's#${PTHREAD_CFLAGS}##g' -e 's#${PTHREAD_LDFLAGS}##g' \
+          -e 's#${PTHREAD_LIBS}##g' ${WRKSRC}/libmysql/Makefile \
+          >${WRKSRC}/libmysql/Makefile.new
+       ${MV} ${WRKSRC}/libmysql/Makefile.new ${WRKSRC}/libmysql/Makefile
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info
 
diff -r 744416f02045 -r 8fb405774a5c databases/mysql-client/Makefile.common
--- a/databases/mysql-client/Makefile.common    Tue Nov 16 16:21:40 2004 +0000
+++ b/databases/mysql-client/Makefile.common    Tue Nov 16 17:29:36 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2004/11/12 12:39:12 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.31 2004/11/16 17:29:36 tron Exp $
 
 DISTNAME=              mysql-4.0.22
 CATEGORIES=            databases
@@ -70,8 +70,14 @@
 CXXFLAGS+=             -DHAVE_CURSES_H
 .endif
 
+SAVE_CFLAGS:=          ${CFLAGS}
+SAVE_CXXFLAGS:=                ${CXXFLAGS}
+
 .include "../../mk/pthread.buildlink3.mk"
 
+CFLAGS=                        ${SAVE_CFLAGS}
+CXXFLAGS=              ${SAVE_CXXFLAGS}
+
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth")
 CFLAGS+=       -DSIGNALS_DONT_BREAK_READ
 CXXFLAGS+=     -DSIGNALS_DONT_BREAK_READ