From ac1cf6e702e3e8c3f8cd5b73bc6bb156de3cdd07 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 30 Dec 2005 21:03:59 +0000 Subject: Update databases/iodbc to 3.52.3. Changes from version 2.50.3 include adding some support for the ODBC 3.x specifications and fixing quite a lot of bugs. --- databases/iodbc/Makefile | 41 ++++++++++++++++++++-------------------- databases/iodbc/PLIST | 23 +++++++++++++++++----- databases/iodbc/buildlink3.mk | 11 ++++++++--- databases/iodbc/distinfo | 11 +++++++---- databases/iodbc/patches/patch-aa | 24 +++++++++++++++++++++++ databases/iodbc/patches/patch-ab | 15 +++++++++++++++ databases/iodbc/patches/patch-ac | 17 +++++++++++++++++ 7 files changed, 109 insertions(+), 33 deletions(-) create mode 100644 databases/iodbc/patches/patch-aa create mode 100644 databases/iodbc/patches/patch-ab create mode 100644 databases/iodbc/patches/patch-ac (limited to 'databases/iodbc') diff --git a/databases/iodbc/Makefile b/databases/iodbc/Makefile index 4c3eb70a5ee..21fd472cb5f 100644 --- a/databases/iodbc/Makefile +++ b/databases/iodbc/Makefile @@ -1,31 +1,30 @@ -# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:11 tv Exp $ -# +# $NetBSD: Makefile,v 1.12 2005/12/30 21:03:59 jlam Exp $ -DISTNAME= libiodbc-2.50.3 -PKGNAME= iodbc-2.50.3 -PKGREVISION= 1 -CATEGORIES= databases -MASTER_SITES= http://www.iodbc.org/dist/ +DISTNAME= libiodbc-3.52.3 +PKGNAME= ${DISTNAME:S/^lib//} +CATEGORIES= databases +MASTER_SITES= http://www.iodbc.org/downloads/iODBC/ -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.iodbc.org/ -COMMENT= ODBC 2.x driver manager +MAINTAINER= jlam@pkgsrc.org +HOMEPAGE= http://www.iodbc.org/ +COMMENT= ODBC 2.x driver manager -CONFLICTS+= unixodbc-[0-9]* +CONFLICTS+= unixodbc-[0-9]* -GNU_CONFIGURE= yes USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --disable-gui +CONFIGURE_ARGS+= --with-iodbc-inidir=${PKG_SYSCONFDIR} +LIBADD_DL= ${DL_LDFLAGS} ${DL_LIBS} +MAKE_FLAGS+= LIBADD_DL=${LIBADD_DL:Q} + +EGDIR= ${PREFIX}/share/examples/${PKGBASE} +CONF_FILES= ${EGDIR}/odbc.ini ${PKG_SYSCONFDIR}/odbc.ini -CONFIGURE_ARGS+= --with-iodbc-inidir=/etc +.include "../../mk/dlopen.buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/iodbc - ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/iodbc - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/iodbc - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/iodbc - ${INSTALL_DATA} ${WRKSRC}/odbc.ini.sample \ - ${PREFIX}/share/examples/iodbc/odbc.ini - ${INSTALL_PROGRAM} ${WRKSRC}/samples/odbctest ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/etc/odbc.ini.sample ${EGDIR}/odbc.ini .include "../../mk/bsd.pkg.mk" diff --git a/databases/iodbc/PLIST b/databases/iodbc/PLIST index f6b53b5d4ff..efa57932954 100644 --- a/databases/iodbc/PLIST +++ b/databases/iodbc/PLIST @@ -1,14 +1,27 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:22 jlam Exp $ -bin/odbctest +@comment $NetBSD: PLIST,v 1.3 2005/12/30 21:03:59 jlam 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 lib/libiodbc.la -share/doc/iodbc/COPYING -share/doc/iodbc/README +lib/libiodbcinst.la +lib/libodbc.a +lib/libodbc.so +lib/pkgconfig/libiodbc.pc +man/man1/iodbc-config.1 +man/man1/iodbctest.1 +man/man1/iodbctestw.1 +share/examples/iodbc/Makefile +share/examples/iodbc/iodbctest.c share/examples/iodbc/odbc.ini @dirrm share/examples/iodbc -@dirrm share/doc/iodbc diff --git a/databases/iodbc/buildlink3.mk b/databases/iodbc/buildlink3.mk index 108e402d957..29f19f77272 100644 --- a/databases/iodbc/buildlink3.mk +++ b/databases/iodbc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2004/10/03 00:13:18 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2005/12/30 21:03:59 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ IODBC_BUILDLINK3_MK:= ${IODBC_BUILDLINK3_MK}+ @@ -11,9 +11,14 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Niodbc} BUILDLINK_PACKAGES+= iodbc .if !empty(IODBC_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.iodbc+= iodbc>=2.50.3 -BUILDLINK_RECOMMENDED.iodbc+= iodbc>=2.50.3nb1 +BUILDLINK_DEPENDS.iodbc+= iodbc>=3.52.3 BUILDLINK_PKGSRCDIR.iodbc?= ../../databases/iodbc .endif # IODBC_BUILDLINK3_MK +# ODBC drivers don't need these bits, but ODBC clients do. +.if !defined(ODBC_DRIVER) +. include "../../mk/dlopen.buildlink3.mk" +. include "../../mk/pthread.buildlink3.mk" +.endif + BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/databases/iodbc/distinfo b/databases/iodbc/distinfo index ce1c45c90e3..4f6873c17ba 100644 --- a/databases/iodbc/distinfo +++ b/databases/iodbc/distinfo @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 16:33:06 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/12/30 21:03:59 jlam Exp $ -SHA1 (libiodbc-2.50.3.tar.gz) = 00586122fe823fac67031c3d4866a817c19f4f33 -RMD160 (libiodbc-2.50.3.tar.gz) = e224c023ac039ba35566f3a7a0d79e493d83971f -Size (libiodbc-2.50.3.tar.gz) = 167249 bytes +SHA1 (libiodbc-3.52.3.tar.gz) = 01c0925994011f5249a164177203570c399cb1d0 +RMD160 (libiodbc-3.52.3.tar.gz) = d90ef82b9a8624fac107ec9e3196023ab3c30ec8 +Size (libiodbc-3.52.3.tar.gz) = 720332 bytes +SHA1 (patch-aa) = a17457eae6fcce66ff754d122a248526c663d60e +SHA1 (patch-ab) = d0bfad834a2b3594844bb1420b4f609b42a7acb5 +SHA1 (patch-ac) = 79388bb9aa18d12266d99593e69bbb44b0243f03 diff --git a/databases/iodbc/patches/patch-aa b/databases/iodbc/patches/patch-aa new file mode 100644 index 00000000000..792690cc8e8 --- /dev/null +++ b/databases/iodbc/patches/patch-aa @@ -0,0 +1,24 @@ +$NetBSD: patch-aa,v 1.3 2005/12/30 21:03:59 jlam Exp $ + +Rip out a completely non-standard and hokey way to determine if wchar_t +is a valid type. + +--- include/sqltypes.h.orig 2005-10-08 07:42:02.000000000 -0400 ++++ include/sqltypes.h +@@ -388,16 +388,7 @@ SQLGUID; + typedef unsigned short SQLWCHAR; + #else + # include +- +-# if defined(__cplusplus) || \ +- defined(_WCHAR_T) || \ +- defined(_WCHAR_T_DEFINED) || \ +- defined(_WCHAR_T_DECLARED) || \ +- defined(_BSD_WCHAR_T_DEFINED_) + typedef wchar_t SQLWCHAR; +-# else +-# error Please make sure your system supports the wchar_t type +-# endif + #endif /* WIN32 */ + + diff --git a/databases/iodbc/patches/patch-ab b/databases/iodbc/patches/patch-ab new file mode 100644 index 00000000000..8edae90032e --- /dev/null +++ b/databases/iodbc/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.1 2005/12/30 21:03:59 jlam Exp $ + +By inspection, driverbuf is meant to be a character buffer. + +--- iodbc/connect.c.orig 2005-11-04 08:14:52.000000000 -0500 ++++ iodbc/connect.c +@@ -398,7 +398,7 @@ _iodbcdm_driverload ( + HPROC hproc; + SQLRETURN retcode = SQL_SUCCESS; + sqlstcode_t sqlstat = en_00000; +- char *driverbuf[1024]; ++ char driverbuf[1024]; + + if (path == NULL || ((char *) path)[0] == '\0') + { diff --git a/databases/iodbc/patches/patch-ac b/databases/iodbc/patches/patch-ac new file mode 100644 index 00000000000..b61a86afe8c --- /dev/null +++ b/databases/iodbc/patches/patch-ac @@ -0,0 +1,17 @@ +$NetBSD: patch-ac,v 1.1 2005/12/30 21:03:59 jlam Exp $ + +--- samples/Makefile.in.orig 2005-11-07 05:27:44.000000000 -0500 ++++ samples/Makefile.in +@@ -566,9 +566,9 @@ uninstall-am: uninstall-binPROGRAMS unin + + + install-exec-hook: +- $(mkinstalldirs) ${DESTDIR}${pkgdatadir}/samples +- cp $(srcdir)/iodbctest.c ${DESTDIR}${pkgdatadir}/samples/iodbctest.c +- cp $(srcdir)/Makefile.sample ${DESTDIR}${pkgdatadir}/samples/Makefile ++ $(mkinstalldirs) ${DESTDIR}${datadir}/examples/iodbc ++ cp $(srcdir)/iodbctest.c ${DESTDIR}${datadir}/examples/iodbc/iodbctest.c ++ cp $(srcdir)/Makefile.sample ${DESTDIR}${datadir}/examples/iodbc/Makefile + + uninstall-hook: + rm -f ${DESTDIR}${pkgdatadir}/samples/iodbctest.c -- cgit v1.2.3