Thu Mar 15 12:54:09 2012 UTC ()
Set --includedir to avoid conflict with unixodbc, adjust BUILDLINK_INCDIRS


(abs)
diff -r1.18 -r1.19 pkgsrc/databases/iodbc/Makefile
diff -r1.4 -r1.5 pkgsrc/databases/iodbc/PLIST
diff -r1.8 -r1.9 pkgsrc/databases/iodbc/buildlink3.mk
cvs diff -r1.18 -r1.19 pkgsrc/databases/iodbc/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/iodbc/Makefile 2010/06/25 22:06:47 1.18
+++ pkgsrc/databases/iodbc/Makefile 2012/03/15 12:54:09 1.19
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.18 2010/06/25 22:06:47 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2012/03/15 12:54:09 abs Exp $
2 2
3DISTNAME= libiodbc-3.52.7 3DISTNAME= libiodbc-3.52.7
4PKGNAME= ${DISTNAME:S/^lib//} 4PKGNAME= ${DISTNAME:S/^lib//}
 5PKGREVISION= 1
5CATEGORIES= databases 6CATEGORIES= databases
6MASTER_SITES= http://www.iodbc.org/downloads/iODBC/ 7MASTER_SITES= http://www.iodbc.org/downloads/iODBC/
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.iodbc.org/ 10HOMEPAGE= http://www.iodbc.org/
10COMMENT= ODBC 3.x driver manager 11COMMENT= ODBC 3.x driver manager
11LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
12 13
13CONFLICTS+= unixodbc-[0-9]* 
14 
15PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
16 15
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes
18GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --disable-gui 18CONFIGURE_ARGS+= --disable-gui
 19CONFIGURE_ARGS+= --includedir=${PREFIX}/include/iodbc
20CONFIGURE_ARGS+= --with-iodbc-inidir=${PKG_SYSCONFDIR} 20CONFIGURE_ARGS+= --with-iodbc-inidir=${PKG_SYSCONFDIR}
21 21
22DL_AUTO_VARS= yes 22DL_AUTO_VARS= yes
23 23
24EGDIR= ${PREFIX}/share/examples/${PKGBASE} 24EGDIR= ${PREFIX}/share/examples/${PKGBASE}
25CONF_FILES= ${EGDIR}/odbc.ini ${PKG_SYSCONFDIR}/odbc.ini 25CONF_FILES= ${EGDIR}/odbc.ini ${PKG_SYSCONFDIR}/odbc.ini
26 26
27post-install: 27post-install:
28 ${INSTALL_DATA} ${WRKSRC}/etc/odbc.ini.sample \ 28 ${INSTALL_DATA} ${WRKSRC}/etc/odbc.ini.sample \
29 ${DESTDIR}${EGDIR}/odbc.ini 29 ${DESTDIR}${EGDIR}/odbc.ini
30 30
31.include "../../mk/dlopen.buildlink3.mk" 31.include "../../mk/dlopen.buildlink3.mk"
32.include "../../mk/pthread.buildlink3.mk" 32.include "../../mk/pthread.buildlink3.mk"
cvs diff -r1.4 -r1.5 pkgsrc/databases/iodbc/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/iodbc/PLIST 2009/06/14 17:43:16 1.4
+++ pkgsrc/databases/iodbc/PLIST 2012/03/15 12:54:09 1.5
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:43:16 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.5 2012/03/15 12:54:09 abs Exp $
2bin/iodbc-config 2bin/iodbc-config
3bin/iodbctest 3bin/iodbctest
4bin/iodbctestw 4bin/iodbctestw
5include/iodbcext.h 5include/iodbc/iodbcext.h
6include/iodbcinst.h 6include/iodbc/iodbcinst.h
7include/iodbcunix.h 7include/iodbc/iodbcunix.h
8include/isql.h 8include/iodbc/isql.h
9include/isqlext.h 9include/iodbc/isqlext.h
10include/isqltypes.h 10include/iodbc/isqltypes.h
11include/odbcinst.h 11include/iodbc/odbcinst.h
12include/sql.h 12include/iodbc/sql.h
13include/sqlext.h 13include/iodbc/sqlext.h
14include/sqltypes.h 14include/iodbc/sqltypes.h
15include/sqlucode.h 15include/iodbc/sqlucode.h
16lib/libiodbc.la 16lib/libiodbc.la
17lib/libiodbcinst.la 17lib/libiodbcinst.la
18lib/libodbc.a 18lib/libodbc.a
19lib/libodbc.so 19lib/libodbc.so
20lib/pkgconfig/libiodbc.pc 20lib/pkgconfig/libiodbc.pc
21man/man1/iodbc-config.1 21man/man1/iodbc-config.1
22man/man1/iodbctest.1 22man/man1/iodbctest.1
23man/man1/iodbctestw.1 23man/man1/iodbctestw.1
24share/examples/iodbc/Makefile 24share/examples/iodbc/Makefile
25share/examples/iodbc/iodbctest.c 25share/examples/iodbc/iodbctest.c
26share/examples/iodbc/odbc.ini 26share/examples/iodbc/odbc.ini
cvs diff -r1.8 -r1.9 pkgsrc/databases/iodbc/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/databases/iodbc/buildlink3.mk 2009/03/20 19:24:05 1.8
+++ pkgsrc/databases/iodbc/buildlink3.mk 2012/03/15 12:54:09 1.9
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:05 joerg Exp $ 1# $NetBSD: buildlink3.mk,v 1.9 2012/03/15 12:54:09 abs Exp $
2 2
3BUILDLINK_TREE+= iodbc 3BUILDLINK_TREE+= iodbc
4 4
5.if !defined(IODBC_BUILDLINK3_MK) 5.if !defined(IODBC_BUILDLINK3_MK)
6IODBC_BUILDLINK3_MK:= 6IODBC_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.iodbc+= iodbc>=3.52.3 8BUILDLINK_API_DEPENDS.iodbc+= iodbc>=3.52.3
 9BUILDLINK_INCDIRS.iodbc?= ${PG_SUBPREFIX}/include
9BUILDLINK_PKGSRCDIR.iodbc?= ../../databases/iodbc 10BUILDLINK_PKGSRCDIR.iodbc?= ../../databases/iodbc
10 11
11# ODBC drivers don't need these bits, but ODBC clients do. 12# ODBC drivers don't need these bits, but ODBC clients do.
12.if !defined(ODBC_DRIVER) 13.if !defined(ODBC_DRIVER)
13. include "../../mk/dlopen.buildlink3.mk" 14. include "../../mk/dlopen.buildlink3.mk"
14. include "../../mk/pthread.buildlink3.mk" 15. include "../../mk/pthread.buildlink3.mk"
15.endif 16.endif
16.endif # IODBC_BUILDLINK3_MK 17.endif # IODBC_BUILDLINK3_MK
17 18
18BUILDLINK_TREE+= -iodbc 19BUILDLINK_TREE+= -iodbc