- Fix build on RELENG_4 [1]

- Fix build with iODBC
- Bump PORTREVISION

Found by:	kris (via pointyhat) [1]

databases/mysql2odbc/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	mysql2odbc
 PORTVERSION=	0.99.2
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.iodbc.org/downloads/mysql2odbc/
 
@@ -16,10 +17,16 @@ COMMENT=	Openlink MySQL-ODBC Gateway
 OPTIONS=	UNIXODBC	"Build with unixODBC" on \
 		IODBC		"Build with iODBC" off \
 
+.include <bsd.port.pre.mk>
+
 .if !defined(WITH_UNIXODBC) && !defined(WITH_IODBC)
 WITH_UNIXODBC=	yes
 .endif
 
+.if defined(WITH_UNIXODBC) && defined(WITH_IODBC)
+.error "UNIXODBC and IODBC options are mutually exclusive"
+.endif
+
 .if defined(WITH_UNIXODBC)
 LIB_DEPENDS=	odbc:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS=	--with-unixodbc=${LOCALBASE}
@@ -32,9 +39,10 @@ CONFIGURE_ARGS=	--with-iodbc
 
 CONFIGURE_ARGS+=--libdir=${PREFIX}/mysql2odbc
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool:13
 INSTALLS_SHLIB=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

databases/mysql2odbc/files/patch-mtest.c

@@ -1,6 +1,6 @@
---- mtest.c.orig	Sat Aug 20 16:05:55 2005
-+++ mtest.c	Sat Aug 20 16:06:01 2005
-@@ -27,7 +27,7 @@
+--- mtest.c.orig	Fri Jun 20 21:39:48 2003
++++ mtest.c	Tue Sep 13 18:21:18 2005
+@@ -27,10 +27,10 @@
  #include <stdio.h>
  #include <string.h>
  #include <memory.h>
@@ -8,4 +8,8 @@
 +#include <stdlib.h>
  
  #ifndef WIN32
- # include <getopt.h>
+-# include <getopt.h>
++# include <unistd.h>
+ #endif
+ 
+ #ifdef FAKE