From 44d513058ad5dc778c35e075e77d8589ca734964 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Sat, 17 Nov 2018 13:40:05 +0000
Subject: [PATCH] update to erlang-18.3, the most recent release of erlang 18

---
 lang/erlang/18/Makefile                       | 85 +++++++++----------
 lang/erlang/18/distinfo                       |  8 +-
 lang/erlang/18/patches/patch-Makefile_in      |  4 +-
 .../18/patches/patch-erts_etc_common_ct_run_c |  4 +-
 .../patches/patch-erts_etc_common_dialyzer_c  |  4 +-
 .../18/patches/patch-erts_etc_common_erlc_c   |  4 +-
 .../18/patches/patch-erts_etc_common_typer_c  |  4 +-
 .../patch-lib_dialyzer_src_dialyzer_plt_erl   |  4 +-
 .../patches/patch-lib_wx_c_src_wxe_impl_cpp   | 11 +--
 lang/erlang/18/pkg/PLIST-main                 | 63 +++-----------
 lang/erlang/18/pkg/PLIST-wx                   |  9 +-
 11 files changed, 82 insertions(+), 118 deletions(-)

diff --git a/lang/erlang/18/Makefile b/lang/erlang/18/Makefile
index fb52da98a4c..1c4982d8121 100644
--- a/lang/erlang/18/Makefile
+++ b/lang/erlang/18/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2018/06/02 14:03:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2018/11/17 13:40:05 jasper Exp $
 
 BROKEN-alpha=	beam/erl_process.c:6692: internal compiler error: in final_scan_insn, at final.c:2449
 
 COMMENT-main=	${COMMENT}
 COMMENT-wx=	WxWidgets bindings for Erlang
 
-V=		18.1
+V=		18.3
 MAJ_V=		18
 EPOCH=		0
 DISTNAME=	otp_src_$V
@@ -13,9 +13,6 @@ PKGNAME=	erlang-$V
 PKGNAME-main=	erlang-$V
 PKGNAME-wx=	erlang-wx-$V
 
-REVISION-main=	6
-REVISION-wx=	3
-
 VERSION_SPEC=	>=18v0,<19v0
 PKGSPEC-main=	erlang-${VERSION_SPEC}
 PKGSPEC-wx=	erlang-wx-${VERSION_SPEC}
@@ -31,7 +28,7 @@ CONFIGURE_ARGS+=--without-jinterface	\
 MULTI_PACKAGES = -main -wx
 
 WANTLIB =	m pthread
-WANTLIB-main =	${WANTLIB} c crypto kvm ncurses util
+WANTLIB-main =	${WANTLIB} c crypto kvm curses util
 
 WANTLIB-wx += ${WANTLIB} GL GLU ${COMPILER_LIBCXX} wx_base wx_base_xml wx_gtk2_adv
 WANTLIB-wx += wx_gtk2_aui wx_gtk2_core wx_gtk2_gl wx_gtk2_html wx_gtk2_stc
@@ -45,60 +42,60 @@ FAKE_FLAGS =	libdir_suffix="/erlang${MAJ_V}"
 
 # Use the target 'gen-versions' to update this list
 ERL_VERSIONS=	\
-ASN1_VSN        4.0 \
-COMMON_TEST_VSN 1.11 \
-COMPILER_VSN    6.0.1 \
+ASN1_VSN        4.0.2 \
+COMMON_TEST_VSN 1.12 \
+COMPILER_VSN    6.0.3 \
 COSEVENTDOMAIN_VSN      1.2 \
 COSEVENT_VSN    2.2 \
 COSFILETRANSFER_VSN     1.2 \
-COSNOTIFICATION_VSN     1.2 \
+COSNOTIFICATION_VSN     1.2.1 \
 COSPROPERTY_VSN 1.2 \
-COSTIME_VSN     1.2 \
-COSTRANSACTIONS_VSN     1.3 \
-CRYPTO_VSN      3.6.1 \
-DEBUGGER_VSN    4.1.1 \
-DIALYZER_VSN    2.8.1 \
-DIAMETER_VSN    1.11 \
-EDOC_VSN        0.7.17 \
-EI_VSN  3.8 \
-ELDAP_VSN       1.2 \
+COSTIME_VSN     1.2.1 \
+COSTRANSACTIONS_VSN     1.3.1 \
+CRYPTO_VSN      3.6.3 \
+DEBUGGER_VSN    4.1.2 \
+DIALYZER_VSN    2.9 \
+DIAMETER_VSN    1.11.2 \
+EDOC_VSN        0.7.18 \
+EI_VSN  3.8.2 \
+ELDAP_VSN       1.2.1 \
 EMACS_VSN       2.7.0 \
-ERL_DOCGEN_VSN  0.4 \
-ERL_INTERFACE_VSN       3.8 \
+ERL_DOCGEN_VSN  0.4.2 \
+ERL_INTERFACE_VSN       3.8.2 \
 ET_VSN  1.5.1 \
-EUNIT_VSN       2.2.11 \
+EUNIT_VSN       2.2.13 \
 GS_VSN  1.6 \
-HIPE_VSN        3.13 \
+HIPE_VSN        3.15 \
 IC_VSN  4.4 \
-INETS_VSN       6.0.1 \
-JINTERFACE_VSN  1.6 \
-KERNEL_VSN      4.1 \
+INETS_VSN       6.2 \
+JINTERFACE_VSN  1.6.1 \
+KERNEL_VSN      4.2 \
 MEGACO_VSN      3.18 \
-MNESIA_VSN      4.13.1 \
-OBSERVER_VSN    2.1 \
+MNESIA_VSN      4.13.3 \
+OBSERVER_VSN    2.1.2 \
 ODBC_VSN        2.11.1 \
-ORBER_VSN       3.8 \
+ORBER_VSN       3.8.1 \
 OSE_VSN 1.1 \
 OS_MON_VSN      2.4 \
 OTP_MIBS_VSN    1.1 \
-PARSETOOLS_VSN  2.1 \
+PARSETOOLS_VSN  2.1.1 \
 PERCEPT_VSN     0.8.11 \
-PUBLIC_KEY_VSN  1.0.1 \
+PUBLIC_KEY_VSN  1.1.1 \
 RELTOOL_VSN     0.7 \
-RUNTIME_TOOLS_VSN       1.9.1 \
-SASL_VSN        2.6 \
-SNMP_VSN        5.2 \
-SSH_VSN 4.1 \
-SSL_VSN 7.1 \
-STDLIB_VSN      2.6 \
+RUNTIME_TOOLS_VSN       1.9.3 \
+SASL_VSN        2.7 \
+SNMP_VSN        5.2.2 \
+SSH_VSN 4.2.2 \
+SSL_VSN 7.3 \
+STDLIB_VSN      2.8 \
 SYNTAX_TOOLS_VSN        1.7 \
-TEST_SERVER_VSN 3.9 \
-TOOLS_VSN       2.8.1 \
-TYPER_VSN       0.9.9 \
-WX_VSN  1.5 \
-XMERL_VSN       1.3.8 \
-WEBTOOL_VSN     0.9 \
-ERTS_VSN        7.1
+TEST_SERVER_VSN 3.10 \
+TOOLS_VSN       2.8.3 \
+TYPER_VSN       0.9.10 \
+WX_VSN  1.6.1 \
+XMERL_VSN       1.3.10 \
+WEBTOOL_VSN     0.9.1 \
+ERTS_VSN        7.3
 
 SYSTEM_VSN=	${V:R}
 
