5 files changed, 19 insertions, 65 deletions

diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile
index 1b22e56f8b85..b140452e62d2 100644
--- a/databases/myodbc/Makefile
+++ b/databases/myodbc/Makefile
@@ -1,15 +1,14 @@
 # New ports collection makefile for:	MyODBC
-# Date created:				24 Oct 2000
-# Whom:					ebakke@trolltech.com
+# Date created:				22 Mar 2004
+# Whom:					sergey@migsoft.com.ua
 #
 # $FreeBSD$
 #
 
 PORTNAME=	myodbc
-PORTVERSION=	2.50.39
-PORTREVISION=	1
+PORTVERSION=	3.51.06
 CATEGORIES=	databases
-MASTER_SITES=	http://www.mysql.com/Downloads/MyODBC/ \
+MASTER_SITES=	http://mysql.paco.net/Downloads/MyODBC3/ \
 		ftp://sunsite.dk/mirrors/mysql/Downloads/MyODBC/ \
 		ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MyODBC/
 DISTNAME=	MyODBC-${PORTVERSION}
@@ -17,13 +16,16 @@ DISTNAME=	MyODBC-${PORTVERSION}
 MAINTAINER=	ebakke@trolltech.com
 COMMENT=	ODBC driver for MySQL
 
-LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+USE_MYSQL=	yes
 
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	13
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--with-mysql-libs=${LOCALBASE}/lib/mysql \
 		--with-mysql-includes=${LOCALBASE}/include/mysql
 
+PORTDOCS=	INSTALL README
+
 # MyODBC needs an ODBC driver manager to be installed, and it supports both
 # iODBC and unixODBC.  The following variable may be set at built-time to
 # either "iodbc" or "unixodbc", with the former being the default:
@@ -38,6 +40,12 @@ LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 CONFIGURE_ARGS+=	--with-odbc-ini=${LOCALBASE}/etc/libiodbc/odbc.ini
 .endif
 
+pre-fetch:
+	@${ECHO}
+	@${ECHO} "This software works with MySQL 3.x and 4.0."
+	@${ECHO} "Building against MySQL version 4.1 or 5.0 is not yet supported."
+	@${ECHO}
+
 # Allow a new value of ODBCVER to be set at build-time
 .if defined(ODBCVER)
 post-patch:
diff --git a/databases/myodbc/distinfo b/databases/myodbc/distinfo
index 33bfd6b55c83..49980eec59f7 100644
--- a/databases/myodbc/distinfo
+++ b/databases/myodbc/distinfo
@@ -1 +1,2 @@
-MD5 (MyODBC-2.50.39.tar.gz) = 30765641c87b7fc2c2c67dcf1cb85d7a
+MD5 (MyODBC-3.51.06.tar.gz) = 5a59b4f01592fc9ec96e985bc7d6aada
+SIZE (MyODBC-3.51.06.tar.gz) = 322059
diff --git a/databases/myodbc/files/patch-info.c b/databases/myodbc/files/patch-info.c
deleted file mode 100644
index 8ab380fab4d7..000000000000
--- a/databases/myodbc/files/patch-info.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- info.c.orig	Thu Sep 20 02:04:08 2001
-+++ info.c	Tue Feb  5 10:57:03 2002
-@@ -171,11 +171,13 @@
-     *pcbInfoValue=(SQLSMALLINT) (strmake((char*) rgbInfoValue,"Y",cbInfoValueMax)
- 			   - (char*) rgbInfoValue);
-     break;
-+#if (ODBCVER < 0x0300)
- #ifdef SQL_MAX_IDENTIFIER_LEN
-   case SQL_MAX_IDENTIFIER_LEN:
-     *((SQLUSMALLINT*) rgbInfoValue)=NAME_LEN;
-     break;
- #endif
-+#endif
-   case SQL_CONCAT_NULL_BEHAVIOR:
-     *((SQLSMALLINT*) rgbInfoValue)=SQL_CB_NULL;
-     *pcbInfoValue=sizeof(SQLSMALLINT);
-@@ -188,7 +190,7 @@
- #ifdef SQL_CURSOR_SENSITIVITY
-   case SQL_CURSOR_SENSITIVITY:
-     *((SQLUINTEGER*) rgbInfoValue)=SQL_UNSPECIFIED;
--    break
-+    break;
- #endif
-   case SQL_DEFAULT_TXN_ISOLATION:
-     *((long*) rgbInfoValue)= DEFAULT_TXN_ISOLATION;
-@@ -411,7 +413,7 @@
-     *pcbInfoValue=sizeof(long);
-     break;
- #if (ODBCVER >= 0x0300)
--  case SQL_MAX_IDENTIFIER_LENGTH:
-+  case SQL_MAX_IDENTIFIER_LEN:
-     *((long*) rgbInfoValue)=NAME_LEN;
-     *pcbInfoValue=sizeof(long);
-     break;
diff --git a/databases/myodbc/files/patch-results.c b/databases/myodbc/files/patch-results.c
deleted file mode 100644
index 3f8b6b8da42a..000000000000
--- a/databases/myodbc/files/patch-results.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- results.c	4 Dec 2001 18:47:05 -0000	1.1
-+++ results.c	2 Mar 2002 18:18:21 -0000	1.2
-@@ -743,14 +743,14 @@
-   case SQL_C_SBIGINT:
-   {
-     if (rgbValue)
--      *((longlong*) rgbValue)= atoll(value);
-+      *((longlong*) rgbValue)= strtoll(value, NULL, 10);
-     *pcbValue=sizeof(longlong);
-     break;
-   }
-   case SQL_C_UBIGINT:
-   {
-     if (rgbValue)
--      *((ulonglong*) rgbValue)= (ulonglong) atoll(value);
-+      *((ulonglong*) rgbValue)= strtoull(value, NULL, 10);
-     *pcbValue=sizeof(ulonglong);
-     break;
-   }
diff --git a/databases/myodbc/pkg-plist b/databases/myodbc/pkg-plist
index bce42920d496..79184d14da0f 100644
--- a/databases/myodbc/pkg-plist
+++ b/databases/myodbc/pkg-plist
@@ -1,5 +1,3 @@
-%%PORTDOCS%%share/doc/myodbc/INSTALL
-%%PORTDOCS%%share/doc/myodbc/README
-lib/libmyodbc-2.50.39.so
-lib/libmyodbc.so
-%%PORTDOCS%%@dirrm share/doc/myodbc
+lib/libmyodbc3-3.51.06.so
+lib/libmyodbc3.la
+lib/libmyodbc3.so