--- erlang/Makefile	2021-04-02 18:52:08.000000000 -0600
+++ erlang/Makefile	2021-04-03 13:41:12.965863000 -0600
@@ -3,9 +3,7 @@ 
 
 PORTNAME=	erlang
 DISTVERSIONPREFIX=	OTP-
-DISTVERSION=	21.3.8.21
-PORTREVISION=	0
-PORTEPOCH=	4
+DISTVERSION=	23.3.1
 CATEGORIES=	lang parallel java
 DIST_SUBDIR=	erlang
 
@@ -20,7 +18,7 @@ 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	erlang:otp,corba
 GH_PROJECT=	otp:otp corba:corba
-GH_TAGNAME=	4.5.2:corba
+GH_TAGNAME=	5.0.1:corba
 USE_PERL5=	build
 USE_RC_SUBR=	epmd
 
@@ -34,9 +32,9 @@ 
 SUB_LIST=	TOOLS_VSN=${TOOLS_VSN}
 
 ERLANG_LIB=	${PORTNAME}
-EI_VSN=		3.11.3.1
-SNMP_VSN=	5.2.12
-TOOLS_VSN=	3.1.0.1
+EI_VSN=		4.0.2
+SNMP_VSN=	5.8
+TOOLS_VSN=	3.4.4
 
 # On Erlang 22, native code generation does not currently work for all modules
 # due to new BEAM instructions not supported by HiPE the native compiler.
@@ -44,7 +42,7 @@ 
 # upgraded to such version.
 
 OPTIONS_DEFINE=	CORBA DIRTY DTRACE FOP HIPE JAVA KQUEUE MANPAGES NATIVE ODBC OPENSSL PDF SCTP THREADS WX
-OPTIONS_DEFAULT=CORBA DIRTY DTRACE HIPE KQUEUE MANPAGES OPENSSL SCTP THREADS
+OPTIONS_DEFAULT=CORBA DIRTY DTRACE KQUEUE MANPAGES OPENSSL SCTP THREADS
 OPTIONS_EXCLUDE_powerpc64=	HIPE ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}                  
 OPTIONS_EXCLUDE_powerpc64_11=	DTRACE
 OPTIONS_EXCLUDE_powerpc64_12=	DTRACE
@@ -97,13 +95,14 @@ 
 NATIVE_CONFIGURE_ENABLE=native-libs
 ODBC_CONFIGURE_WITH=	odbc
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
+ODBC_LDFLAGS=		-L/usr/local/lib
 OPENSSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE}
 OPENSSL_USES=		ssl
 SCTP_CONFIGURE_ENABLE=	sctp
 THREADS_CONFIGURE_ENABLE=	threads
 WX_CONFIGURE_WITH=	wx-config=${WX_CONFIG}
 WX_USES=		gl
-WX_VARS=		USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu"
+WX_VARS=		USE_WX=3.0+ WX_COMPS="wx" USE_GL="gl glu"
 
 .include <bsd.port.pre.mk>
 
