diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-12-01 16:00:50 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-12-01 16:00:50 +0000 |
| commit | 59b8184ba060e7ce28da06ac9f52ca0e2b5adb87 (patch) | |
| tree | 0fb60f012b514a0293a5db72421f72c759ddb05d /databases/mysqlcc | |
| parent | 2dfd87e0f33a967e3dc3c05c05347840df2cf86b (diff) | |
| download | pkgsrc-59b8184ba060e7ce28da06ac9f52ca0e2b5adb87.tar.gz | |
* 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 (limited to 'databases/mysqlcc')
| -rw-r--r-- | databases/mysqlcc/Makefile | 18 | ||||
| -rw-r--r-- | databases/mysqlcc/distinfo | 3 | ||||
| -rw-r--r-- | databases/mysqlcc/patches/patch-ad | 16 |
3 files changed, 29 insertions, 8 deletions
diff --git a/databases/mysqlcc/Makefile b/databases/mysqlcc/Makefile index ccb43f3448f..f409f939b85 100644 --- a/databases/mysqlcc/Makefile +++ b/databases/mysqlcc/Makefile @@ -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 @@ COMMENT= MySQL Control Center 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 "../../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/mysql.buildlink3.mk" +.include "../../mk/autoconf.mk" +.include "../../mk/automake.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysqlcc/distinfo b/databases/mysqlcc/distinfo index eccf55247ff..868b2a084c5 100644 --- a/databases/mysqlcc/distinfo +++ b/databases/mysqlcc/distinfo @@ -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 --git a/databases/mysqlcc/patches/patch-ad b/databases/mysqlcc/patches/patch-ad new file mode 100644 index 00000000000..1c6b3f95603 --- /dev/null +++ b/databases/mysqlcc/patches/patch-ad @@ -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(); |