Set --includedir to avoid conflict with unixodbc, adjust BUILDLINK_IN…

…CDIRS

databases/iodbc/Makefile

@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/06/25 22:06:47 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2012/03/15 12:54:09 abs Exp $
 
 DISTNAME=	libiodbc-3.52.7
 PKGNAME=	${DISTNAME:S/^lib//}
+PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.iodbc.org/downloads/iODBC/
 
@@ -10,13 +11,12 @@ HOMEPAGE=	http://www.iodbc.org/
 COMMENT=	ODBC 3.x driver manager
 LICENSE=	gnu-lgpl-v2
 
-CONFLICTS+=	unixodbc-[0-9]*
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-gui
+CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/iodbc
 CONFIGURE_ARGS+=	--with-iodbc-inidir=${PKG_SYSCONFDIR}
 
 DL_AUTO_VARS=		yes

databases/iodbc/PLIST

@@ -1,18 +1,18 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:43:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2012/03/15 12:54:09 abs Exp $
 bin/iodbc-config
 bin/iodbctest
 bin/iodbctestw
-include/iodbcext.h
-include/iodbcinst.h
-include/iodbcunix.h
-include/isql.h
-include/isqlext.h
-include/isqltypes.h
-include/odbcinst.h
-include/sql.h
-include/sqlext.h
-include/sqltypes.h
-include/sqlucode.h
+include/iodbc/iodbcext.h
+include/iodbc/iodbcinst.h
+include/iodbc/iodbcunix.h
+include/iodbc/isql.h
+include/iodbc/isqlext.h
+include/iodbc/isqltypes.h
+include/iodbc/odbcinst.h
+include/iodbc/sql.h
+include/iodbc/sqlext.h
+include/iodbc/sqltypes.h
+include/iodbc/sqlucode.h
 lib/libiodbc.la
 lib/libiodbcinst.la
 lib/libodbc.a

databases/iodbc/buildlink3.mk

@@ -1,11 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:05 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2012/03/15 12:54:09 abs Exp $
 
 BUILDLINK_TREE+=	iodbc
 
 .if !defined(IODBC_BUILDLINK3_MK)
 IODBC_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.iodbc+=	iodbc>=3.52.3
+BUILDLINK_INCDIRS.iodbc?=	${PG_SUBPREFIX}/include
 BUILDLINK_PKGSRCDIR.iodbc?=	../../databases/iodbc
 
 # ODBC drivers don't need these bits, but ODBC clients do.