From 995688bcfa166bc9a7ba6224b02394751813ceb9 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 19 Aug 2011 07:59:58 +0000 Subject: Changes 5.1.8: * Documentation in .CHM and .HLP format has been removed from the distribution. * For some procedure and parameter combinations SQLProcedureColumns() did not work correctly. For example, it could not return records for an existing procedure with correct parameters supplied. * Further, it returned incorrect data for column 7, TYPE_NAME. For example, it returned VARCHAR(20) instead of VARCHAR. * The MySQL Connector/ODBC MSI installer did not set the InstallLocation value in the Microsoft Windows registry. * In bulk upload mode, SQLExecute would return SQL_SUCCESS, even when the uploaded data contained errors, such as primary key duplication, and foreign key violation. * SQLDescribeCol and SQLColAttribute could not be called before SQLExecute, if the query was parameterized and not all parameters were bound. * Note, MSDN states that “For performance reasons, an application should not call SQLColAttribute/SQLDescribeCol before executing a statement.” However, it should still be possible to do so if performance reasons are not paramount. * When SQLNumResultCols() was called between SQLPrepare() and SQLExecute() the driver ran SET @@sql_select_limit=1, which limited the resultset to just one row. * After installing MySQL Connector/ODBC, the system DSN created could not be configured or deleted. An error dialog was displayed, showing the error message “Invalid attribute string”. * In this case the problem was due to the fact that the driver could not parse the NULL-separated connection string. * When used after a call to SQLTables(), SQLRowCount() did not return the correct value. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- databases/myodbc/Makefile | 22 ++++++++++++---------- databases/myodbc/PLIST | 3 +-- databases/myodbc/distinfo | 12 ++++++------ databases/myodbc/options.mk | 15 +++++++-------- databases/myodbc/patches/patch-ab | 4 ++-- databases/myodbc/patches/patch-ad | 4 ++-- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile index 4d9cf04c74b..772e7983723 100644 --- a/databases/myodbc/Makefile +++ b/databases/myodbc/Makefile @@ -1,32 +1,34 @@ -# $NetBSD: Makefile,v 1.24 2011/01/13 13:53:24 wiz Exp $ -# +# $NetBSD: Makefile,v 1.25 2011/08/19 07:59:58 adam Exp $ -DISTNAME= mysql-connector-odbc-5.1.6 +DISTNAME= mysql-connector-odbc-5.1.8 PKGNAME= ${DISTNAME:S/mysql-connector-odbc/myodbc/} -PKGREVISION= 2 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL:=Connector-ODBC/5.1/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.mysql.com/ COMMENT= ODBC driver (server side) for MySQL +LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_TOOLS+= gmake - -CONFIGURE_ARGS+= --with-mysql-path=${BUILDLINK_PREFIX.mysql-client} +USE_LIBTOOL= yes +USE_TOOLS+= gmake +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datadir=${PREFIX}/share/doc CONFIGURE_ARGS+= --disable-gui CONFIGURE_ARGS+= --disable-myodbc3i -CONFIGURE_ARGS+= --without-samples CONFIGURE_ARGS+= --disable-test +CONFIGURE_ARGS+= --with-mysql-path=${BUILDLINK_PREFIX.mysql-client} +CONFIGURE_ARGS+= --without-samples INSTALLATION_DIRS= share/doc/mysql-connector-odbc .include "options.mk" + +# 5.5 fails on my_free(), which no longer accepts 2 arguments, but 1 +MYSQL_VERSIONS_ACCEPTED= 51 50 + .include "../../devel/libltdl/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/mysql.buildlink3.mk" diff --git a/databases/myodbc/PLIST b/databases/myodbc/PLIST index 11d6ed7be3c..d47270cfcdb 100644 --- a/databases/myodbc/PLIST +++ b/databases/myodbc/PLIST @@ -1,10 +1,9 @@ -@comment $NetBSD: PLIST,v 1.7 2010/05/03 05:03:11 jnemeth Exp $ +@comment $NetBSD: PLIST,v 1.8 2011/08/19 07:59:58 adam Exp $ bin/myodbc-installer ${PLIST.gui}lib/libmyodbc3S.la lib/libmyodbc5.la share/doc/mysql-connector-odbc/ChangeLog share/doc/mysql-connector-odbc/INSTALL -share/doc/mysql-connector-odbc/LICENSE.exceptions share/doc/mysql-connector-odbc/LICENSE.gpl share/doc/mysql-connector-odbc/README share/doc/mysql-connector-odbc/README.debug diff --git a/databases/myodbc/distinfo b/databases/myodbc/distinfo index 705287f8066..3c69c3d0c9d 100644 --- a/databases/myodbc/distinfo +++ b/databases/myodbc/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.7 2010/05/03 05:03:11 jnemeth Exp $ +$NetBSD: distinfo,v 1.8 2011/08/19 07:59:58 adam Exp $ -SHA1 (mysql-connector-odbc-5.1.6.tar.gz) = c02e1c671fae60f7f7389dd2f963b07c3113ab35 -RMD160 (mysql-connector-odbc-5.1.6.tar.gz) = 90eeefbfb0153a32dd7f0be5c2685fcf13036543 -Size (mysql-connector-odbc-5.1.6.tar.gz) = 1041247 bytes +SHA1 (mysql-connector-odbc-5.1.8.tar.gz) = 2272075c66712cf7a05e50eeb4520f7c504c3ae8 +RMD160 (mysql-connector-odbc-5.1.8.tar.gz) = 0db5c4d42c7377f7fc1fa2ad569f50f9a497511e +Size (mysql-connector-odbc-5.1.8.tar.gz) = 1079813 bytes SHA1 (patch-aa) = 008d85389f444ca2f60fee1c67651e0a00d13e4f -SHA1 (patch-ab) = 972d39b8eabea7af4e31791d5993dc4a5c24dc2e +SHA1 (patch-ab) = 0d2782336164bd35729d0a82485ed47d890834f8 SHA1 (patch-ac) = f7920f3a3321b09c93cfbf2959d52455e1ed7436 -SHA1 (patch-ad) = 05ee2c4c11c009bc7c4c758ef0168a43b6ad0185 +SHA1 (patch-ad) = 74a2067b2b9d1dca4cf798f4af4901dbdde5d51a diff --git a/databases/myodbc/options.mk b/databases/myodbc/options.mk index 71ff3be9c9a..5cbaa94e6d1 100644 --- a/databases/myodbc/options.mk +++ b/databases/myodbc/options.mk @@ -1,17 +1,16 @@ -# $NetBSD: options.mk,v 1.4 2008/04/12 22:42:59 jlam Exp $ -# +# $NetBSD: options.mk,v 1.5 2011/08/19 07:59:58 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.myodbc PKG_OPTIONS_REQUIRED_GROUPS= db -PKG_OPTIONS_GROUP.db= myodbc-iodbc myodbc-unixodbc -PKG_SUPPORTED_OPTIONS= myodbc-gui -PKG_SUGGESTED_OPTIONS= myodbc-iodbc +PKG_OPTIONS_GROUP.db= iodbc unixodbc +PKG_SUPPORTED_OPTIONS= gui +PKG_SUGGESTED_OPTIONS= iodbc .include "../../mk/bsd.options.mk" PLIST_VARS+= gui -.if !empty(PKG_OPTIONS:Mmyodbc-gui) +.if !empty(PKG_OPTIONS:Mgui) . include "../../x11/qt3-tools/buildlink3.mk" CONFIGURE_ARGS+= --enable-gui USE_LANGUAGES= c c++ @@ -20,13 +19,13 @@ PLIST.gui= yes CONFIGURE_ARGS+= --disable-gui .endif -.if !empty(PKG_OPTIONS:Mmyodbc-iodbc) +.if !empty(PKG_OPTIONS:Miodbc) . include "../../databases/iodbc/buildlink3.mk" CONFIGURE_ARGS+= --with-iODBC=${BUILDLINK_PREFIX.iodbc} CONFIGURE_ARGS+= --with-odbc-ini=${PKG_SYSCONFDIR.iodbc}/odbc.ini .endif -.if !empty(PKG_OPTIONS:Mmyodbc-unixodbc) +.if !empty(PKG_OPTIONS:Munixodbc) . include "../../databases/unixodbc/buildlink3.mk" CONFIGURE_ARGS+= --with-unixODBC=${BUILDLINK_PREFIX.unixodbc} CONFIGURE_ARGS+= --with-odbc-ini=${PKG_SYSCONFDIR.unixodbc}/odbc.ini diff --git a/databases/myodbc/patches/patch-ab b/databases/myodbc/patches/patch-ab index f40ad520236..c5e3d04e781 100644 --- a/databases/myodbc/patches/patch-ab +++ b/databases/myodbc/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2010/05/03 05:03:11 jnemeth Exp $ +$NetBSD: patch-ab,v 1.4 2011/08/19 07:59:58 adam Exp $ --- driver/Makefile.in.orig 2009-11-05 21:35:15.000000000 +0000 +++ driver/Makefile.in -@@ -358,7 +358,7 @@ distclean-hdr: +@@ -363,7 +363,7 @@ distclean-hdr: -rm -f myconf.h stamp-h1 install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) diff --git a/databases/myodbc/patches/patch-ad b/databases/myodbc/patches/patch-ad index bb626a74094..7d48ecc708a 100644 --- a/databases/myodbc/patches/patch-ad +++ b/databases/myodbc/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1 2010/05/03 05:03:11 jnemeth Exp $ +$NetBSD: patch-ad,v 1.2 2011/08/19 07:59:58 adam Exp $ --- setup/Makefile.in.orig 2009-11-05 21:35:15.000000000 +0000 +++ setup/Makefile.in -@@ -397,7 +397,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) +@@ -400,7 +400,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) -- cgit v1.2.3