diff --git a/lang/erlang/18/distinfo b/lang/erlang/18/distinfo
index b10a3beb794..5823438bf21 100644
--- a/lang/erlang/18/distinfo
+++ b/lang/erlang/18/distinfo
@@ -1,4 +1,4 @@
-SHA256 (otp_doc_man_18.1.tar.gz) = 4IDmVoILJt1F2Aa2MuEu7H0d40845d4Zp668n9blybY=
-SHA256 (otp_src_18.1.tar.gz) = 5KFHIoprf6YNzgXIrfs8vCVNl89uRUVtk9k6296LDxE=
-SIZE (otp_doc_man_18.1.tar.gz) = 1390525
-SIZE (otp_src_18.1.tar.gz) = 68231709
+SHA256 (otp_doc_man_18.3.tar.gz) = l4vhAOkBaHSSGzrRpl7ka3tqHll7jbLsS170NtTJ7MI=
+SHA256 (otp_src_18.3.tar.gz) = /auBKaHLk12wnxgy46fVEaSusrm7NgLKanzLlzDVycM=
+SIZE (otp_doc_man_18.3.tar.gz) = 1395166
+SIZE (otp_src_18.3.tar.gz) = 68292101
diff --git a/lang/erlang/18/patches/patch-Makefile_in b/lang/erlang/18/patches/patch-Makefile_in
index 7d889ba2f11..b5aa65d3bfd 100644
--- a/lang/erlang/18/patches/patch-Makefile_in
+++ b/lang/erlang/18/patches/patch-Makefile_in
@@ -1,11 +1,11 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2018/03/19 20:57:20 jasper Exp $
+$OpenBSD: patch-Makefile_in,v 1.2 2018/11/17 13:40:05 jasper Exp $
 
 Create symlink so the build can handle versioned binaries
 
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -528,6 +528,7 @@ $(BOOTSTRAP_ROOT)/bootstrap/bin/erl: $(ERL_TOP)/erts/e
+@@ -529,6 +529,7 @@ $(BOOTSTRAP_ROOT)/bootstrap/bin/erl: $(ERL_TOP)/erts/e
  	        $(ERL_TOP)/erts/etc/unix/erl.src.src > \
  			$(BOOTSTRAP_ROOT)/bootstrap/bin/erl
  	@chmod 755 $(BOOTSTRAP_ROOT)/bootstrap/bin/erl
diff --git a/lang/erlang/18/patches/patch-erts_etc_common_ct_run_c b/lang/erlang/18/patches/patch-erts_etc_common_ct_run_c
index feb86e9b176..9754203e16c 100644
--- a/lang/erlang/18/patches/patch-erts_etc_common_ct_run_c
+++ b/lang/erlang/18/patches/patch-erts_etc_common_ct_run_c
@@ -1,11 +1,11 @@
-$OpenBSD: patch-erts_etc_common_ct_run_c,v 1.1 2018/03/19 20:57:20 jasper Exp $
+$OpenBSD: patch-erts_etc_common_ct_run_c,v 1.2 2018/11/17 13:40:05 jasper Exp $
 
 Let erlang test runner handle versioned binaries.
 
 Index: erts/etc/common/ct_run.c
 --- erts/etc/common/ct_run.c.orig
 +++ erts/etc/common/ct_run.c
-@@ -49,7 +49,7 @@ static int eargc;		/* Number of arguments in eargv. */
+@@ -50,7 +50,7 @@ static int eargc;		/* Number of arguments in eargv. */
  #else
  #  define QUOTE(s) s
  #  define IS_DIRSEP(c) ((c) == '/')
diff --git a/lang/erlang/18/patches/patch-erts_etc_common_dialyzer_c b/lang/erlang/18/patches/patch-erts_etc_common_dialyzer_c
index abbad79f46d..70bf34716ba 100644
--- a/lang/erlang/18/patches/patch-erts_etc_common_dialyzer_c
+++ b/lang/erlang/18/patches/patch-erts_etc_common_dialyzer_c
@@ -1,11 +1,11 @@
-$OpenBSD: patch-erts_etc_common_dialyzer_c,v 1.1 2018/03/19 20:57:20 jasper Exp $
+$OpenBSD: patch-erts_etc_common_dialyzer_c,v 1.2 2018/11/17 13:40:05 jasper Exp $
 
 Let static analyzer handle versioned binaries.
 
 Index: erts/etc/common/dialyzer.c
 --- erts/etc/common/dialyzer.c.orig
 +++ erts/etc/common/dialyzer.c
-@@ -49,7 +49,7 @@ static int eargc;		/* Number of arguments in eargv. */
+@@ -50,7 +50,7 @@ static int eargc;		/* Number of arguments in eargv. */
  #else
  #  define QUOTE(s) s
  #  define IS_DIRSEP(c) ((c) == '/')
diff --git a/lang/erlang/18/patches/patch-erts_etc_common_erlc_c b/lang/erlang/18/patches/patch-erts_etc_common_erlc_c
index c7801982915..ec4139382a9 100644
--- a/lang/erlang/18/patches/patch-erts_etc_common_erlc_c
+++ b/lang/erlang/18/patches/patch-erts_etc_common_erlc_c
@@ -1,11 +1,11 @@
-$OpenBSD: patch-erts_etc_common_erlc_c,v 1.1 2018/03/19 20:57:20 jasper Exp $
+$OpenBSD: patch-erts_etc_common_erlc_c,v 1.2 2018/11/17 13:40:05 jasper Exp $
 
 Let erlang compiler handle versioned binaries.
 
 Index: erts/etc/common/erlc.c
 --- erts/etc/common/erlc.c.orig
 +++ erts/etc/common/erlc.c
-@@ -52,7 +52,7 @@ static int eargc;		/* Number of arguments in eargv. */
+@@ -53,7 +53,7 @@ static int eargc;		/* Number of arguments in eargv. */
  #else
  #  define QUOTE(s) s
  #  define IS_DIRSEP(c) ((c) == '/')
diff --git a/lang/erlang/18/patches/patch-erts_etc_common_typer_c b/lang/erlang/18/patches/patch-erts_etc_common_typer_c
index efa6a03b5b0..b034dcd40ad 100644
--- a/lang/erlang/18/patches/patch-erts_etc_common_typer_c
+++ b/lang/erlang/18/patches/patch-erts_etc_common_typer_c
@@ -1,11 +1,11 @@
-$OpenBSD: patch-erts_etc_common_typer_c,v 1.1 2018/03/19 20:57:20 jasper Exp $
+$OpenBSD: patch-erts_etc_common_typer_c,v 1.2 2018/11/17 13:40:05 jasper Exp $
 
 Let erlang type inspection handle versioned binaries.
 
 Index: erts/etc/common/typer.c
 --- erts/etc/common/typer.c.orig
 +++ erts/etc/common/typer.c
