[pkgsrc/trunk]: pkgsrc/databases/mysql4-client Apply fix for PR pkg/28313 com...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0c7f54a57b73
branches:  trunk
changeset: 483647:0c7f54a57b73
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Nov 16 18:01:58 2004 +0000

description:
Apply fix for PR pkg/28313 committed by tron@ on mysql-client some
minutes ago, but using subst.mk.

diffstat:

 databases/mysql4-client/Makefile        |   4 ++--
 databases/mysql4-client/Makefile.common |  15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diffs (57 lines):

diff -r 67828a35065c -r 0c7f54a57b73 databases/mysql4-client/Makefile
--- a/databases/mysql4-client/Makefile  Tue Nov 16 18:01:11 2004 +0000
+++ b/databases/mysql4-client/Makefile  Tue Nov 16 18:01:58 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2004/11/12 14:19:07 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2004/11/16 18:01:58 xtraeme Exp $
 
 PKGNAME=               ${DISTNAME:S/-/-client-/}
-PKGREVISION=           3
+PKGREVISION=           4
 SVR4_PKGNAME=          mysqc
 COMMENT=               MySQL 4, a free SQL database (client)
 
diff -r 67828a35065c -r 0c7f54a57b73 databases/mysql4-client/Makefile.common
--- a/databases/mysql4-client/Makefile.common   Tue Nov 16 18:01:11 2004 +0000
+++ b/databases/mysql4-client/Makefile.common   Tue Nov 16 18:01:58 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2004/11/12 12:39:12 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.23 2004/11/16 18:01:58 xtraeme Exp $
 
 DISTNAME=              mysql-4.1.7
 CATEGORIES=            databases
@@ -70,7 +70,13 @@
 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
@@ -85,7 +91,7 @@
 USE_LIBTOOL=           # defined
 LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
-SUBST_CLASSES+=                mk scripts
+SUBST_CLASSES+=                mk scripts thr
 SUBST_STAGE.mk=                post-extract
 SUBST_FILES.mk=                dbug/Makefile.in heap/Makefile.in isam/Makefile.in \
                        merge/Makefile.in mysys/Makefile.in \
@@ -96,6 +102,11 @@
 SUBST_FILES.scripts=   scripts/mysql_install_db.sh scripts/mysqld_safe.sh      
 SUBST_SED.scripts=     -e "s,chown,${CHOWN},g"
 SUBST_MESSAGE.scripts= "Fixing scripts."
+SUBST_STAGE.thr=       post-configure
+SUBST_FILES.thr=       libmysql/Makefile
+SUBST_SED.thr=         -e "s,${PTHREAD_CFLAGS},,g"     \
+                       -e "s,${PTHREAD_LDFLAGS},,g"    \
+                       -e "s,${PTHREAD_LIBS},,g"
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"