[pkgsrc/trunk]: pkgsrc/databases/mysqlcc * mysql_shutdown() takes two argumen...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b23cb281c8a1
branches:  trunk
changeset: 484954:b23cb281c8a1
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed Dec 01 16:00:50 2004 +0000

description:
* mysql_shutdown() takes two arguments in MySQL >= 4.1.3, fix this
  checking MYSQL_VERSION_ID.
* Use mysql.bl3.mk and MYSQL_VERSIONS_ACCEPTED=40 41.

This fixes the bulk build problem, bump PKGREVISION.

diffstat:

 databases/mysqlcc/Makefile         |  18 +++++++++++-------
 databases/mysqlcc/distinfo         |   3 ++-
 databases/mysqlcc/patches/patch-ad |  16 ++++++++++++++++
 3 files changed, 29 insertions(+), 8 deletions(-)

diffs (79 lines):

diff -r 08b708add2c6 -r b23cb281c8a1 databases/mysqlcc/Makefile
--- a/databases/mysqlcc/Makefile        Wed Dec 01 15:57:59 2004 +0000
+++ b/databases/mysqlcc/Makefile        Wed Dec 01 16:00:50 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2004/10/03 00:13:21 tv Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/01 16:00:50 xtraeme Exp $
 #
 
 DISTNAME=              mysqlcc-0.9.4-src
 PKGNAME=               ${DISTNAME:S/-src//}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            databases
 MASTER_SITES=          http://mirrors.sunsite.dk/mysql/Downloads/MySQLCC/ \
                        ftp://sunsite.dk/mirrors/mysql/Downloads/MySQLCC/  \
@@ -16,21 +16,25 @@
 USE_BUILDLINK3=                YES
 USE_PKGLOCALEDIR=      YES
 GNU_CONFIGURE=         YES
-CONFIGURE_ARGS+=       --with-mysql-lib=${PREFIX}/lib/mysql
-CONFIGURE_ARGS+=       --with-mysql-include=${PREFIX}/include/mysql/
+CONFIGURE_ARGS+=       \
+       --with-mysql-lib=${BUILDLINK_PREFIX.mysql-client}/lib/mysql
+CONFIGURE_ARGS+=       \
+       --with-mysql-include=${BUILDLINK_PREFIX.mysql-client}/include/mysql
 CONFIGURE_ARGS+=       --with-openssl-includes=${SSLBASE}/include
 CONFIGURE_ARGS+=       --with-openssl-libs=${SSLBASE}/lib
 CONFIGURE_ENV+=                QMAKESPEC="${QTDIR}/mkspecs/netbsd-g++"
 
+MYSQL_VERSIONS_ACCEPTED=       40 41
+
 pre-configure:
        cd ${WRKSRC} && ${ACLOCAL} && ${AUTOCONF}
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/mysqlcc ${PREFIX}/bin/
 
+.include "../../security/openssl/buildlink3.mk"
+.include "../../x11/qt3-tools/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/autoconf.mk"
 .include "../../mk/automake.mk"
-.include "../../databases/mysql4-client/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 08b708add2c6 -r b23cb281c8a1 databases/mysqlcc/distinfo
--- a/databases/mysqlcc/distinfo        Wed Dec 01 15:57:59 2004 +0000
+++ b/databases/mysqlcc/distinfo        Wed Dec 01 16:00:50 2004 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/21 07:58:30 martti Exp $
+$NetBSD: distinfo,v 1.2 2004/12/01 16:00:50 xtraeme Exp $
 
 SHA1 (mysqlcc-0.9.4-src.tar.gz) = 690a9a8f4ad6bdf33673e92d1016b0e4b8cea030
 Size (mysqlcc-0.9.4-src.tar.gz) = 747244 bytes
 SHA1 (patch-aa) = fbb012582b1df2a34572332dc6e682377101d605
 SHA1 (patch-ab) = 9b2540c2eee1d0665a83da360d75bd488510a84b
 SHA1 (patch-ac) = 5978ef78fa5d941370ae779de259757f1e50c9a8
+SHA1 (patch-ad) = d4fce89c63c2536195fe6af5d4e187a943c7d223
diff -r 08b708add2c6 -r b23cb281c8a1 databases/mysqlcc/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/mysqlcc/patches/patch-ad        Wed Dec 01 16:00:50 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2004/12/01 16:00:50 xtraeme Exp $
+
+--- shared/src/CMySQL.cpp.orig 2004-12-01 16:35:54.000000000 +0100
++++ shared/src/CMySQL.cpp      2004-12-01 16:37:29.000000000 +0100
+@@ -451,7 +451,11 @@
+   if (!isConnected())
+     return false;
+   
++#if (MYSQL_VERSION_ID >= 40103)
++  if (mysql_shutdown(mysql, SHUTDOWN_DEFAULT) != 0)
++#else
+   if (mysql_shutdown(mysql) != 0)
++#endif
+   {
+     if (emiterror)
+       emitError();