-@@ -49,7 +49,7 @@ static int eargc;		/* Number of arguments in eargv. */
+@@ -50,7 +50,7 @@ static int eargc;		/* Number of arguments in eargv. */
  #else
  #  define QUOTE(s) s
  #  define IS_DIRSEP(c) ((c) == '/')
diff --git a/lang/erlang/18/patches/patch-lib_dialyzer_src_dialyzer_plt_erl b/lang/erlang/18/patches/patch-lib_dialyzer_src_dialyzer_plt_erl
index e44857f2077..589f92f2e45 100644
--- a/lang/erlang/18/patches/patch-lib_dialyzer_src_dialyzer_plt_erl
+++ b/lang/erlang/18/patches/patch-lib_dialyzer_src_dialyzer_plt_erl
@@ -1,4 +1,4 @@
-$OpenBSD: patch-lib_dialyzer_src_dialyzer_plt_erl,v 1.1 2018/03/19 20:57:20 jasper Exp $
+$OpenBSD: patch-lib_dialyzer_src_dialyzer_plt_erl,v 1.2 2018/11/17 13:40:05 jasper Exp $
 
 Prevent collisions during static analysis when multiple versions of
 erlang are installed
@@ -6,7 +6,7 @@ erlang are installed
 Index: lib/dialyzer/src/dialyzer_plt.erl
 --- lib/dialyzer/src/dialyzer_plt.erl.orig
 +++ lib/dialyzer/src/dialyzer_plt.erl
-@@ -231,7 +231,7 @@ get_default_plt() ->
+@@ -230,7 +230,7 @@ get_default_plt() ->
  	false ->
  	  plt_error("The HOME environment variable needs to be set " ++
  		    "so that Dialyzer knows where to find the default PLT");
diff --git a/lang/erlang/18/patches/patch-lib_wx_c_src_wxe_impl_cpp b/lang/erlang/18/patches/patch-lib_wx_c_src_wxe_impl_cpp
index d5e38797c4b..bbe7fbe023e 100644
--- a/lang/erlang/18/patches/patch-lib_wx_c_src_wxe_impl_cpp
+++ b/lang/erlang/18/patches/patch-lib_wx_c_src_wxe_impl_cpp
@@ -1,10 +1,11 @@
-$OpenBSD: patch-lib_wx_c_src_wxe_impl_cpp,v 1.1 2017/04/24 13:35:23 sthen Exp $
+$OpenBSD: patch-lib_wx_c_src_wxe_impl_cpp,v 1.2 2018/11/17 13:40:05 jasper Exp $
 
 clang: ordered comparison between pointer and zero ('void *' and 'long')
 
---- lib/wx/c_src/wxe_impl.cpp.orig	Wed Apr 19 11:19:36 2017
-+++ lib/wx/c_src/wxe_impl.cpp	Wed Apr 19 11:19:40 2017
-@@ -703,7 +703,7 @@ void * WxeApp::getPtr(char * bp, wxeMemEnv *memenv) {
+Index: lib/wx/c_src/wxe_impl.cpp
+--- lib/wx/c_src/wxe_impl.cpp.orig
++++ lib/wx/c_src/wxe_impl.cpp
+@@ -666,7 +666,7 @@ void * WxeApp::getPtr(char * bp, wxeMemEnv *memenv) {
      throw wxe_badarg(index);
    }
    void * temp = memenv->ref2ptr[index];
@@ -13,7 +14,7 @@ clang: ordered comparison between pointer and zero ('void *' and 'long')
      return temp;
    else {
      throw wxe_badarg(index);
-@@ -715,7 +715,7 @@ void WxeApp::registerPid(char * bp, ErlDrvTermData pid
+@@ -678,7 +678,7 @@ void WxeApp::registerPid(char * bp, ErlDrvTermData pid
    if(!memenv)
      throw wxe_badarg(index);
    void * temp = memenv->ref2ptr[index];
diff --git a/lang/erlang/18/pkg/PLIST-main b/lang/erlang/18/pkg/PLIST-main
index bb38e364f71..bb18df118ab 100644
--- a/lang/erlang/18/pkg/PLIST-main
+++ b/lang/erlang/18/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2016/06/29 16:14:41 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.5 2018/11/17 13:40:05 jasper Exp $
 @option no-default-conflict
 @option is-branch
 @conflict erlang-<16b.03p4v0
@@ -143,7 +143,6 @@ lib/erlang${SYSTEM_VSN}/lib/
 lib/erlang${SYSTEM_VSN}/lib/${ASN1}/
 lib/erlang${SYSTEM_VSN}/lib/${ASN1}/c_src/
 lib/erlang${SYSTEM_VSN}/lib/${ASN1}/c_src/asn1_erl_nif.c
-lib/erlang${SYSTEM_VSN}/lib/${ASN1}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${ASN1}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${ASN1}/ebin/asn1.app
 lib/erlang${SYSTEM_VSN}/lib/${ASN1}/ebin/asn1.appup
@@ -199,7 +198,6 @@ lib/erlang${SYSTEM_VSN}/lib/${ASN1}/src/asn1ct_value.erl
 lib/erlang${SYSTEM_VSN}/lib/${ASN1}/src/asn1rt.erl
 lib/erlang${SYSTEM_VSN}/lib/${ASN1}/src/asn1rt_nif.erl
 lib/erlang${SYSTEM_VSN}/lib/${COMMON_TEST}/
-lib/erlang${SYSTEM_VSN}/lib/${COMMON_TEST}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${COMMON_TEST}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${COMMON_TEST}/ebin/common_test.app
 lib/erlang${SYSTEM_VSN}/lib/${COMMON_TEST}/ebin/common_test.appup
@@ -294,7 +292,6 @@ lib/erlang${SYSTEM_VSN}/lib/${COMMON_TEST}/src/cth_surefire.erl
 lib/erlang${SYSTEM_VSN}/lib/${COMMON_TEST}/src/unix_telnet.erl
 lib/erlang${SYSTEM_VSN}/lib/${COMMON_TEST}/src/vts.erl
 lib/erlang${SYSTEM_VSN}/lib/${COMPILER}/
-lib/erlang${SYSTEM_VSN}/lib/${COMPILER}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${COMPILER}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${COMPILER}/ebin/beam_a.beam
 lib/erlang${SYSTEM_VSN}/lib/${COMPILER}/ebin/beam_asm.beam
@@ -398,7 +395,6 @@ lib/erlang${SYSTEM_VSN}/lib/${COMPILER}/src/v3_kernel_pp.erl
 lib/erlang${SYSTEM_VSN}/lib/${COMPILER}/src/v3_life.erl
 lib/erlang${SYSTEM_VSN}/lib/${COMPILER}/src/v3_life.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/
-lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/ebin/CosEventChannelAdmin_AlreadyConnected.beam
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/ebin/CosEventChannelAdmin_ConsumerAdmin.beam
@@ -454,6 +450,7 @@ lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/include/oe_CosEventComm_Event.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/include/oe_CosEventComm_PullerS.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/include/oe_CosEventComm_PusherS.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/include/oe_cosEventApp.hrl
+lib/erlang18/lib/${COSEVENT}/info
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/src/
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/src/CosEventChannelAdmin.idl
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/src/CosEventChannelAdmin_AlreadyConnected.erl
@@ -490,7 +487,6 @@ lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/src/oe_CosEventComm_PusherS.erl
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/src/oe_CosEventComm_PusherS_impl.erl
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENT}/src/oe_cosEventApp.erl
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/
-lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/ebin/CosEventDomainAdmin.beam
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/ebin/CosEventDomainAdmin_AlreadyExists.beam
@@ -518,6 +514,7 @@ lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/include/CosEventDomainAdmin.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/include/CosEventDomainAdmin_EventDomain.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/include/CosEventDomainAdmin_EventDomainFactory.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/include/oe_CosEventDomainAdmin.hrl
+lib/erlang18/lib/${COSEVENTDOMAIN}/info
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/src/
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/src/CosEventDomainAdmin.erl
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/src/CosEventDomainAdmin.idl
@@ -541,7 +538,6 @@ lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/src/cosEventDomainApp.erl
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/src/cosEventDomainApp.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSEVENTDOMAIN}/src/oe_CosEventDomainAdmin.erl
 lib/erlang${SYSTEM_VSN}/lib/${COSFILETRANSFER}/
-lib/erlang${SYSTEM_VSN}/lib/${COSFILETRANSFER}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${COSFILETRANSFER}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${COSFILETRANSFER}/ebin/CosFileTransfer.beam
 lib/erlang${SYSTEM_VSN}/lib/${COSFILETRANSFER}/ebin/CosFileTransfer_AccessLevel.beam
@@ -620,7 +616,6 @@ lib/erlang${SYSTEM_VSN}/lib/${COSFILETRANSFER}/src/cosFileTransferNATIVE_file.er
 lib/erlang${SYSTEM_VSN}/lib/${COSFILETRANSFER}/src/oe_CosFileTransfer.erl
 lib/erlang${SYSTEM_VSN}/lib/${COSFILETRANSFER}/src/oe_CosFileTransfer.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSNOTIFICATION}/
-lib/erlang${SYSTEM_VSN}/lib/${COSNOTIFICATION}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${COSNOTIFICATION}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${COSNOTIFICATION}/ebin/CosNotification.beam
 lib/erlang${SYSTEM_VSN}/lib/${COSNOTIFICATION}/ebin/CosNotification_AdminPropertiesAdmin.beam
@@ -948,7 +943,6 @@ lib/erlang${SYSTEM_VSN}/lib/${COSNOTIFICATION}/src/oe_CosNotifyFilter.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSNOTIFICATION}/src/oe_cosNotificationAppComm.erl
 lib/erlang${SYSTEM_VSN}/lib/${COSNOTIFICATION}/src/oe_cosNotificationAppComm.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSPROPERTY}/
