Index: head/lang/erlang/Makefile
===================================================================
--- head/lang/erlang/Makefile	(revision 444178)
+++ head/lang/erlang/Makefile	(revision 444179)
@@ -1,304 +1,274 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	19.3.6
+PORTVERSION=	20.0
 PORTEPOCH=	3
 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://www.erlang.se/doc/:erlangse			\
 		http://www.erlang.se/publications/:publications		\
 		http://www.sics.se/~joe/thesis/:joe			\
 		LOCAL/olgeni:local
 DISTNAME=	otp_src_${ERL_RELEASE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
 		${ERLANG_MAN}:erlangorg
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
-PATCHFILES=	patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \
-		patch-otp-19.3.4 patch-otp-19.3.5 patch-otp-19.3.6
+PATCHFILES=
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
 LICENSE=	APACHE20
 
 BROKEN_sparc64=	Fails to build: error: fp_except undeclared
 
 WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
 
 ERLANG_LIB=	${PORTNAME}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	TOOLS_VSN=${TOOLS_VSN}
 PLIST_SUB=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DIRTY DOCS DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX
 
 DIRTY_DESC=	Enable Dirty schedulers (experimental)
 DTRACE_DESC=	Enable DTrace support
 GS_DESC=	Enable GS application (deprecated)
 HIPE_DESC=	Build native HiPE compiler
 KQUEUE_DESC=	Enable Kernel Poll (kqueue) support
 NATIVE_DESC=	Enable native libraries
 SCTP_DESC=	Enable SCTP support
 SMP_DESC=	Enable SMP support
 WX_DESC=	Enable WX application
 
 NATIVE_IMPLIES=	HIPE
 
 OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS DTRACE
 OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
 OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 OPTIONS_EXCLUDE_i386=		DTRACE
 # ld(1) fails to link probes: missing __dtrace_erlang___* symbols
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 
-ERL_RELEASE=	19.3
+ERL_RELEASE=	20.0
 
 USES=		gmake ncurses perl5
 USE_PERL5=	build
 USE_RC_SUBR=	epmd
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-EI_VSN=		3.9.3
-SNMP_VSN=	5.2.5
-TOOLS_VSN=	2.9.1
+EI_VSN=		3.10
+SNMP_VSN=	5.2.6
+TOOLS_VSN=	2.10
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${ERLANG_DOCS}:erlangorg		\
 		${DOC_DISTFILES}
 DOC_DISTFILES=	armstrong_thesis_2003.pdf:local		\
 		bjarnelic.pdf:publications		\
 		erlang-book-part1.pdf:erlangorg		\
 		master_thesis_patterns.pdf:local	\
 		mnesia_overview.pdf:publications	\
 		programming_rules.pdf:erlangse
 .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.
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000
 CFLAGS+=	-DMAP_NORESERVE=0
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
 CONFIGURE_ARGS+=--with-dynamic-trace=dtrace
 CFLAGS+=	-fno-omit-frame-pointer
 STRIP=
 .else
 CONFIGURE_ARGS+=--without-dynamic-trace
 .endif
 
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=		ssl
 CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
 .else
 CONFIGURE_ARGS+=--without-ssl
 .endif
 
 .if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
 CONFIGURE_ARGS+=--with-javac
 CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
 .else
 CONFIGURE_ARGS+=--without-javac
 .endif
 
 .if ${PORT_OPTIONS:MHIPE}
 CONFIGURE_ARGS+=--enable-hipe
 .else
 CONFIGURE_ARGS+=--disable-hipe
 .endif
 
 .if ${PORT_OPTIONS:MNATIVE}
 CONFIGURE_ARGS+=--enable-native-libs
 .else
 CONFIGURE_ARGS+=--disable-native-libs
 .endif
 
 .if ${PORT_OPTIONS:MKQUEUE}
 CONFIGURE_ARGS+=--enable-kernel-poll
 .else
 CONFIGURE_ARGS+=--disable-kernel-poll
 .endif
 
 .if ${PORT_OPTIONS:MGS}
 USES+=		tk:run
 .endif
 
 .if ${PORT_OPTIONS:MWX}
 USE_WX=		2.8+
 WX_COMPS=	wx contrib
 CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 USE_GL+=	gl glu
 .endif
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=--with-odbc
 LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-odbc
 .endif
 
 ERLANG_MAN=	otp_doc_man_${ERL_RELEASE}.tar.gz
 ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=--enable-threads
 .else
 CONFIGURE_ARGS+=--disable-threads
 .endif
 
 .if ${PORT_OPTIONS:MSCTP}
 CONFIGURE_ARGS+=--enable-sctp
 .else
 CONFIGURE_ARGS+=--disable-sctp
 .endif
 
 # enabling --enable-smp-support crashes the OS when
 # net_kernel:start([node_name, shortnames]) invoked repeatedly
 # TODO verify if it still applies
 
 .if ${PORT_OPTIONS:MSMP}
 CONFIGURE_ARGS+=--enable-smp-support
 .else
 CONFIGURE_ARGS+=--disable-smp-support
 .endif
 
 .if ${PORT_OPTIONS:MDIRTY}
 CONFIGURE_ARGS+=--enable-dirty-schedulers
 .endif
 
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
 .if ${ARCH} == armv6
 MAKE_ARGS+=	ARCH=arm
 .endif
 
 # The man-pages are put (in spite of FreeBSD's port convention) in a private
 # subdir. This is to avoid cluttering up the man page name space. Also the
 # Erlang man pages are more of internal documentation using the man format than
 # actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
 
 # Install documentation. (HTML docs need to be in same dir as the
 # rest, not in share/doc/erlang as it should, because of relative
 # links in the documentation.
 
 post-patch:
 	@${ECHO_CMD} "MANPATH ${PREFIX}/lib/erlang/man" > ${WRKDIR}/erlang.conf
 
 pre-configure:
 .if ! ${PORT_OPTIONS:MWX}
 	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
 .endif
 
 post-configure:
 .if ${PORT_OPTIONS:MODBC}
 	${RM} ${WRKSRC}/lib/odbc/SKIP
 .endif
 
 .if ${PORT_OPTIONS:MNATIVE}
 pre-build:
 	@cd ${WRKSRC} && ${MAKE_CMD} clean
 .endif
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/erlang.conf ${STAGEDIR}${PREFIX}/etc/man.d/erlang.conf
 	${LN} -sf ../lib/${ERLANG_LIB}/lib/erl_interface-${EI_VSN}/bin/erl_call ${STAGEDIR}${PREFIX}/bin/erl_call
 	for SECTION in 1 3 4 6 7; do \
 		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
 			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
 	done
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
 .if ${PORT_OPTIONS:MDOCS}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-8.3/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-8.3.5
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-8.3
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/crypto-3.7.3/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/crypto-3.7.4
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/crypto-3.7.3
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.3.6/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.3.9
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.3.6
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-4.4.1/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-4.4.2
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-4.4.1
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssl-8.1.1/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssl-8.1.3
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssl-8.1.1
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-3.1/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-3.1.1
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-3.1
-
-	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/xmerl-1.3.13/* \
-		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/xmerl-1.3.14
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/xmerl-1.3.13
-
 	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${DOC_DISTFILES}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$(expr ${FILE} : '\([^:]*\)') ${STAGEDIR}/${DOCSDIR}
 .endfor
 .endif
 .if ! ${PORT_OPTIONS:MGS}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
 .endif
 .if ! ${PORT_OPTIONS:MJAVA}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
 .endif
 .if ! ${PORT_OPTIONS:MODBC}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
 .endif
 .if ! ${PORT_OPTIONS:MOPENSSL}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-*
 .endif
 .if ! ${PORT_OPTIONS:MWX}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
 .endif
 	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 
 	${LN} -s ../lib/erlang/lib/snmp-${SNMP_VSN}/bin/snmpc ${STAGEDIR}${PREFIX}/bin/snmpc
 
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
 		| ${SORT} \
 		>> ${TMPPLIST}
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel}
 BROKEN=		Does not build with openssl-devel
 .endif
 
 .include <bsd.port.post.mk>
Index: head/lang/erlang/distinfo
===================================================================
--- head/lang/erlang/distinfo	(revision 444178)
+++ head/lang/erlang/distinfo	(revision 444179)
@@ -1,31 +1,19 @@
-TIMESTAMP = 1496937493
-SHA256 (erlang/otp_src_19.3.tar.gz) = fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83
-SIZE (erlang/otp_src_19.3.tar.gz) = 68510871
-SHA256 (erlang/otp_doc_man_19.3.tar.gz) = f8192ffdd7367083c055695eeddf198155da43dcc221aed1d870d1e3871dd95c
-SIZE (erlang/otp_doc_man_19.3.tar.gz) = 1410781
-SHA256 (erlang/otp_doc_html_19.3.tar.gz) = dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c
-SIZE (erlang/otp_doc_html_19.3.tar.gz) = 35818689
+TIMESTAMP = 1498164950
+SHA256 (erlang/otp_src_20.0.tar.gz) = fe80e1e14a2772901be717694bb30ac4e9a07eee0cc7a28988724cbd21476811
+SIZE (erlang/otp_src_20.0.tar.gz) = 87346046
+SHA256 (erlang/otp_doc_man_20.0.tar.gz) = b7f1542a94a170f8791f5d80a85706f9e8838924ea65d4301032d0c0cfb845cc
+SIZE (erlang/otp_doc_man_20.0.tar.gz) = 1430939
+SHA256 (erlang/otp_doc_html_20.0.tar.gz) = 1ab25110b148ce263d6e68cd5a3b912299b6066cfcd9d2fce416a4e9b7d2543a
+SIZE (erlang/otp_doc_html_20.0.tar.gz) = 33948386
 SHA256 (erlang/armstrong_thesis_2003.pdf) = da585b914eb07350e2d6f727db5eb0fb1551f49fc1270f7d4dc079f2c8c1ab7a
 SIZE (erlang/armstrong_thesis_2003.pdf) = 859249
 SHA256 (erlang/bjarnelic.pdf) = 9544d4af5cea324e5c9cf77e670d9561ad61ddc240cdb5c2afecebc0a3d7429b
 SIZE (erlang/bjarnelic.pdf) = 488043
 SHA256 (erlang/erlang-book-part1.pdf) = ef2fb9d15d35f3b1b602c8578e48618597477f9cfab2d103dc2e22372c46ca0a
 SIZE (erlang/erlang-book-part1.pdf) = 883639
 SHA256 (erlang/master_thesis_patterns.pdf) = b390fd59060fb944c78bceed781c7ad3795d4f9fbe86d391bccc479828552b43
 SIZE (erlang/master_thesis_patterns.pdf) = 422457
 SHA256 (erlang/mnesia_overview.pdf) = f07f9edd4ba865a1c50647dd6fa4a8f49277f8f3bef4d521c06fd90293717032
 SIZE (erlang/mnesia_overview.pdf) = 150266
 SHA256 (erlang/programming_rules.pdf) = b95f8851004832b044e064c12976a422613ece897e98308a27ee8b66738b4502
 SIZE (erlang/programming_rules.pdf) = 77025
-SHA256 (erlang/patch-otp-19.3.1) = 2373f890516b58ae006812ba5f15e4af1f8820be98230011b8cd8b345f51dedd
-SIZE (erlang/patch-otp-19.3.1) = 30225
-SHA256 (erlang/patch-otp-19.3.2) = 21c56ac188177985c9db11c7066dcee0f7370760da3e15a0d03c235bd2a2cb2a
-SIZE (erlang/patch-otp-19.3.2) = 6290
-SHA256 (erlang/patch-otp-19.3.3) = dbe1cab750a3339c3755db27b800e53232519c84a304bd562263ffb060afab55
-SIZE (erlang/patch-otp-19.3.3) = 12525
-SHA256 (erlang/patch-otp-19.3.4) = 02437ac753932f913209102e8cb249a264b774833bfda8c1532b338af60ff8af
-SIZE (erlang/patch-otp-19.3.4) = 13504
-SHA256 (erlang/patch-otp-19.3.5) = 5755da205004ae7e724390958db9ecc737d99ec14e0d14abcec8b8603ea6ece5
-SIZE (erlang/patch-otp-19.3.5) = 44563
-SHA256 (erlang/patch-otp-19.3.6) = ee1b5f0fd64db3322031c38722aee96a8ee35aaac454f430c829446a198f6534
-SIZE (erlang/patch-otp-19.3.6) = 13073
Index: head/lang/erlang/files/patch-lib_wx_c__src_wxe__impl.cpp
===================================================================
--- head/lang/erlang/files/patch-lib_wx_c__src_wxe__impl.cpp	(revision 444178)
+++ head/lang/erlang/files/patch-lib_wx_c__src_wxe__impl.cpp	(nonexistent)
@@ -1,20 +0,0 @@
---- lib/wx/c_src/wxe_impl.cpp.orig	2017-01-30 23:13:25 UTC
-+++ lib/wx/c_src/wxe_impl.cpp
-@@ -666,7 +666,7 @@ void * WxeApp::getPtr(char * bp, wxeMemE
-     throw wxe_badarg(index);
-   }
-   void * temp = memenv->ref2ptr[index];
--  if((index < memenv->next) && ((index == 0) || (temp > NULL)))
-+  if((index < memenv->next) && ((index == 0) || (temp != NULL)))
-     return temp;
-   else {
-     throw wxe_badarg(index);
-@@ -678,7 +678,7 @@ void WxeApp::registerPid(char * bp, ErlD
-   if(!memenv)
-     throw wxe_badarg(index);
-   void * temp = memenv->ref2ptr[index];
--  if((index < memenv->next) && ((index == 0) || (temp > NULL))) {
-+  if((index < memenv->next) && ((index == 0) || (temp != NULL))) {
-     ptrMap::iterator it;
-     it = ptr2ref.find(temp);
-     if(it != ptr2ref.end()) {

Property changes on: head/lang/erlang/files/patch-lib_wx_c__src_wxe__impl.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/erlang/pkg-plist
===================================================================
--- head/lang/erlang/pkg-plist	(revision 444178)
+++ head/lang/erlang/pkg-plist	(revision 444179)
@@ -1,18 +1,17 @@
 bin/ct_run
 bin/dialyzer
 bin/epmd
 bin/erl
 bin/erl_call
 bin/erlc
 bin/escript
 bin/run_erl
 bin/snmpc
 bin/to_erl
-bin/typer
 etc/man.d/erlang.conf
 %%PORTDOCS%%%%DOCSDIR%%/armstrong_thesis_2003.pdf
 %%PORTDOCS%%%%DOCSDIR%%/bjarnelic.pdf
 %%PORTDOCS%%%%DOCSDIR%%/erlang-book-part1.pdf
 %%PORTDOCS%%%%DOCSDIR%%/master_thesis_patterns.pdf
 %%PORTDOCS%%%%DOCSDIR%%/mnesia_overview.pdf
 %%PORTDOCS%%%%DOCSDIR%%/programming_rules.pdf

Property changes on: head/lang/erlang/pkg-plist
___________________________________________________________________
Modified: fbsd:nokeywords
## -1 +1 ##
-1
\ No newline at end of property
+yes
\ No newline at end of property
Index: head/lang/erlang-java/Makefile
===================================================================
--- head/lang/erlang-java/Makefile	(revision 444178)
+++ head/lang/erlang-java/Makefile	(revision 444179)
@@ -1,76 +1,75 @@
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	19.3.6
+PORTVERSION=	20.0
 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
 PKGNAMESUFFIX=	-java
 DISTNAME=	otp_src_${ERL_RELEASE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
-PATCHFILES=	patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \
-		patch-otp-19.3.4 patch-otp-19.3.5 patch-otp-19.3.6
+PATCHFILES=
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang interface for Java
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang
 
 WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
 
 PLIST_SUB=	APP_VERSION=${APP_VERSION}
 
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DOCS
 
-ERL_RELEASE=	19.3
+ERL_RELEASE=	20.0
 
 USES=		gmake ncurses perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-APP_VERSION=	1.7.1
+APP_VERSION=	1.8
 APP_DIR=	${PREFIX}/lib/erlang/lib/jinterface-${APP_VERSION}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${ERLANG_DOCS}:erlangorg
 .endif
 
 CONFIGURE_ARGS+=--enable-threads --without-odbc --with-javac
 CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
 
 USE_JAVA=	yes
 
 ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
 
 do-build:
 	@${MKDIR} ${WRKSRC}/lib/jinterface/ebin
 	cd ${WRKSRC}/lib/jinterface && ${GMAKE} ERL_TOP=${WRKSRC} TARGET=${CONFIGURE_TARGET}
 	${RM} -r ${WRKSRC}/lib/jinterface/priv/com
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${APP_DIR}
 	@${MKDIR} ${STAGEDIR}${APP_DIR}/priv
 	cd ${WRKSRC}/lib/jinterface && ${COPYTREE_SHARE} ebin ${STAGEDIR}${APP_DIR}
 	cd ${WRKSRC}/lib/jinterface && ${COPYTREE_SHARE} java_src ${STAGEDIR}${APP_DIR}
 	${INSTALL_DATA} ${WRKSRC}/lib/jinterface/priv/OtpErlang.jar ${STAGEDIR}${APP_DIR}/priv
 
 do-install-DOCS-on:
 	cd ${WRKSRC}/lib/jinterface && ${COPYTREE_SHARE} doc ${STAGEDIR}${APP_DIR}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/erlang lib/jinterface-${APP_VERSION}
 	@${FIND} ${STAGEDIR}${APP_DIR} -type d -empty -delete
 
 .include <bsd.port.mk>
Index: head/lang/erlang-java/distinfo
===================================================================
--- head/lang/erlang-java/distinfo	(revision 444178)
+++ head/lang/erlang-java/distinfo	(revision 444179)
@@ -1,17 +1,5 @@
-TIMESTAMP = 1496937518
-SHA256 (erlang/otp_src_19.3.tar.gz) = fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83
-SIZE (erlang/otp_src_19.3.tar.gz) = 68510871
-SHA256 (erlang/otp_doc_html_19.3.tar.gz) = dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c
-SIZE (erlang/otp_doc_html_19.3.tar.gz) = 35818689
-SHA256 (erlang/patch-otp-19.3.1) = 2373f890516b58ae006812ba5f15e4af1f8820be98230011b8cd8b345f51dedd
-SIZE (erlang/patch-otp-19.3.1) = 30225
-SHA256 (erlang/patch-otp-19.3.2) = 21c56ac188177985c9db11c7066dcee0f7370760da3e15a0d03c235bd2a2cb2a
-SIZE (erlang/patch-otp-19.3.2) = 6290
-SHA256 (erlang/patch-otp-19.3.3) = dbe1cab750a3339c3755db27b800e53232519c84a304bd562263ffb060afab55
-SIZE (erlang/patch-otp-19.3.3) = 12525
-SHA256 (erlang/patch-otp-19.3.4) = 02437ac753932f913209102e8cb249a264b774833bfda8c1532b338af60ff8af
-SIZE (erlang/patch-otp-19.3.4) = 13504
-SHA256 (erlang/patch-otp-19.3.5) = 5755da205004ae7e724390958db9ecc737d99ec14e0d14abcec8b8603ea6ece5
-SIZE (erlang/patch-otp-19.3.5) = 44563
-SHA256 (erlang/patch-otp-19.3.6) = ee1b5f0fd64db3322031c38722aee96a8ee35aaac454f430c829446a198f6534
-SIZE (erlang/patch-otp-19.3.6) = 13073
+TIMESTAMP = 1498165640
+SHA256 (erlang/otp_src_20.0.tar.gz) = fe80e1e14a2772901be717694bb30ac4e9a07eee0cc7a28988724cbd21476811
+SIZE (erlang/otp_src_20.0.tar.gz) = 87346046
+SHA256 (erlang/otp_doc_html_20.0.tar.gz) = 1ab25110b148ce263d6e68cd5a3b912299b6066cfcd9d2fce416a4e9b7d2543a
+SIZE (erlang/otp_doc_html_20.0.tar.gz) = 33948386
Index: head/lang/erlang-wx/files/patch-lib_wx_c__src_wxe__impl.cpp
===================================================================
--- head/lang/erlang-wx/files/patch-lib_wx_c__src_wxe__impl.cpp	(revision 444178)
+++ head/lang/erlang-wx/files/patch-lib_wx_c__src_wxe__impl.cpp	(nonexistent)
@@ -1,20 +0,0 @@
---- lib/wx/c_src/wxe_impl.cpp.orig	2017-01-30 23:13:25 UTC
-+++ lib/wx/c_src/wxe_impl.cpp
-@@ -666,7 +666,7 @@ void * WxeApp::getPtr(char * bp, wxeMemE
-     throw wxe_badarg(index);
-   }
-   void * temp = memenv->ref2ptr[index];
--  if((index < memenv->next) && ((index == 0) || (temp > NULL)))
-+  if((index < memenv->next) && ((index == 0) || (temp != NULL)))
-     return temp;
-   else {
-     throw wxe_badarg(index);
-@@ -678,7 +678,7 @@ void WxeApp::registerPid(char * bp, ErlD
-   if(!memenv)
-     throw wxe_badarg(index);
-   void * temp = memenv->ref2ptr[index];
--  if((index < memenv->next) && ((index == 0) || (temp > NULL))) {
-+  if((index < memenv->next) && ((index == 0) || (temp != NULL))) {
-     ptrMap::iterator it;
-     it = ptr2ref.find(temp);
-     if(it != ptr2ref.end()) {

Property changes on: head/lang/erlang-wx/files/patch-lib_wx_c__src_wxe__impl.cpp
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/lang/erlang-wx/Makefile
===================================================================
--- head/lang/erlang-wx/Makefile	(revision 444178)
+++ head/lang/erlang-wx/Makefile	(revision 444179)
@@ -1,77 +1,76 @@
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	19.3.6
+PORTVERSION=	20.0
 CATEGORIES=	lang parallel
 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
 PKGNAMESUFFIX=	-wx
 DISTNAME=	otp_src_${ERL_RELEASE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
-PATCHFILES=	patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \
-		patch-otp-19.3.4 patch-otp-19.3.5 patch-otp-19.3.6
+PATCHFILES=
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Erlang bindings for wxWindows
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang
 
 WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
 
 PLIST_SUB=	APP_VERSION=${APP_VERSION} \
 		CONFIGURE_TARGET=${CONFIGURE_TARGET}
 
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DOCS
 
-ERL_RELEASE=	19.3
+ERL_RELEASE=	20.0
 
 USES=		gmake
 USE_GL=		gl glu
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-APP_VERSION=	1.8
+APP_VERSION=	1.8.1
 APP_DIR=	${PREFIX}/lib/erlang/lib/wx-${APP_VERSION}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${ERLANG_DOCS}:erlangorg
 .endif
 
 CONFIGURE_ARGS+=--enable-threads --without-odbc --without-javac --with-wx-config=${WX_CONFIG}
 
 USE_WX=		2.8+
 WX_COMPS=	wx contrib
 
 ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
 
 do-build:
 	cd ${WRKSRC}/lib/wx && ${GMAKE} ERL_TOP=${WRKSRC} TARGET=${CONFIGURE_TARGET}
 	${STRIP_CMD} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/erl_gl.so
 	${STRIP_CMD} ${WRKSRC}/lib/wx/priv/${CONFIGURE_TARGET}/wxe_driver.so
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${APP_DIR}
 	cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} ebin ${STAGEDIR}${APP_DIR}
 	cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} include ${STAGEDIR}${APP_DIR}
 	cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} priv ${STAGEDIR}${APP_DIR}
 	cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} src ${STAGEDIR}${APP_DIR}
 
 do-install-DOCS-on:
 	cd ${WRKSRC}/lib/wx && ${COPYTREE_SHARE} doc ${STAGEDIR}${APP_DIR}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/erlang lib/wx-${APP_VERSION}
 	@${FIND} ${STAGEDIR}${APP_DIR} -type d -empty -delete
 
 .include <bsd.port.mk>
Index: head/lang/erlang-wx/distinfo
===================================================================
--- head/lang/erlang-wx/distinfo	(revision 444178)
+++ head/lang/erlang-wx/distinfo	(revision 444179)
@@ -1,17 +1,5 @@
-TIMESTAMP = 1496937511
-SHA256 (erlang/otp_src_19.3.tar.gz) = fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83
-SIZE (erlang/otp_src_19.3.tar.gz) = 68510871
-SHA256 (erlang/otp_doc_html_19.3.tar.gz) = dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c
-SIZE (erlang/otp_doc_html_19.3.tar.gz) = 35818689
-SHA256 (erlang/patch-otp-19.3.1) = 2373f890516b58ae006812ba5f15e4af1f8820be98230011b8cd8b345f51dedd
-SIZE (erlang/patch-otp-19.3.1) = 30225
-SHA256 (erlang/patch-otp-19.3.2) = 21c56ac188177985c9db11c7066dcee0f7370760da3e15a0d03c235bd2a2cb2a
-SIZE (erlang/patch-otp-19.3.2) = 6290
-SHA256 (erlang/patch-otp-19.3.3) = dbe1cab750a3339c3755db27b800e53232519c84a304bd562263ffb060afab55
-SIZE (erlang/patch-otp-19.3.3) = 12525
-SHA256 (erlang/patch-otp-19.3.4) = 02437ac753932f913209102e8cb249a264b774833bfda8c1532b338af60ff8af
-SIZE (erlang/patch-otp-19.3.4) = 13504
-SHA256 (erlang/patch-otp-19.3.5) = 5755da205004ae7e724390958db9ecc737d99ec14e0d14abcec8b8603ea6ece5
-SIZE (erlang/patch-otp-19.3.5) = 44563
-SHA256 (erlang/patch-otp-19.3.6) = ee1b5f0fd64db3322031c38722aee96a8ee35aaac454f430c829446a198f6534
-SIZE (erlang/patch-otp-19.3.6) = 13073
+TIMESTAMP = 1498166065
+SHA256 (erlang/otp_src_20.0.tar.gz) = fe80e1e14a2772901be717694bb30ac4e9a07eee0cc7a28988724cbd21476811
+SIZE (erlang/otp_src_20.0.tar.gz) = 87346046
+SHA256 (erlang/otp_doc_html_20.0.tar.gz) = 1ab25110b148ce263d6e68cd5a3b912299b6066cfcd9d2fce416a4e9b7d2543a
+SIZE (erlang/otp_doc_html_20.0.tar.gz) = 33948386