Index: head/databases/myodbc/Makefile
===================================================================
--- head/databases/myodbc/Makefile	(revision 55384)
+++ head/databases/myodbc/Makefile	(revision 55385)
@@ -1,52 +1,60 @@
 # New ports collection makefile for:	MyODBC
 # Date created:				24 Oct 2000
 # Whom:					ebakke@trolltech.com
 #
 # $FreeBSD$
 #
 
 PORTNAME=	myodbc
 PORTVERSION=	2.50.39
 CATEGORIES=	databases
 MASTER_SITES=	http://www.mysql.com/Downloads/MyODBC/ \
 		ftp://sunsite.dk/mirrors/mysql/Downloads/MyODBC/ \
 		ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MyODBC/
 DISTNAME=	MyODBC-${PORTVERSION}
 
 MAINTAINER=	ebakke@trolltech.com
 
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-mysql-libs=${LOCALBASE}/lib/mysql \
 		--with-mysql-includes=${LOCALBASE}/include/mysql
 
 # 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:
 DRIVER_MANAGER?=	iodbc
 
 .if ${DRIVER_MANAGER} == "unixodbc"
 CONFIGURE_ARGS+=	--with-odbc-ini=${LOCALBASE}/etc/odbc.ini
 LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
 .else	# assume we're using iodbc
 LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 CONFIGURE_ARGS+=	--with-odbc-ini=${LOCALBASE}/etc/libiodbc/odbc.ini
 .endif
 
+# Allow a new value of ODBCVER to be set at build-time
+.if defined(ODBCVER)
+post-patch:
+	cd ${WRKSRC}; \
+	${MV} myodbc.h myodbc.h.orig; \
+	${SED} -e "s/ODBCVER 0x0250/ODBCVER ${ODBCVER}/" < myodbc.h.orig > myodbc.h
+.endif
+
 # XXX untested
 .if defined(STATIC)
 CONFIGURE_ARGS+=	--enable-shared=no \
 			--enable-static=yes
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}
 # Install the INSTALL file as well, since it describes how to set up odbc.ini
 	@ ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
 	@ ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/databases/myodbc/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/databases/myodbc/files/patch-info.c
===================================================================
--- head/databases/myodbc/files/patch-info.c	(nonexistent)
+++ head/databases/myodbc/files/patch-info.c	(revision 55385)
@@ -0,0 +1,34 @@
+--- 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;

Property changes on: head/databases/myodbc/files/patch-info.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/databases/mysql-connector-odbc/Makefile
===================================================================
--- head/databases/mysql-connector-odbc/Makefile	(revision 55384)
+++ head/databases/mysql-connector-odbc/Makefile	(revision 55385)
@@ -1,52 +1,60 @@
 # New ports collection makefile for:	MyODBC
 # Date created:				24 Oct 2000
 # Whom:					ebakke@trolltech.com
 #
 # $FreeBSD$
 #
 
 PORTNAME=	myodbc
 PORTVERSION=	2.50.39
 CATEGORIES=	databases
 MASTER_SITES=	http://www.mysql.com/Downloads/MyODBC/ \
 		ftp://sunsite.dk/mirrors/mysql/Downloads/MyODBC/ \
 		ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/MyODBC/
 DISTNAME=	MyODBC-${PORTVERSION}
 
 MAINTAINER=	ebakke@trolltech.com
 
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-mysql-libs=${LOCALBASE}/lib/mysql \
 		--with-mysql-includes=${LOCALBASE}/include/mysql
 
 # 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:
 DRIVER_MANAGER?=	iodbc
 
 .if ${DRIVER_MANAGER} == "unixodbc"
 CONFIGURE_ARGS+=	--with-odbc-ini=${LOCALBASE}/etc/odbc.ini
 LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
 .else	# assume we're using iodbc
 LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 CONFIGURE_ARGS+=	--with-odbc-ini=${LOCALBASE}/etc/libiodbc/odbc.ini
 .endif
 
+# Allow a new value of ODBCVER to be set at build-time
+.if defined(ODBCVER)
+post-patch:
+	cd ${WRKSRC}; \
+	${MV} myodbc.h myodbc.h.orig; \
+	${SED} -e "s/ODBCVER 0x0250/ODBCVER ${ODBCVER}/" < myodbc.h.orig > myodbc.h
+.endif
+
 # XXX untested
 .if defined(STATIC)
 CONFIGURE_ARGS+=	--enable-shared=no \
 			--enable-static=yes
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}
 # Install the INSTALL file as well, since it describes how to set up odbc.ini
 	@ ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCSDIR}
 	@ ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/databases/mysql-connector-odbc/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/databases/mysql-connector-odbc/files/patch-info.c
===================================================================
--- head/databases/mysql-connector-odbc/files/patch-info.c	(nonexistent)
+++ head/databases/mysql-connector-odbc/files/patch-info.c	(revision 55385)
@@ -0,0 +1,34 @@
+--- 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;

Property changes on: head/databases/mysql-connector-odbc/files/patch-info.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property