-lib/erlang${SYSTEM_VSN}/lib/${COSPROPERTY}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${COSPROPERTY}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${COSPROPERTY}/ebin/CosPropertyService_ConflictingProperty.beam
 lib/erlang${SYSTEM_VSN}/lib/${COSPROPERTY}/ebin/CosPropertyService_ConstraintNotSupported.beam
@@ -1039,7 +1033,6 @@ lib/erlang${SYSTEM_VSN}/lib/${COSPROPERTY}/src/cosProperty.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSPROPERTY}/src/oe_CosProperty.erl
 lib/erlang${SYSTEM_VSN}/lib/${COSPROPERTY}/src/oe_CosProperty.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSTIME}/
-lib/erlang${SYSTEM_VSN}/lib/${COSTIME}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${COSTIME}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${COSTIME}/ebin/CosTime_TIO.beam
 lib/erlang${SYSTEM_VSN}/lib/${COSTIME}/ebin/CosTime_TIO_impl.beam
@@ -1108,7 +1101,6 @@ lib/erlang${SYSTEM_VSN}/lib/${COSTIME}/src/oe_CosTimerEvent.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSTIME}/src/oe_TimeBase.erl
 lib/erlang${SYSTEM_VSN}/lib/${COSTIME}/src/oe_TimeBase.hrl
 lib/erlang${SYSTEM_VSN}/lib/${COSTRANSACTIONS}/
-lib/erlang${SYSTEM_VSN}/lib/${COSTRANSACTIONS}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${COSTRANSACTIONS}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${COSTRANSACTIONS}/ebin/CosTransactions_Control.beam
 lib/erlang${SYSTEM_VSN}/lib/${COSTRANSACTIONS}/ebin/CosTransactions_Coordinator.beam
@@ -1190,7 +1182,6 @@ lib/erlang${SYSTEM_VSN}/lib/${COSTRANSACTIONS}/src/cosTransactions.erl
 lib/erlang${SYSTEM_VSN}/lib/${COSTRANSACTIONS}/src/etrap_logmgr.erl
 lib/erlang${SYSTEM_VSN}/lib/${COSTRANSACTIONS}/src/oe_CosTransactions.erl
 lib/erlang${SYSTEM_VSN}/lib/${CRYPTO}/
-lib/erlang${SYSTEM_VSN}/lib/${CRYPTO}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${CRYPTO}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${CRYPTO}/ebin/crypto.app
 lib/erlang${SYSTEM_VSN}/lib/${CRYPTO}/ebin/crypto.appup
@@ -1208,7 +1199,6 @@ lib/erlang${SYSTEM_VSN}/lib/${CRYPTO}/src/
 lib/erlang${SYSTEM_VSN}/lib/${CRYPTO}/src/crypto.erl
 lib/erlang${SYSTEM_VSN}/lib/${CRYPTO}/src/crypto_ec_curves.erl
 lib/erlang${SYSTEM_VSN}/lib/${DEBUGGER}/
-lib/erlang${SYSTEM_VSN}/lib/${DEBUGGER}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${DEBUGGER}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${DEBUGGER}/ebin/dbg_debugged.beam
 lib/erlang${SYSTEM_VSN}/lib/${DEBUGGER}/ebin/dbg_icmd.beam
@@ -1268,7 +1258,6 @@ lib/erlang${SYSTEM_VSN}/lib/${DEBUGGER}/src/debugger.erl
 lib/erlang${SYSTEM_VSN}/lib/${DEBUGGER}/src/i.erl
 lib/erlang${SYSTEM_VSN}/lib/${DEBUGGER}/src/int.erl
 lib/erlang${SYSTEM_VSN}/lib/${DIALYZER}/
-lib/erlang${SYSTEM_VSN}/lib/${DIALYZER}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${DIALYZER}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${DIALYZER}/ebin/dialyzer.app
 lib/erlang${SYSTEM_VSN}/lib/${DIALYZER}/ebin/dialyzer.appup
@@ -1320,7 +1309,6 @@ lib/erlang${SYSTEM_VSN}/lib/${DIALYZER}/src/dialyzer_worker.erl
 lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/
 lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/bin/
 lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/bin/diameterc
-lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/ebin/diameter.app
 lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/ebin/diameter.appup
@@ -1441,6 +1429,9 @@ lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/src/gen/diameter_gen_base_accounting.erl
 lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/src/gen/diameter_gen_base_rfc3588.erl
 lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/src/gen/diameter_gen_base_rfc6733.erl
 lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/src/gen/diameter_gen_relay.erl
