From: Kirill A. Korinsky Subject: lang/erlang: enabled ODBC To: OpenBSD ports Cc: Volker Schlecht Date: Mon, 18 Nov 2024 18:17:51 +0100 ports@, Volker, To make using of net/ejabberd better, we need a support of ODBC at erlang. Here a diff which enables ODBC support, and new port databases/unixodbc which is required by erlang. To avoid conflict with databases/iodbc I installed headers into include/unixodbc. As usually tested on -current/amd64 Feedback? Ok? Index: lang/erlang/25/Makefile =================================================================== RCS file: /home/cvs/ports/lang/erlang/25/Makefile,v diff -u -p -r1.27 Makefile --- lang/erlang/25/Makefile 15 Oct 2024 16:49:32 -0000 1.27 +++ lang/erlang/25/Makefile 18 Nov 2024 16:45:24 -0000 @@ -11,7 +11,7 @@ PKGNAME= erlang-$V PKGNAME-main= erlang-$V PKGNAME-wx= erlang-wx-$V EPOCH= 0 -REVISION= 0 +REVISION= 1 VERSION_SPEC= >=25v0,<26v0 PKGSPEC-main= erlang-${VERSION_SPEC} @@ -23,11 +23,13 @@ CONFIGURE_STYLE= simple CONFIGURE_ARGS+=--disable-silent-rules \ --without-jinterface \ - --without-odbc \ --enable-threads \ --enable-kernel-poll \ --disable-hipe +CFLAGS+= -I${LOCALBASE}/include/unixodbc +LDFLAGS+= -L${LOCALBASE}/lib + MAKE_ENV+= DOC_TARGETS=chunks ALL_TARGET= all docs INSTALL_TARGET= install install-docs @@ -37,13 +39,15 @@ MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/ert MULTI_PACKAGES = -main -wx WANTLIB = m pthread ${COMPILER_LIBCXX} -WANTLIB-main = ${WANTLIB} c crypto kvm curses util z +WANTLIB-main = ${WANTLIB} c crypto curses kvm odbc util z WANTLIB-wx += ${WANTLIB} GL GLU WANTLIB-wx += wx_baseu-3.2 wx_baseu_xml-3.2 wx_gtk3u_aui-3.2 WANTLIB-wx += wx_gtk3u_core-3.2 wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2 WANTLIB-wx += wx_gtk3u_stc-3.2 wx_gtk3u_xrc-3.2 WANTLIB-wx += glib-2.0 intl + +LIB_DEPENDS-main += databases/unixodbc LIB_DEPENDS-wx +=x11/wxWidgets>=2.8.12p10 LIB_DEPENDS-wx +=devel/glib2 Index: lang/erlang/25/pkg/PLIST-main =================================================================== RCS file: /home/cvs/ports/lang/erlang/25/pkg/PLIST-main,v diff -u -p -r1.13 PLIST-main --- lang/erlang/25/pkg/PLIST-main 15 Oct 2024 16:49:35 -0000 1.13 +++ lang/erlang/25/pkg/PLIST-main 18 Nov 2024 16:43:45 -0000 @@ -2406,6 +2406,33 @@ lib/${ERLANG_V}/lib/${ERL_MNESIA}/src/mn lib/${ERLANG_V}/lib/${ERL_MNESIA}/src/mnesia_sup.erl lib/${ERLANG_V}/lib/${ERL_MNESIA}/src/mnesia_text.erl lib/${ERLANG_V}/lib/${ERL_MNESIA}/src/mnesia_tm.erl +lib/${ERLANG_V}/lib/${ERL_ODBC}/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/c_src/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/c_src/odbcserver.c +lib/${ERLANG_V}/lib/${ERL_ODBC}/c_src/odbcserver.h +lib/${ERLANG_V}/lib/${ERL_ODBC}/doc/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/doc/chunks/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/doc/chunks/odbc.chunk +lib/${ERLANG_V}/lib/${ERL_ODBC}/doc/chunks/odbc_app.chunk +lib/${ERLANG_V}/lib/${ERL_ODBC}/doc/chunks/odbc_sup.chunk +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc.app +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc.appup +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc.beam +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc_app.beam +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc_sup.beam +lib/${ERLANG_V}/lib/${ERL_ODBC}/include/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/include/odbc.hrl +lib/${ERLANG_V}/lib/${ERL_ODBC}/info +lib/${ERLANG_V}/lib/${ERL_ODBC}/priv/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/priv/bin/ +@bin lib/${ERLANG_V}/lib/${ERL_ODBC}/priv/bin/odbcserver +lib/${ERLANG_V}/lib/${ERL_ODBC}/priv/obj/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/odbc.erl +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/odbc_app.erl +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/odbc_internal.hrl +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/odbc_sup.erl lib/${ERLANG_V}/lib/${ERL_OS_MON}/ lib/${ERLANG_V}/lib/${ERL_OS_MON}/doc/ lib/${ERLANG_V}/lib/${ERL_OS_MON}/doc/chunks/ Index: lang/erlang/26/Makefile =================================================================== RCS file: /home/cvs/ports/lang/erlang/26/Makefile,v diff -u -p -r1.15 Makefile --- lang/erlang/26/Makefile 4 Nov 2024 11:35:44 -0000 1.15 +++ lang/erlang/26/Makefile 18 Nov 2024 16:46:59 -0000 @@ -13,6 +13,7 @@ PKGNAME= erlang-${V} PKGNAME-main= erlang-${V} PKGNAME-wx= erlang-wx-${V} EPOCH= 0 +REVISION= 0 VERSION_SPEC= >=26v0,<27v0 PKGSPEC-main= erlang-${VERSION_SPEC} @@ -24,11 +25,13 @@ CONFIGURE_STYLE= simple CONFIGURE_ARGS+=--disable-silent-rules \ --without-jinterface \ - --without-odbc \ --enable-threads \ --enable-kernel-poll \ --disable-hipe +CFLAGS+= -I${LOCALBASE}/include/unixodbc +LDFLAGS+= -L${LOCALBASE}/lib + MAKE_ENV+= DOC_TARGETS=chunks ALL_TARGET= all docs INSTALL_TARGET= install install-docs @@ -38,13 +41,15 @@ MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/ert MULTI_PACKAGES = -main -wx WANTLIB = m pthread ${COMPILER_LIBCXX} -WANTLIB-main = ${WANTLIB} c crypto kvm curses util z +WANTLIB-main = ${WANTLIB} c crypto curses kvm odbc util z WANTLIB-wx += ${WANTLIB} GL GLU WANTLIB-wx += wx_baseu-3.2 wx_baseu_xml-3.2 wx_gtk3u_aui-3.2 WANTLIB-wx += wx_gtk3u_core-3.2 wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2 WANTLIB-wx += wx_gtk3u_stc-3.2 wx_gtk3u_xrc-3.2 WANTLIB-wx += glib-2.0 intl + +LIB_DEPENDS-main += databases/unixodbc LIB_DEPENDS-wx +=x11/wxWidgets>=2.8.12p10 LIB_DEPENDS-wx +=devel/glib2 Index: lang/erlang/26/pkg/PLIST-main =================================================================== RCS file: /home/cvs/ports/lang/erlang/26/pkg/PLIST-main,v diff -u -p -r1.5 PLIST-main --- lang/erlang/26/pkg/PLIST-main 10 Oct 2024 18:16:54 -0000 1.5 +++ lang/erlang/26/pkg/PLIST-main 18 Nov 2024 16:57:35 -0000 @@ -2429,6 +2429,33 @@ lib/${ERLANG_V}/lib/${ERL_MNESIA}/src/mn lib/${ERLANG_V}/lib/${ERL_MNESIA}/src/mnesia_sup.erl lib/${ERLANG_V}/lib/${ERL_MNESIA}/src/mnesia_text.erl lib/${ERLANG_V}/lib/${ERL_MNESIA}/src/mnesia_tm.erl +lib/${ERLANG_V}/lib/${ERL_ODBC}/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/c_src/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/c_src/odbcserver.c +lib/${ERLANG_V}/lib/${ERL_ODBC}/c_src/odbcserver.h +lib/${ERLANG_V}/lib/${ERL_ODBC}/doc/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/doc/chunks/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/doc/chunks/odbc.chunk +lib/${ERLANG_V}/lib/${ERL_ODBC}/doc/chunks/odbc_app.chunk +lib/${ERLANG_V}/lib/${ERL_ODBC}/doc/chunks/odbc_sup.chunk +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc.app +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc.appup +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc.beam +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc_app.beam +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc_sup.beam +lib/${ERLANG_V}/lib/${ERL_ODBC}/include/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/include/odbc.hrl +lib/${ERLANG_V}/lib/${ERL_ODBC}/info +lib/${ERLANG_V}/lib/${ERL_ODBC}/priv/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/priv/bin/ +@bin lib/${ERLANG_V}/lib/${ERL_ODBC}/priv/bin/odbcserver +lib/${ERLANG_V}/lib/${ERL_ODBC}/priv/obj/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/odbc.erl +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/odbc_app.erl +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/odbc_internal.hrl +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/odbc_sup.erl lib/${ERLANG_V}/lib/${ERL_OS_MON}/ lib/${ERLANG_V}/lib/${ERL_OS_MON}/doc/ lib/${ERLANG_V}/lib/${ERL_OS_MON}/doc/chunks/ Index: lang/erlang/27/Makefile =================================================================== RCS file: /home/cvs/ports/lang/erlang/27/Makefile,v diff -u -p -r1.6 Makefile --- lang/erlang/27/Makefile 21 Oct 2024 21:52:13 -0000 1.6 +++ lang/erlang/27/Makefile 18 Nov 2024 17:00:07 -0000 @@ -13,6 +13,7 @@ PKGNAME= erlang-${V} PKGNAME-main= erlang-${V} PKGNAME-wx= erlang-wx-${V} EPOCH= 0 +REVISION= 0 VERSION_SPEC= >=27v0,<28v0 PKGSPEC-main= erlang-${VERSION_SPEC} @@ -24,11 +25,13 @@ CONFIGURE_STYLE= simple CONFIGURE_ARGS+=--disable-silent-rules \ --without-jinterface \ - --without-odbc \ --enable-threads \ --enable-kernel-poll \ --disable-hipe +CFLAGS+= -I${LOCALBASE}/include/unixodbc +LDFLAGS+= -L${LOCALBASE}/lib + ALL_TARGET= all INSTALL_TARGET= install @@ -37,13 +40,15 @@ MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/ert MULTI_PACKAGES = -main -wx WANTLIB = m pthread ${COMPILER_LIBCXX} -WANTLIB-main = ${WANTLIB} c crypto kvm curses util z +WANTLIB-main = ${WANTLIB} c crypto curses kvm odbc util z WANTLIB-wx += ${WANTLIB} GL GLU WANTLIB-wx += wx_baseu-3.2 wx_baseu_xml-3.2 wx_gtk3u_aui-3.2 WANTLIB-wx += wx_gtk3u_core-3.2 wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2 WANTLIB-wx += wx_gtk3u_stc-3.2 wx_gtk3u_xrc-3.2 WANTLIB-wx += glib-2.0 intl + +LIB_DEPENDS-main += databases/unixodbc LIB_DEPENDS-wx +=x11/wxWidgets>=2.8.12p10 LIB_DEPENDS-wx +=devel/glib2 Index: lang/erlang/27/pkg/PLIST-main =================================================================== RCS file: /home/cvs/ports/lang/erlang/27/pkg/PLIST-main,v diff -u -p -r1.3 PLIST-main --- lang/erlang/27/pkg/PLIST-main 21 Oct 2024 21:52:15 -0000 1.3 +++ lang/erlang/27/pkg/PLIST-main 18 Nov 2024 17:10:17 -0000 @@ -1821,6 +1821,27 @@ lib/${ERLANG_V}/lib/${ERL_MNESIA}/src/mn lib/${ERLANG_V}/lib/${ERL_MNESIA}/src/mnesia_sup.erl lib/${ERLANG_V}/lib/${ERL_MNESIA}/src/mnesia_text.erl lib/${ERLANG_V}/lib/${ERL_MNESIA}/src/mnesia_tm.erl +lib/${ERLANG_V}/lib/${ERL_ODBC}/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/c_src/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/c_src/odbcserver.c +lib/${ERLANG_V}/lib/${ERL_ODBC}/c_src/odbcserver.h +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc.app +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc.appup +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc.beam +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc_app.beam +lib/${ERLANG_V}/lib/${ERL_ODBC}/ebin/odbc_sup.beam +lib/${ERLANG_V}/lib/${ERL_ODBC}/include/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/include/odbc.hrl +lib/${ERLANG_V}/lib/${ERL_ODBC}/priv/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/priv/bin/ +@bin lib/${ERLANG_V}/lib/${ERL_ODBC}/priv/bin/odbcserver +lib/${ERLANG_V}/lib/${ERL_ODBC}/priv/obj/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/ +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/odbc.erl +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/odbc_app.erl +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/odbc_internal.hrl +lib/${ERLANG_V}/lib/${ERL_ODBC}/src/odbc_sup.erl lib/${ERLANG_V}/lib/${ERL_OS_MON}/ lib/${ERLANG_V}/lib/${ERL_OS_MON}/ebin/ lib/${ERLANG_V}/lib/${ERL_OS_MON}/ebin/cpu_sup.beam -- wbr, Kirill