1 files changed, 21 insertions, 38 deletions

diff --git a/lang/erlang-runtime20/Makefile b/lang/erlang-runtime20/Makefile
index 21bc023118fd..3b8604bf3e4b 100644
--- a/lang/erlang-runtime20/Makefile
+++ b/lang/erlang-runtime20/Makefile
@@ -2,30 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	20.3.8.15
+DISTVERSIONPREFIX=	OTP-
+DISTVERSION=	20.3.8.20
 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
 PKGNAMESUFFIX=	-runtime20
-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
-PATCHFILES=	patch-otp-20.3.1 patch-otp-20.3.2 patch-otp-20.3.3 \
-		patch-otp-20.3.4 patch-otp-20.3.5 patch-otp-20.3.6 \
-		patch-otp-20.3.7 patch-otp-20.3.8 patch-otp-20.3.8.1 \
-		patch-otp-20.3.8.2 patch-otp-20.3.8.3 patch-otp-20.3.8.4 \
-		patch-otp-20.3.8.5 patch-otp-20.3.8.6 patch-otp-20.3.8.7 \
-		patch-otp-20.3.8.8 patch-otp-20.3.8.9 patch-otp-20.3.8.10 \
-		patch-otp-20.3.8.11 patch-otp-20.3.8.12 patch-otp-20.3.8.13 \
-		patch-otp-20.3.8.14 patch-otp-20.3.8.15
 
 MAINTAINER=	erlang@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
@@ -34,16 +15,18 @@ LICENSE=	APACHE20
 
 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=	20.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
@@ -63,10 +46,6 @@ NATIVE_IMPLIES=	HIPE
 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
@@ -76,10 +55,10 @@ OPTIONS_EXCLUDE_i386=		DTRACE
 
 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
@@ -100,9 +79,10 @@ 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"
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
 CFLAGS+=	-DMAP_NORESERVE=0
@@ -117,9 +97,12 @@ MAKE_ARGS+=	ARCH=arm
 .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:
@@ -150,4 +133,4 @@ post-stage:
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
 		| ${SORT} >> ${TMPPLIST}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>