+lib/erlang18/lib/${DIAMETER}/src/info/
+lib/erlang18/lib/${DIAMETER}/src/info/diameter_dbg.erl
+lib/erlang18/lib/${DIAMETER}/src/info/diameter_info.erl
 lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/src/transport/
 lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/src/transport/diameter_etcp.erl
 lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/src/transport/diameter_etcp_sup.erl
@@ -1451,7 +1442,6 @@ lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/src/transport/diameter_tcp_sup.erl
 lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/src/transport/diameter_transport.erl
 lib/erlang${SYSTEM_VSN}/lib/${DIAMETER}/src/transport/diameter_transport_sup.erl
 lib/erlang${SYSTEM_VSN}/lib/${EDOC}/
-lib/erlang${SYSTEM_VSN}/lib/${EDOC}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${EDOC}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${EDOC}/ebin/edoc.app
 lib/erlang${SYSTEM_VSN}/lib/${EDOC}/ebin/edoc.appup
@@ -1504,7 +1494,6 @@ lib/erlang${SYSTEM_VSN}/lib/${EDOC}/src/otpsgml_layout.erl
 lib/erlang${SYSTEM_VSN}/lib/${ELDAP}/
 lib/erlang${SYSTEM_VSN}/lib/${ELDAP}/asn1/
 lib/erlang${SYSTEM_VSN}/lib/${ELDAP}/asn1/ELDAPv3.asn1
-lib/erlang${SYSTEM_VSN}/lib/${ELDAP}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${ELDAP}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${ELDAP}/ebin/ELDAPv3.beam
 lib/erlang${SYSTEM_VSN}/lib/${ELDAP}/ebin/eldap.app
@@ -1515,7 +1504,6 @@ lib/erlang${SYSTEM_VSN}/lib/${ELDAP}/include/eldap.hrl
 lib/erlang${SYSTEM_VSN}/lib/${ELDAP}/src/
 lib/erlang${SYSTEM_VSN}/lib/${ELDAP}/src/eldap.erl
 lib/erlang${SYSTEM_VSN}/lib/${ERL_DOCGEN}/
-lib/erlang${SYSTEM_VSN}/lib/${ERL_DOCGEN}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${ERL_DOCGEN}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${ERL_DOCGEN}/ebin/docgen_edoc_xml_cb.beam
 lib/erlang${SYSTEM_VSN}/lib/${ERL_DOCGEN}/ebin/docgen_otp_specs.beam
@@ -1581,7 +1569,6 @@ lib/erlang${SYSTEM_VSN}/lib/${ERL_DOCGEN}/src/docgen_xmerl_xml_cb.erl
 lib/erlang${SYSTEM_VSN}/lib/${EI}/
 lib/erlang${SYSTEM_VSN}/lib/${EI}/bin/
 @bin lib/erlang${SYSTEM_VSN}/lib/${EI}/bin/erl_call
-lib/erlang${SYSTEM_VSN}/lib/${EI}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${EI}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${EI}/ebin/erl_interface.app
 lib/erlang${SYSTEM_VSN}/lib/${EI}/ebin/erl_interface.appup
@@ -1788,7 +1775,6 @@ lib/erlang${SYSTEM_VSN}/lib/${ERTS}/src/prim_inet.erl
 lib/erlang${SYSTEM_VSN}/lib/${ERTS}/src/prim_zip.erl
 lib/erlang${SYSTEM_VSN}/lib/${ERTS}/src/zlib.erl
 lib/erlang${SYSTEM_VSN}/lib/${ET}/
-lib/erlang${SYSTEM_VSN}/lib/${ET}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${ET}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${ET}/ebin/et.app
 lib/erlang${SYSTEM_VSN}/lib/${ET}/ebin/et.appup
@@ -1813,7 +1799,6 @@ lib/erlang${SYSTEM_VSN}/lib/${ET}/src/et_viewer.erl
 lib/erlang${SYSTEM_VSN}/lib/${ET}/src/et_wx_contents_viewer.erl
 lib/erlang${SYSTEM_VSN}/lib/${ET}/src/et_wx_viewer.erl
 lib/erlang${SYSTEM_VSN}/lib/${EUNIT}/
-lib/erlang${SYSTEM_VSN}/lib/${EUNIT}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${EUNIT}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${EUNIT}/ebin/eunit.app
 lib/erlang${SYSTEM_VSN}/lib/${EUNIT}/ebin/eunit.appup
@@ -1923,7 +1908,6 @@ lib/erlang${SYSTEM_VSN}/lib/${GS}/contribs/othello/priv/marker.bm
 lib/erlang${SYSTEM_VSN}/lib/${GS}/contribs/othello/priv/othello.gif
 lib/erlang${SYSTEM_VSN}/lib/${GS}/contribs/othello/priv/othello.tool
 lib/erlang${SYSTEM_VSN}/lib/${GS}/contribs/othello/priv/square.bm
-lib/erlang${SYSTEM_VSN}/lib/${GS}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${GS}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${GS}/ebin/gs.app
 lib/erlang${SYSTEM_VSN}/lib/${GS}/ebin/gs.appup
@@ -2066,7 +2050,6 @@ lib/erlang${SYSTEM_VSN}/lib/${HIPE}/cerl/cerl_to_icode.erl
 lib/erlang${SYSTEM_VSN}/lib/${HIPE}/cerl/cerl_typean.erl
 lib/erlang${SYSTEM_VSN}/lib/${HIPE}/cerl/erl_bif_types.erl
 lib/erlang${SYSTEM_VSN}/lib/${HIPE}/cerl/erl_types.erl
-lib/erlang${SYSTEM_VSN}/lib/${HIPE}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${HIPE}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${HIPE}/ebin/cerl_cconv.beam
 lib/erlang${SYSTEM_VSN}/lib/${HIPE}/ebin/cerl_closurean.beam
@@ -2161,7 +2144,6 @@ lib/erlang${SYSTEM_VSN}/lib/${IC}/
 lib/erlang${SYSTEM_VSN}/lib/${IC}/c_src/
 lib/erlang${SYSTEM_VSN}/lib/${IC}/c_src/ic.c
 lib/erlang${SYSTEM_VSN}/lib/${IC}/c_src/ic_tmo.c
-lib/erlang${SYSTEM_VSN}/lib/${IC}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${IC}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${IC}/ebin/ic.app
 lib/erlang${SYSTEM_VSN}/lib/${IC}/ebin/ic.beam
@@ -2299,7 +2281,6 @@ lib/erlang${SYSTEM_VSN}/lib/${IC}/src/ictk.erl
 lib/erlang${SYSTEM_VSN}/lib/${IC}/src/ictype.erl
 lib/erlang${SYSTEM_VSN}/lib/${IC}/src/icunion.erl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/
