Index: head/lang/erlang-runtime21/Makefile
===================================================================
--- head/lang/erlang-runtime21/Makefile
+++ head/lang/erlang-runtime21/Makefile
@@ -2,27 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	21.3
+DISTVERSIONPREFIX=	OTP-
+DISTVERSION=	21.3.3
 # NB when bumping OTP versions also bump PORTREVISION in databases/couchdb2
 CATEGORIES=	lang parallel java
-MASTER_SITES=	http://www.erlang.org/download/:erlangorg			\
-		http://erlang.stacken.kth.se/download/:erlangorg		\
-		http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg	\
-		http://olgeni.olgeni.com/~olgeni/distfiles/:local		\
-		LOCAL/olgeni:local \
-		LOCAL/dch:local
 PKGNAMESUFFIX=	-runtime21
-DISTNAME=	otp_src_${ERLANG_REL}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg		\
-		preloaded-${PORTVERSION}${EXTRACT_SUFX}:local
 DIST_SUBDIR=	erlang
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
-		LOCAL/olgeni \
-		LOCAL/dch
-PATCHFILES=
-
 MAINTAINER=	erlang@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
@@ -30,16 +16,18 @@
 
 BROKEN_sparc64=	Fails to build: error: fp_except undeclared
 
-WRKSRC=		${WRKDIR}/otp_src_${ERLANG_REL}
+USES=		autoreconf:build gmake ncurses perl5
+USE_GITHUB=	yes
+GH_PROJECT=	otp
+USE_PERL5=	build
 
-ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
-ERLANG_REL=	21.3
+GNU_CONFIGURE=	yes
+MAKE_JOBS_UNSAFE=yes
 
-OPTIONS_SUB=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
-MAKE_JOBS_UNSAFE=yes
+ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
 
 OPTIONS_DEFINE=	DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP THREADS WX
 OPTIONS_DEFAULT=DIRTY DTRACE HIPE KQUEUE OPENSSL SCTP THREADS
@@ -59,10 +47,6 @@
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
-# If you run Erlang and get a message resembling "WARNING: number of
-# probes fixed does not match the number of defined probes (54 != 132,
-# respectively)" you probably misconfigured DTrace in some way.
-
 OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 # ld(1) fails to link probes: missing __dtrace_erlang___* symbols
 OPTIONS_EXCLUDE_aarch64=	DTRACE
@@ -72,10 +56,10 @@
 
 OPENSSL_VARS=	BROKEN_SSL=openssl111
 
-GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib
-USES=		gmake ncurses perl5
-USE_PERL5=	build
+# If you run Erlang and get a message resembling "WARNING: number of
+# probes fixed does not match the number of defined probes (54 != 132,
+# respectively)" you probably misconfigured DTrace in some way.
+
 CONFIGURE_ENABLE=	smp-support
 
 DIRTY_CONFIGURE_ENABLE=	dirty-schedulers
@@ -96,9 +80,10 @@
 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"
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
 CFLAGS+=	-DMAP_NORESERVE=0
@@ -113,9 +98,12 @@
 .endif
 
 pre-configure:
-	cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX}
+	@cd ${WRKSRC} && ./otp_build autoconf
 
-pre-configure-MX-off:
+pre-configure-WX-off:
+	echo "disabled by port options" > ${WRKSRC}/lib/debugger/SKIP
+	echo "disabled by port options" > ${WRKSRC}/lib/et/SKIP
+	echo "disabled by port options" > ${WRKSRC}/lib/observer/SKIP
 	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
 
 post-configure-ODBC-on:
@@ -146,4 +134,4 @@
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
 		| ${SORT} >> ${TMPPLIST}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: head/lang/erlang-runtime21/distinfo
===================================================================
--- head/lang/erlang-runtime21/distinfo
+++ head/lang/erlang-runtime21/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1552560312
-SHA256 (erlang/otp_src_21.3.tar.gz) = 69a743c4f23b2243e06170b1937558122142e47c8ebe652be143199bfafad6e4
-SIZE (erlang/otp_src_21.3.tar.gz) = 85547038
-SHA256 (erlang/preloaded-21.3.tar.gz) = f50f5b4bd2114eb9a3922257a5d2eddb064c51e80adf39d0c6a4f3d3e916afe4
-SIZE (erlang/preloaded-21.3.tar.gz) = 341616
+TIMESTAMP = 1554131181
+SHA256 (erlang/erlang-otp-OTP-21.3.3_GH0.tar.gz) = c56d6c736163e93ee3edab0b3ae59209cfd751f0d8078a7ca83d63942202b706
+SIZE (erlang/erlang-otp-OTP-21.3.3_GH0.tar.gz) = 54025876