diff options
| -rw-r--r-- | databases/myodbc/Makefile | 47 | ||||
| -rw-r--r-- | databases/myodbc/PLIST | 13 | ||||
| -rw-r--r-- | databases/myodbc/distinfo | 9 | ||||
| -rw-r--r-- | databases/myodbc/options.mk | 32 | ||||
| -rw-r--r-- | databases/myodbc/patches/patch-aa | 21 |
5 files changed, 90 insertions, 32 deletions
diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile index 2fd79f0850d..b1d651e828d 100644 --- a/databases/myodbc/Makefile +++ b/databases/myodbc/Makefile @@ -1,34 +1,33 @@ -# $NetBSD: Makefile,v 1.12 2006/01/08 18:35:08 xtraeme Exp $ +# $NetBSD: Makefile,v 1.13 2006/01/23 18:53:45 xtraeme Exp $ # -DISTNAME= MyODBC-2.50.36 -PKGNAME= myodbc-2.50.36 -PKGREVISION= 2 -CATEGORIES= databases -MASTER_SITES= http://www.mysql.com/Downloads/MyODBC/ +DISTNAME= mysql-connector-odbc-3.51.12 +PKGNAME= ${DISTNAME:S/mysql-connector-odbc/myodbc/} +CATEGORIES= databases +MASTER_SITES= ${MASTER_SITE_MYSQL:=MyODBC3/} -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.mysql.com/ -COMMENT= ODBC driver (server side) for MySQL +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://www.mysql.com/ +COMMENT= ODBC driver (server side) for MySQL -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= gmake -CONFIGURE_ARGS+= --with-mysql-libs=${BUILDLINK_PREFIX.mysql-client}/lib/mysql -CONFIGURE_ARGS+= --with-mysql-includes=${BUILDLINK_PREFIX.mysql-client}/include/mysql -CONFIGURE_ARGS+= --with-iodbc=${BUILDLINK_PREFIX.iodbc} -CONFIGURE_ARGS+= --with-odbc-ini=${BUILDLINK_PREFIX.iodbc}/etc/odbc.ini +CONFIGURE_ARGS+= --with-mysql-path=${BUILDLINK_PREFIX.mysql-client} +CONFIGURE_ARGS+= --disable-gui +CONFIGURE_ARGS+= --disable-myodbc3i +CONFIGURE_ARGS+= --without-samples +CONFIGURE_ARGS+= --disable-test -USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig - -USE_TOOLS+= gmake - -.include "../../databases/iodbc/buildlink3.mk" -.include "../../mk/mysql.buildlink3.mk" +INSTALLATION_DIRS= share/doc/myodbc post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/myodbc - ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/myodbc - ${INSTALL_DATA} ${WRKSRC}/README-WIN32 ${PREFIX}/share/doc/myodbc + ${INSTALL_DATA} ${WRKSRC}/README* ${PREFIX}/share/doc/myodbc +.include "options.mk" +.include "../../devel/libltdl/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../mk/mysql.buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/myodbc/PLIST b/databases/myodbc/PLIST index ab38d028adb..79fe114380c 100644 --- a/databases/myodbc/PLIST +++ b/databases/myodbc/PLIST @@ -1,5 +1,10 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:22 jlam Exp $ -lib/libmyodbc.la -share/doc/myodbc/INSTALL -share/doc/myodbc/README-WIN32 +@comment $NetBSD: PLIST,v 1.3 2006/01/23 18:53:45 xtraeme Exp $ +bin/myodbc3m +lib/libmyodbc3.la +${WITH_GUI}lib/libmyodbc3S.la +lib/libmyodbc3_r.la +share/doc/myodbc/README +share/doc/myodbc/README.osx +share/doc/myodbc/README.unix +share/doc/myodbc/README.win @dirrm share/doc/myodbc diff --git a/databases/myodbc/distinfo b/databases/myodbc/distinfo index 24063cef0de..99aae1883c3 100644 --- a/databases/myodbc/distinfo +++ b/databases/myodbc/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 16:33:06 agc Exp $ +$NetBSD: distinfo,v 1.4 2006/01/23 18:53:45 xtraeme Exp $ -SHA1 (MyODBC-2.50.36.tar.gz) = 86c5d94c1099b8dac67246151824eb3f7c19b93a -RMD160 (MyODBC-2.50.36.tar.gz) = e2a4357c0e596efd809e538d639ce3f1e2228224 -Size (MyODBC-2.50.36.tar.gz) = 413650 bytes +SHA1 (mysql-connector-odbc-3.51.12.tar.gz) = c4a8de079b255d2aa745295f4121ec5e9091de59 +RMD160 (mysql-connector-odbc-3.51.12.tar.gz) = 295bdca51ad5fd7bf0a56ccb161fe5a0463e71ef +Size (mysql-connector-odbc-3.51.12.tar.gz) = 979942 bytes +SHA1 (patch-aa) = d49eb5b4c637303063784a63790411342593b855 diff --git a/databases/myodbc/options.mk b/databases/myodbc/options.mk new file mode 100644 index 00000000000..ad6896a0ef1 --- /dev/null +++ b/databases/myodbc/options.mk @@ -0,0 +1,32 @@ +# $NetBSD: options.mk,v 1.1 2006/01/23 18:53:45 xtraeme 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 + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mmyodbc-gui) +. include "../../x11/qt3-tools/buildlink3.mk" +CONFIGURE_ARGS+= --enable-gui +USE_LANGUAGES+= c++ +PLIST_SUBST+= WITH_GUI= +.else +CONFIGURE_ARGS+= --disable-gui +PLIST_SUBST+= WITH_GUI='@comment ' +.endif + +.if !empty(PKG_OPTIONS:Mmyodbc-iodbc) +. 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) +. include "../../databases/unixodbc/buildlink3.mk" +CONFIGURE_ARGS+= --with-unixODBC=${BUILDLINK_PREFIX.unixodbc} +CONFIGURE_ARGS+= --with-odbc-ini=${PKG_SYSCONFDIR.unixodbc}/odbc.ini +.endif diff --git a/databases/myodbc/patches/patch-aa b/databases/myodbc/patches/patch-aa new file mode 100644 index 00000000000..c17a071cbcb --- /dev/null +++ b/databases/myodbc/patches/patch-aa @@ -0,0 +1,21 @@ +$NetBSD: patch-aa,v 1.1 2006/01/23 18:53:45 xtraeme Exp $ + +--- driver/results.c.orig 2006-01-23 19:13:42.000000000 +0100 ++++ driver/results.c 2006-01-23 19:14:15.000000000 +0100 +@@ -49,6 +49,7 @@ + #include "myodbc3.h" + #include <m_ctype.h> + #include <locale.h> ++#include <sys/param.h> + + #define SQL_MY_PRIMARY_KEY 1212 + +@@ -543,7 +544,7 @@ + @purpose : rerunrs column atribute values + */ + +-#if defined(__APPLE__) ++#if defined(__APPLE__) || defined(BSD) + SQLRETURN SQL_API SQLColAttribute( SQLHSTMT StatementHandle, + SQLUSMALLINT ColumnNumber, + SQLUSMALLINT FieldIdentifier, |