-lib/erlang${SYSTEM_VSN}/lib/${INETS}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/ftp.beam
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/ftp_progress.beam
@@ -2327,6 +2308,7 @@ lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/httpd_cgi.beam
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/httpd_conf.beam
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/httpd_connection_sup.beam
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/httpd_custom.beam
+lib/erlang18/lib/${INETS}/ebin/httpd_custom_api.beam
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/httpd_esi.beam
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/httpd_example.beam
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/httpd_file.beam
@@ -2346,7 +2328,6 @@ lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/inets.appup
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/inets.beam
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/inets_app.beam
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/inets_lib.beam
-lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/inets_regexp.beam
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/inets_service.beam
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/inets_sup.beam
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/ebin/inets_time_compat.beam
@@ -2570,6 +2551,7 @@ lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/http_server/httpd_cgi.erl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/http_server/httpd_conf.erl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/http_server/httpd_connection_sup.erl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/http_server/httpd_custom.erl
+lib/erlang18/lib/${INETS}/src/http_server/httpd_custom_api.erl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/http_server/httpd_esi.erl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/http_server/httpd_example.erl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/http_server/httpd_file.erl
@@ -2612,7 +2594,6 @@ lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/inets_app/inets.erl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/inets_app/inets_app.erl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/inets_app/inets_internal.hrl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/inets_app/inets_lib.erl
-lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/inets_app/inets_regexp.erl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/inets_app/inets_service.erl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/inets_app/inets_sup.erl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/inets_app/inets_time_compat.erl
@@ -2627,7 +2608,6 @@ lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/tftp/tftp_lib.erl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/tftp/tftp_logger.erl
 lib/erlang${SYSTEM_VSN}/lib/${INETS}/src/tftp/tftp_sup.erl
 lib/erlang${SYSTEM_VSN}/lib/${KERNEL}/
-lib/erlang${SYSTEM_VSN}/lib/${KERNEL}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${KERNEL}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${KERNEL}/ebin/application.beam
 lib/erlang${SYSTEM_VSN}/lib/${KERNEL}/ebin/application_controller.beam
@@ -3050,7 +3030,6 @@ lib/erlang${SYSTEM_VSN}/lib/${MEGACO}/src/udp/megaco_udp.hrl
 lib/erlang${SYSTEM_VSN}/lib/${MEGACO}/src/udp/megaco_udp_server.erl
 lib/erlang${SYSTEM_VSN}/lib/${MEGACO}/src/udp/megaco_udp_sup.erl
 lib/erlang${SYSTEM_VSN}/lib/${MNESIA}/
-lib/erlang${SYSTEM_VSN}/lib/${MNESIA}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${MNESIA}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${MNESIA}/ebin/mnesia.app
 lib/erlang${SYSTEM_VSN}/lib/${MNESIA}/ebin/mnesia.appup
@@ -3173,7 +3152,6 @@ lib/erlang${SYSTEM_VSN}/lib/${ORBER}/COSS/CosNaming/oe_cos_naming_ext.erl
 lib/erlang${SYSTEM_VSN}/lib/${ORBER}/COSS/CosNaming/oe_cos_naming_ext.hrl
 lib/erlang${SYSTEM_VSN}/lib/${ORBER}/COSS/CosNaming/orber_cosnaming.hrl
 lib/erlang${SYSTEM_VSN}/lib/${ORBER}/COSS/CosNaming/orber_cosnaming_utils.erl
-lib/erlang${SYSTEM_VSN}/lib/${ORBER}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${ORBER}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${ORBER}/ebin/CosNaming_Binding.beam
 lib/erlang${SYSTEM_VSN}/lib/${ORBER}/ebin/CosNaming_BindingIterator.beam
@@ -3292,6 +3270,7 @@ lib/erlang${SYSTEM_VSN}/lib/${ORBER}/priv/
 lib/erlang${SYSTEM_VSN}/lib/${ORBER}/priv/blank.html
 lib/erlang${SYSTEM_VSN}/lib/${ORBER}/priv/include/
 lib/erlang${SYSTEM_VSN}/lib/${ORBER}/priv/include/InitialReference.hh
+lib/erlang18/lib/${ORBER}/priv/info_frames.html
 lib/erlang${SYSTEM_VSN}/lib/${ORBER}/priv/main_frame.html
 lib/erlang${SYSTEM_VSN}/lib/${ORBER}/priv/orber.tool
 lib/erlang${SYSTEM_VSN}/lib/${ORBER}/priv/orber_help.txt
@@ -3372,7 +3351,6 @@ lib/erlang${SYSTEM_VSN}/lib/${ORBER}/src/orber_typedefs.erl
 lib/erlang${SYSTEM_VSN}/lib/${ORBER}/src/orber_web.erl
 lib/erlang${SYSTEM_VSN}/lib/${ORBER}/src/orber_web_server.erl
 lib/erlang${SYSTEM_VSN}/lib/${OS_MON}/
-lib/erlang${SYSTEM_VSN}/lib/${OS_MON}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${OS_MON}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${OS_MON}/ebin/cpu_sup.beam
 lib/erlang${SYSTEM_VSN}/lib/${OS_MON}/ebin/disksup.beam
@@ -3410,7 +3388,6 @@ lib/erlang${SYSTEM_VSN}/lib/${OS_MON}/src/os_mon_mib.erl
 lib/erlang${SYSTEM_VSN}/lib/${OS_MON}/src/os_mon_sysinfo.erl
 lib/erlang${SYSTEM_VSN}/lib/${OS_MON}/src/os_sup.erl
 lib/erlang${SYSTEM_VSN}/lib/${OSE}/
-lib/erlang${SYSTEM_VSN}/lib/${OSE}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${OSE}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${OSE}/ebin/ose.app
 lib/erlang${SYSTEM_VSN}/lib/${OSE}/ebin/ose.appup
@@ -3419,7 +3396,6 @@ lib/erlang${SYSTEM_VSN}/lib/${OSE}/include/
 lib/erlang${SYSTEM_VSN}/lib/${OSE}/src/
 lib/erlang${SYSTEM_VSN}/lib/${OSE}/src/ose.erl
 lib/erlang${SYSTEM_VSN}/lib/${OTP_MIBS}/
-lib/erlang${SYSTEM_VSN}/lib/${OTP_MIBS}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${OTP_MIBS}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${OTP_MIBS}/ebin/otp_mib.beam
 lib/erlang${SYSTEM_VSN}/lib/${OTP_MIBS}/ebin/otp_mibs.app
@@ -3445,7 +3421,6 @@ lib/erlang${SYSTEM_VSN}/lib/${OTP_MIBS}/priv/mibs/OTP-TC.bin
 lib/erlang${SYSTEM_VSN}/lib/${OTP_MIBS}/src/
 lib/erlang${SYSTEM_VSN}/lib/${OTP_MIBS}/src/otp_mib.erl
 lib/erlang${SYSTEM_VSN}/lib/${PARSETOOLS}/
-lib/erlang${SYSTEM_VSN}/lib/${PARSETOOLS}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${PARSETOOLS}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${PARSETOOLS}/ebin/leex.beam
 lib/erlang${SYSTEM_VSN}/lib/${PARSETOOLS}/ebin/parsetools.app
@@ -3462,7 +3437,6 @@ lib/erlang${SYSTEM_VSN}/lib/${PARSETOOLS}/src/yecc.erl
 lib/erlang${SYSTEM_VSN}/lib/${PARSETOOLS}/src/yeccparser.erl
 lib/erlang${SYSTEM_VSN}/lib/${PARSETOOLS}/src/yeccscan.erl
 lib/erlang${SYSTEM_VSN}/lib/${PERCEPT}/
-lib/erlang${SYSTEM_VSN}/lib/${PERCEPT}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${PERCEPT}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${PERCEPT}/ebin/egd.beam
 lib/erlang${SYSTEM_VSN}/lib/${PERCEPT}/ebin/egd_font.beam
