From 08254155c05d8ea1568edbdb030e1090499b5a86 Mon Sep 17 00:00:00 2001 From: sthen Date: Thu, 12 Oct 2023 12:00:41 +0000 Subject: [PATCH] update to iodbc-3.52.16 (belated; upstream moved to github, so portroach didn't find it) --- databases/iodbc/Makefile | 29 +++++++++---------- databases/iodbc/distinfo | 4 +-- databases/iodbc/patches/patch-iodbc_connect_c | 2 +- databases/iodbc/patches/patch-iodbcinst_dlf_h | 12 ++++++++ .../iodbc/patches/patch-samples_Makefile_in | 2 +- databases/iodbc/pkg/PLIST-admin | 4 +-- databases/iodbc/pkg/PLIST-main | 4 +-- 7 files changed, 34 insertions(+), 23 deletions(-) create mode 100644 databases/iodbc/patches/patch-iodbcinst_dlf_h diff --git a/databases/iodbc/Makefile b/databases/iodbc/Makefile index ba59600016d..baa6a152698 100644 --- a/databases/iodbc/Makefile +++ b/databases/iodbc/Makefile @@ -1,12 +1,9 @@ COMMENT-main= ODBC 3.x driver manager COMMENT-admin= ODBC 3.x driver manager admin application -REVISION-admin= 3 -REVISION-main= 3 -V= 3.52.12 +V= 3.52.16 DISTNAME= libiodbc-$V PKGNAME= iodbc-$V -REVISION= 3 CATEGORIES= databases @@ -15,8 +12,8 @@ SHARED_LIBS += iodbc 3.16 SHARED_LIBS += iodbcadm 3.15 SHARED_LIBS += drvproxy 3.15 -HOMEPAGE= http://www.iodbc.org/ -SITES= ${SITE_SOURCEFORGE:=iodbc/} +HOMEPAGE= https://www.iodbc.org/ +SITES= https://github.com/openlink/iODBC/releases/download/v$V/ MAINTAINER= Stuart Henderson @@ -25,15 +22,17 @@ PERMIT_PACKAGE= yes WANTLIB-main += c -WANTLIB-admin += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB-admin += Xrandr Xrender atk-1.0 c cairo expat ffi fontconfig -WANTLIB-admin += freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 -WANTLIB-admin += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 -WANTLIB-admin += harfbuzz iconv intl iodbc iodbcinst m pango-1.0 pangocairo-1.0 -WANTLIB-admin += pangoft2-1.0 pcre2-8 pixman-1 png pthread xcb xcb-render -WANTLIB-admin += xcb-shm z Xau Xdmcp ${COMPILER_LIBCXX} jpeg +WANTLIB-admin += ${COMPILER_LIBCXX} +WANTLIB-admin += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes +WANTLIB-admin += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat ffi +WANTLIB-admin += fontconfig freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0 +WANTLIB-admin += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 +WANTLIB-admin += gtk-x11-2.0 harfbuzz iconv intl iodbc iodbcinst jpeg +WANTLIB-admin += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 +WANTLIB-admin += png xcb xcb-render xcb-shm z + +PSEUDO_FLAVORS= bootstrap no_admin -PSEUDO_FLAVORS = bootstrap no_admin CONFIGURE_STYLE= gnu CONFIGURE_ARGS= --with-iodbc-inidir="${SYSCONFDIR}/iodbc" \ --disable-libodbc @@ -47,7 +46,7 @@ LIB_DEPENDS-main= # empty .include .if !${BUILD_PACKAGES:M-admin} -CONFIGURE_ARGS += --disable-gui +CONFIGURE_ARGS += --disable-gui .endif post-install: diff --git a/databases/iodbc/distinfo b/databases/iodbc/distinfo index 9870cac35b4..d48fc4c05c7 100644 --- a/databases/iodbc/distinfo +++ b/databases/iodbc/distinfo @@ -1,2 +1,2 @@ -SHA256 (libiodbc-3.52.12.tar.gz) = UcX/On2aVCAkhst3o1FODjeaE1vu/NXRK5bRkB+d+2I= -SIZE (libiodbc-3.52.12.tar.gz) = 1134054 +SHA256 (libiodbc-3.52.16.tar.gz) = OJizLQeWE2D28s822zYDa3GaIw5HZGklioDzIkPoRfo= +SIZE (libiodbc-3.52.16.tar.gz) = 1086850 diff --git a/databases/iodbc/patches/patch-iodbc_connect_c b/databases/iodbc/patches/patch-iodbc_connect_c index e6b807f4a8f..d254c4f93ab 100644 --- a/databases/iodbc/patches/patch-iodbc_connect_c +++ b/databases/iodbc/patches/patch-iodbc_connect_c @@ -1,7 +1,7 @@ Index: iodbc/connect.c --- iodbc/connect.c.orig +++ iodbc/connect.c -@@ -2605,7 +2605,7 @@ SQLDriverConnect_Internal ( +@@ -2922,7 +2922,7 @@ SQLDriverConnect_Internal ( # endif #else diff --git a/databases/iodbc/patches/patch-iodbcinst_dlf_h b/databases/iodbc/patches/patch-iodbcinst_dlf_h new file mode 100644 index 00000000000..40549b3ee68 --- /dev/null +++ b/databases/iodbc/patches/patch-iodbcinst_dlf_h @@ -0,0 +1,12 @@ +Index: iodbcinst/dlf.h +--- iodbcinst/dlf.h.orig ++++ iodbcinst/dlf.h +@@ -81,7 +81,7 @@ + + #if defined(HAVE_SHL_LOAD) + #define DLDAPI_HP_SHL +-#elif defined(HAVE_LIBDL) ++#elif defined(HAVE_LIBDL) || defined(__OpenBSD__) + #define DLDAPI_SVR4_DLFCN + #elif defined(HAVE_DYLD) + #define DLDAPI_MACX diff --git a/databases/iodbc/patches/patch-samples_Makefile_in b/databases/iodbc/patches/patch-samples_Makefile_in index b66ef2ee222..fd66fbf9277 100644 --- a/databases/iodbc/patches/patch-samples_Makefile_in +++ b/databases/iodbc/patches/patch-samples_Makefile_in @@ -1,7 +1,7 @@ Index: samples/Makefile.in --- samples/Makefile.in.orig +++ samples/Makefile.in -@@ -737,9 +737,9 @@ uninstall-am: uninstall-binPROGRAMS +@@ -752,9 +752,9 @@ uninstall-am: uninstall-binPROGRAMS install-exec-hook: diff --git a/databases/iodbc/pkg/PLIST-admin b/databases/iodbc/pkg/PLIST-admin index 9c00a31d744..3c0d47da0ef 100644 --- a/databases/iodbc/pkg/PLIST-admin +++ b/databases/iodbc/pkg/PLIST-admin @@ -1,8 +1,8 @@ @bin bin/iodbcadm-gtk -lib/libdrvproxy.a +@static-lib lib/libdrvproxy.a lib/libdrvproxy.la @lib lib/libdrvproxy.so.${LIBdrvproxy_VERSION} -lib/libiodbcadm.a +@static-lib lib/libiodbcadm.a lib/libiodbcadm.la @lib lib/libiodbcadm.so.${LIBiodbcadm_VERSION} @man man/man1/iodbcadm-gtk.1 diff --git a/databases/iodbc/pkg/PLIST-main b/databases/iodbc/pkg/PLIST-main index 599d248d848..5ddd5644647 100644 --- a/databases/iodbc/pkg/PLIST-main +++ b/databases/iodbc/pkg/PLIST-main @@ -14,10 +14,10 @@ include/sql.h include/sqlext.h include/sqltypes.h include/sqlucode.h -lib/libiodbc.a +@static-lib lib/libiodbc.a lib/libiodbc.la @lib lib/libiodbc.so.${LIBiodbc_VERSION} -lib/libiodbcinst.a +@static-lib lib/libiodbcinst.a lib/libiodbcinst.la @lib lib/libiodbcinst.so.${LIBiodbcinst_VERSION} lib/pkgconfig/libiodbc.pc