--- erlang/distinfo	2021-02-26 09:13:52.000000000 -0700
+++ erlang/distinfo	2021-04-01 18:09:21.447950000 -0600
@@ -1,5 +1,5 @@ 
-TIMESTAMP = 1613753643
-SHA256 (erlang/erlang-otp-OTP-21.3.8.21_GH0.tar.gz) = 47a0edb246c267f905564245ca3019e8491db5537dfa5441dc5031a4d091ea15
-SIZE (erlang/erlang-otp-OTP-21.3.8.21_GH0.tar.gz) = 54098328
-SHA256 (erlang/erlang-corba-4.5.2_GH0.tar.gz) = 36f397e6aef97eebda629badb0570cb4ddc979a6d1557bc487a9e13671facf8f
-SIZE (erlang/erlang-corba-4.5.2_GH0.tar.gz) = 1422685
+TIMESTAMP = 1617150843
+SHA256 (erlang/erlang-otp-OTP-23.3.1_GH0.tar.gz) = a5a067a3b17bbef8511f2c056957925b666670b6f2cdaf645e1bc28ce3dd3517
+SIZE (erlang/erlang-otp-OTP-23.3.1_GH0.tar.gz) = 56654422
+SHA256 (erlang/erlang-corba-5.0.1_GH0.tar.gz) = 5e050376e51bd414d07d96018ba746487a652fbb39934f99a0cefb6439df6247
+SIZE (erlang/erlang-corba-5.0.1_GH0.tar.gz) = 1395153
--- erlang/files/patch-configure.src	1969-12-31 17:00:00.000000000 -0700
+++ erlang/files/patch-configure.src	2019-12-14 08:03:32.000000000 -0700
@@ -0,0 +1,40 @@ 
+--- configure.src.orig	2019-12-06 10:29:10 UTC
++++ configure.src
+@@ -49,7 +49,7 @@ skip_applications=
+ while test $# != 0; do
+     case $1 in
+ 	-srcdir=* | --srcdir=*)
+-	    user_srcdir=`expr "$1" : '[^=]*=\(.*\)'`
++	    user_srcdir=`expr -- "$1" : '[^=]*=\(.*\)'`
+ 	    if test "$ERL_TOP" != ""; then
+ 		echo "WARNING: Overriding ERL_TOP with $user_srcdir" 1>&2
+ 		echo "" 1>&2
+@@ -89,7 +89,7 @@ while test $# != 0; do
+ 	    echo "" 1>&2
+ 	    ;;
+ 	-cache-file=* | --cache-file=* )
+-	    static_cache=`expr "$1" : '[^=]*=\(.*\)'`
++	    static_cache=`expr -- "$1" : '[^=]*=\(.*\)'`
+ 	    if test "$static_cache" != "/dev/null"; then
+ 		echo "WARNING: Only using config cache file '$static_cache' as static cache" 1>&2
+ 		echo "" 1>&2
+@@ -126,8 +126,8 @@ while test $# != 0; do
+ 		mXY_build=
+ 	    fi;;
+ 	CFLAGS=* | LDFLAGS=*)
+-	    flgs_var=`expr "$1" : '\([^=]*\)=.*'`
+-	    flgs_val=`expr "$1" : '[^=]*=\(.*\)'`
++	    flgs_var=`expr -- "$1" : '\([^=]*\)=.*'`
++	    flgs_val=`expr -- "$1" : '[^=]*=\(.*\)'`
+ 	    eval $flgs_var=\$flgs_val
+ 	    ;;
+ 	--help=r* | -help=r*)
+@@ -137,7 +137,7 @@ while test $# != 0; do
+         *)
+ 	    case $1 in
+ 		--without-*)
+-		    skip_app=`expr "$1" : '--without-\(.*\)'`
++		    skip_app=`expr -- "$1" : '--without-\(.*\)'`
+ 		    if test -d "lib/$skip_app"; then
+ 			skip_applications="$skip_applications $skip_app"
+ 		    fi;;
--- erlang/files/patch-lib_hipe_llvm_hipe__llvm__main.erl	2015-06-29 01:18:42.000000000 -0600
+++ erlang/files/patch-lib_hipe_llvm_hipe__llvm__main.erl	1969-12-31 17:00:00.000000000 -0700
@@ -1,11 +0,0 @@ 
---- lib/hipe/llvm/hipe_llvm_main.erl.orig	2015-06-27 20:52:09 UTC
-+++ lib/hipe/llvm/hipe_llvm_main.erl
-@@ -474,7 +474,7 @@ unique_folder(FunName, Arity, Options) -
-       true ->  %% Store folder in current directory
-         DirName;
-       false -> %% Temporarily store folder in tempfs (/dev/shm/)
--        "/dev/shm/" ++ DirName
-+        "/tmp/" ++ DirName
-     end,
-   %% Make sure it does not exist
-   case dir_exists(Dir) of
--- erlang/files/patch-lib_odbc_configure.in	2021-03-31 00:50:03.000000000 -0600
+++ erlang/files/patch-lib_odbc_configure.in	1969-12-31 17:00:00.000000000 -0700
@@ -1,18 +0,0 @@ 
---- lib/odbc/configure.in.orig	2021-03-29 07:15:57.000000000 -0600
-+++ lib/odbc/configure.in	2021-03-31 00:28:03.147674000 -0600
-@@ -111,6 +111,7 @@
- AC_HEADER_STDC
- AC_CHECK_HEADERS([fcntl.h netdb.h stdlib.h string.h sys/socket.h winsock2.h])
- AC_CHECK_HEADERS([windows.h])
-+CFLAGS="$CFLAGS -I/usr/local/include"
- AC_CHECK_HEADERS([sql.h sqlext.h], [odbc_required_headers=yes], [odbc_required_headers=no],
- [[#ifdef HAVE_WINDOWS_H
-      # include <windows.h>
-@@ -208,6 +209,7 @@
- 			    echo "No odbc library found" > "$ERL_TOP/lib/odbc/SKIP"
- 			else
- 			    AC_MSG_RESULT($ODBC_LIB)
-+                            LDFLAGS="$LDFLAGS $ODBC_LIB"
- 			    AC_CHECK_LIB(odbc, SQLAllocHandle,[ODBC_LIB="$ODBC_LIB -lodbc"; odbc_lib_link_success=yes])
- 			fi
- 			;;
--- erlang/patch-lib_odbc_configure.in	1969-12-31 17:00:00.000000000 -0700
+++ erlang/patch-lib_odbc_configure.in	2021-04-02 19:05:36.235615000 -0600
@@ -0,0 +1,18 @@ 
+--- lib/odbc/configure.in.orig	2021-03-29 07:15:57.000000000 -0600
++++ lib/odbc/configure.in	2021-03-31 00:28:03.147674000 -0600
+@@ -111,6 +111,7 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([fcntl.h netdb.h stdlib.h string.h sys/socket.h winsock2.h])
+ AC_CHECK_HEADERS([windows.h])
++CFLAGS+=" -I/usr/local/include"
+ AC_CHECK_HEADERS([sql.h sqlext.h], [odbc_required_headers=yes], [odbc_required_headers=no],
+ [[#ifdef HAVE_WINDOWS_H
+      # include <windows.h>
+@@ -208,6 +209,7 @@
+ 			    echo "No odbc library found" > "$ERL_TOP/lib/odbc/SKIP"
+ 			else
+ 			    AC_MSG_RESULT($ODBC_LIB)
++                            LDFLAGS+=" $ODBC_LIB"
+ 			    AC_CHECK_LIB(odbc, SQLAllocHandle,[ODBC_LIB="$ODBC_LIB -lodbc"; odbc_lib_link_success=yes])
+ 			fi
+ 			;;