@@ -3529,7 +3503,6 @@ lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/asn1/PKIX1Explicit88.asn1
 lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/asn1/PKIX1Implicit88.asn1
 lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/asn1/PKIXAttributeCertificate.asn1
 lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/asn1/RFC5639.asn1
-lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/ebin/OTP-PUB-KEY.beam
 lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/ebin/PKCS-FRAME.beam
@@ -3550,12 +3523,12 @@ lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/src/
 lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/src/pubkey_cert.erl
 lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/src/pubkey_cert_records.erl
 lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/src/pubkey_crl.erl
+lib/erlang18/lib/${PUBLIC_KEY}/src/pubkey_moduli.hrl
 lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/src/pubkey_pbe.erl
 lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/src/pubkey_pem.erl
 lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/src/pubkey_ssh.erl
 lib/erlang${SYSTEM_VSN}/lib/${PUBLIC_KEY}/src/public_key.erl
 lib/erlang${SYSTEM_VSN}/lib/${RELTOOL}/
-lib/erlang${SYSTEM_VSN}/lib/${RELTOOL}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${RELTOOL}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${RELTOOL}/ebin/reltool.app
 lib/erlang${SYSTEM_VSN}/lib/${RELTOOL}/ebin/reltool.appup
@@ -3584,7 +3557,6 @@ lib/erlang${SYSTEM_VSN}/lib/${RELTOOL}/src/reltool_sys_win.erl
 lib/erlang${SYSTEM_VSN}/lib/${RELTOOL}/src/reltool_target.erl
 lib/erlang${SYSTEM_VSN}/lib/${RELTOOL}/src/reltool_utils.erl
 lib/erlang${SYSTEM_VSN}/lib/${RUNTIME_TOOLS}/
-lib/erlang${SYSTEM_VSN}/lib/${RUNTIME_TOOLS}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${RUNTIME_TOOLS}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${RUNTIME_TOOLS}/ebin/appmon_info.beam
 lib/erlang${SYSTEM_VSN}/lib/${RUNTIME_TOOLS}/ebin/dbg.beam
@@ -3644,7 +3616,6 @@ lib/erlang${SYSTEM_VSN}/lib/${RUNTIME_TOOLS}/src/runtime_tools_sup.erl
 lib/erlang${SYSTEM_VSN}/lib/${RUNTIME_TOOLS}/src/system_information.erl
 lib/erlang${SYSTEM_VSN}/lib/${RUNTIME_TOOLS}/src/ttb_autostart.erl
 lib/erlang${SYSTEM_VSN}/lib/${SASL}/
-lib/erlang${SYSTEM_VSN}/lib/${SASL}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${SASL}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${SASL}/ebin/alarm_handler.beam
 lib/erlang${SYSTEM_VSN}/lib/${SASL}/ebin/erlsrv.beam
@@ -3699,7 +3670,6 @@ lib/erlang${SYSTEM_VSN}/lib/${SASL}/src/systools_relup.erl
 lib/erlang${SYSTEM_VSN}/lib/${SNMP}/
 lib/erlang${SYSTEM_VSN}/lib/${SNMP}/bin/
 lib/erlang${SYSTEM_VSN}/lib/${SNMP}/bin/snmpc
-lib/erlang${SYSTEM_VSN}/lib/${SNMP}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${SNMP}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${SNMP}/ebin/snmp.app
 lib/erlang${SYSTEM_VSN}/lib/${SNMP}/ebin/snmp.appup
@@ -3987,7 +3957,6 @@ lib/erlang${SYSTEM_VSN}/lib/${SNMP}/src/misc/snmp_usm.erl
 lib/erlang${SYSTEM_VSN}/lib/${SNMP}/src/misc/snmp_verbosity.erl
 lib/erlang${SYSTEM_VSN}/lib/${SNMP}/src/misc/snmp_verbosity.hrl
 lib/erlang${SYSTEM_VSN}/lib/${SSH}/
-lib/erlang${SYSTEM_VSN}/lib/${SSH}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${SSH}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${SSH}/ebin/ssh.app
 lib/erlang${SYSTEM_VSN}/lib/${SSH}/ebin/ssh.appup
@@ -4064,7 +4033,6 @@ lib/erlang${SYSTEM_VSN}/lib/${SSH}/src/ssh_xfer.hrl
 lib/erlang${SYSTEM_VSN}/lib/${SSH}/src/sshc_sup.erl
 lib/erlang${SYSTEM_VSN}/lib/${SSH}/src/sshd_sup.erl
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/
-lib/erlang${SYSTEM_VSN}/lib/${SSL}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/ebin/dtls.beam
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/ebin/dtls_connection.beam
@@ -4072,6 +4040,7 @@ lib/erlang${SYSTEM_VSN}/lib/${SSL}/ebin/dtls_connection_sup.beam
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/ebin/dtls_handshake.beam
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/ebin/dtls_record.beam
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/ebin/dtls_v1.beam
+lib/erlang18/lib/${SSL}/ebin/inet6_tls_dist.beam
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/ebin/inet_tls_dist.beam
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/ebin/ssl.app
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/ebin/ssl.appup
@@ -4136,6 +4105,7 @@ lib/erlang${SYSTEM_VSN}/lib/${SSL}/src/dtls_handshake.hrl
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/src/dtls_record.erl
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/src/dtls_record.hrl
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/src/dtls_v1.erl
+lib/erlang18/lib/${SSL}/src/inet6_tls_dist.erl
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/src/inet_tls_dist.erl
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/src/ssl.erl
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/src/ssl_alert.erl
@@ -4180,7 +4150,6 @@ lib/erlang${SYSTEM_VSN}/lib/${SSL}/src/tls_record.erl
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/src/tls_record.hrl
 lib/erlang${SYSTEM_VSN}/lib/${SSL}/src/tls_v1.erl
 lib/erlang${SYSTEM_VSN}/lib/${STDLIB}/
-lib/erlang${SYSTEM_VSN}/lib/${STDLIB}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${STDLIB}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${STDLIB}/ebin/array.beam
 lib/erlang${SYSTEM_VSN}/lib/${STDLIB}/ebin/base64.beam
@@ -4357,7 +4326,6 @@ lib/erlang${SYSTEM_VSN}/lib/${STDLIB}/src/unicode.erl
 lib/erlang${SYSTEM_VSN}/lib/${STDLIB}/src/win32reg.erl
 lib/erlang${SYSTEM_VSN}/lib/${STDLIB}/src/zip.erl
 lib/erlang${SYSTEM_VSN}/lib/${SYNTAX_TOOLS}/
-lib/erlang${SYSTEM_VSN}/lib/${SYNTAX_TOOLS}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${SYNTAX_TOOLS}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${SYNTAX_TOOLS}/ebin/epp_dodger.beam
 lib/erlang${SYSTEM_VSN}/lib/${SYNTAX_TOOLS}/ebin/erl_comment_scan.beam
@@ -4389,7 +4357,6 @@ lib/erlang${SYSTEM_VSN}/lib/${SYNTAX_TOOLS}/src/merl.erl
 lib/erlang${SYSTEM_VSN}/lib/${SYNTAX_TOOLS}/src/merl_transform.erl
 lib/erlang${SYSTEM_VSN}/lib/${SYNTAX_TOOLS}/src/prettypr.erl
 lib/erlang${SYSTEM_VSN}/lib/${TEST_SERVER}/
-lib/erlang${SYSTEM_VSN}/lib/${TEST_SERVER}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${TEST_SERVER}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${TEST_SERVER}/ebin/erl2html2.beam
 lib/erlang${SYSTEM_VSN}/lib/${TEST_SERVER}/ebin/test_server.app
@@ -4420,7 +4387,6 @@ lib/erlang${SYSTEM_VSN}/lib/${TOOLS}/c_src/
 lib/erlang${SYSTEM_VSN}/lib/${TOOLS}/c_src/erl_memory.c
 lib/erlang${SYSTEM_VSN}/lib/${TOOLS}/c_src/erl_memory_trace_block_table.c
 lib/erlang${SYSTEM_VSN}/lib/${TOOLS}/c_src/erl_memory_trace_block_table.h
-lib/erlang${SYSTEM_VSN}/lib/${TOOLS}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${TOOLS}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${TOOLS}/ebin/cover.beam
 lib/erlang${SYSTEM_VSN}/lib/${TOOLS}/ebin/cover_web.beam
@@ -4476,7 +4442,6 @@ lib/erlang${SYSTEM_VSN}/lib/${TOOLS}/src/xref_reader.erl
 lib/erlang${SYSTEM_VSN}/lib/${TOOLS}/src/xref_scanner.erl
 lib/erlang${SYSTEM_VSN}/lib/${TOOLS}/src/xref_utils.erl
 lib/erlang${SYSTEM_VSN}/lib/${TYPER}/
-lib/erlang${SYSTEM_VSN}/lib/${TYPER}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${TYPER}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${TYPER}/ebin/typer.app
 lib/erlang${SYSTEM_VSN}/lib/${TYPER}/ebin/typer.appup
@@ -4484,7 +4449,6 @@ lib/erlang${SYSTEM_VSN}/lib/${TYPER}/ebin/typer.beam
 lib/erlang${SYSTEM_VSN}/lib/${TYPER}/src/
 lib/erlang${SYSTEM_VSN}/lib/${TYPER}/src/typer.erl
 lib/erlang${SYSTEM_VSN}/lib/${WEBTOOL}/
-lib/erlang${SYSTEM_VSN}/lib/${WEBTOOL}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${WEBTOOL}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${WEBTOOL}/ebin/webtool.app
 lib/erlang${SYSTEM_VSN}/lib/${WEBTOOL}/ebin/webtool.appup
@@ -4504,7 +4468,6 @@ lib/erlang${SYSTEM_VSN}/lib/${WEBTOOL}/src/
 lib/erlang${SYSTEM_VSN}/lib/${WEBTOOL}/src/webtool.erl
 lib/erlang${SYSTEM_VSN}/lib/${WEBTOOL}/src/webtool_sup.erl
 lib/erlang${SYSTEM_VSN}/lib/${XMERL}/
-lib/erlang${SYSTEM_VSN}/lib/${XMERL}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${XMERL}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${XMERL}/ebin/xmerl.app
 lib/erlang${SYSTEM_VSN}/lib/${XMERL}/ebin/xmerl.appup
@@ -4586,7 +4549,7 @@ lib/erlang${SYSTEM_VSN}/lib/${XMERL}/src/xmerl_xpath_scan.erl
 lib/erlang${SYSTEM_VSN}/lib/${XMERL}/src/xmerl_xs.erl
 lib/erlang${SYSTEM_VSN}/lib/${XMERL}/src/xmerl_xsd.erl
 lib/erlang${SYSTEM_VSN}/lib/${XMERL}/src/xmerl_xsd_type.erl
-lib/erlang${SYSTEM_VSN}/man/
+@mandir lib/erlang${SYSTEM_VSN}/man/
 lib/erlang${SYSTEM_VSN}/man/man1/
 @man lib/erlang${SYSTEM_VSN}/man/man1/cdv.1
 @man lib/erlang${SYSTEM_VSN}/man/man1/ct_run.1
diff --git a/lang/erlang/18/pkg/PLIST-wx b/lang/erlang/18/pkg/PLIST-wx
index 61b7f03be81..839e61ce371 100644
--- a/lang/erlang/18/pkg/PLIST-wx
+++ b/lang/erlang/18/pkg/PLIST-wx
@@ -1,7 +1,6 @@
-@comment $OpenBSD: PLIST-wx,v 1.4 2016/06/29 16:14:41 espie Exp $
+@comment $OpenBSD: PLIST-wx,v 1.5 2018/11/17 13:40:05 jasper Exp $
 @option is-branch
 lib/erlang${SYSTEM_VSN}/lib/${OBSERVER}/
-lib/erlang${SYSTEM_VSN}/lib/${OBSERVER}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${OBSERVER}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${OBSERVER}/ebin/cdv_atom_cb.beam
 lib/erlang${SYSTEM_VSN}/lib/${OBSERVER}/ebin/cdv_bin_cb.beam
@@ -106,7 +105,6 @@ lib/erlang${SYSTEM_VSN}/lib/${OBSERVER}/src/observer_wx.erl
 lib/erlang${SYSTEM_VSN}/lib/${OBSERVER}/src/ttb.erl
 lib/erlang${SYSTEM_VSN}/lib/${OBSERVER}/src/ttb_et.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/
-lib/erlang${SYSTEM_VSN}/lib/${WX}/doc/
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/gl.beam
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/glu.beam
@@ -157,6 +155,7 @@ lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxControl.beam
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxControlWithItems.beam
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxCursor.beam
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxDC.beam
+lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxDCOverlay.beam
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxDataObject.beam
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxDateEvent.beam
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxDatePickerCtrl.beam
@@ -254,6 +253,7 @@ lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxNavigationKeyEvent.beam
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxNotebook.beam
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxNotebookEvent.beam
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxNotifyEvent.beam
+lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxOverlay.beam
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxPageSetupDialog.beam
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxPageSetupDialogData.beam
 lib/erlang${SYSTEM_VSN}/lib/${WX}/ebin/wxPaintDC.beam
@@ -510,6 +510,7 @@ lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxControl.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxControlWithItems.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxCursor.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxDC.erl
+lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxDCOverlay.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxDataObject.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxDateEvent.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxDatePickerCtrl.erl
@@ -607,6 +608,7 @@ lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxNavigationKeyEvent.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxNotebook.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxNotebookEvent.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxNotifyEvent.erl
+lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxOverlay.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxPageSetupDialog.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxPageSetupDialogData.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/gen/wxPaintDC.erl
@@ -697,5 +699,6 @@ lib/erlang${SYSTEM_VSN}/lib/${WX}/src/wxe.hrl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/wxe_master.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/wxe_server.erl
 lib/erlang${SYSTEM_VSN}/lib/${WX}/src/wxe_util.erl
+@man lib/erlang${SYSTEM_VSN}/man/man3/wxDCOverlay.3
 @man lib/erlang${SYSTEM_VSN}/man/man3/observer.3
 @man lib/erlang${SYSTEM_VSN}/man/man6/observer.6