Update erlang to 18.0.

- Starting from 18.0 Erlang/OTP is released under the APL 2.0
- erts: The time functionality has been extended. This includes a new API
  for time, as well as "time warp" modes which alters the behavior when
  system time changes. You are strongly encouraged to use the new API
  instead of the old API based on erlang:now/0. erlang:now/0 has been
  deprecated since it is a scalability bottleneck.
- erts: Beside the API changes and time warp modes a lot of scalability
  and performance improvements regarding time management has been made
- erts: The previously introduced "eager check I/O" feature is now enabled
  by default.
- erts/compiler: enhanced support for maps. Big maps new uses a HAMT
  (Hash Array Mapped Trie) representation internally which makes them more
  efficient. There is now also support for variables as map keys.
- dialyzer: The -dialyzer() attribute can be used for suppressing warnings
  in a module by specifying functions or warning options.
- ssl: Remove default support for SSL-3.0 and added padding check
  for TLS-1.0 due to the Poodle vulnerability.
- ssl: Remove default support for RC4 cipher suites, as they are consider
  too weak.
- stdlib: Allow maps for supervisor flags and child specs
- stdlib: New functions in ets:
  - take/2. Works the same as ets:delete/2 but
            also returns the deleted object(s).
  - ets:update_counter/4 with a default object as
            argument

Full changelog:

  http://www.erlang.org/download/otp_src_18.0.readme

10 files changed, 146 insertions, 94 deletions

diff --git a/lang/erlang-doc/PLIST b/lang/erlang-doc/PLIST
index 0cfd4844b18..8d66d5b1ba6 100644
--- a/lang/erlang-doc/PLIST
+++ b/lang/erlang-doc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2015/04/28 14:34:20 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.18 2015/07/18 08:55:16 fhajny Exp $
 lib/erlang/doc/applications.html
 lib/erlang/doc/design_principles/applications.html
 lib/erlang/doc/design_principles/appup_cookbook.html
@@ -168,6 +168,7 @@ lib/erlang/erts-${VERSION.erts}/doc/html/release_notes.html
 lib/erlang/erts-${VERSION.erts}/doc/html/run_erl.html
 lib/erlang/erts-${VERSION.erts}/doc/html/start.html
 lib/erlang/erts-${VERSION.erts}/doc/html/start_erl.html
+lib/erlang/erts-${VERSION.erts}/doc/html/time_compat.erl
 lib/erlang/erts-${VERSION.erts}/doc/html/time_correction.html
 lib/erlang/erts-${VERSION.erts}/doc/html/tty.html
 lib/erlang/erts-${VERSION.erts}/doc/html/users_guide.html
@@ -176,8 +177,10 @@ lib/erlang/erts-${VERSION.erts}/doc/html/zlib.html
 lib/erlang/erts-${VERSION.erts}/doc/pdf/erts-${VERSION.erts}.pdf
 lib/erlang/erts-${VERSION.erts}/info
 lib/erlang/lib/asn1-${VERSION.asn1}/doc/html/asn1.eix
+lib/erlang/lib/asn1-${VERSION.asn1}/doc/html/asn1_getting_started.html
+lib/erlang/lib/asn1-${VERSION.asn1}/doc/html/asn1_introduction.html
+lib/erlang/lib/asn1-${VERSION.asn1}/doc/html/asn1_overview.html
 lib/erlang/lib/asn1-${VERSION.asn1}/doc/html/asn1_spec.html
-lib/erlang/lib/asn1-${VERSION.asn1}/doc/html/asn1_ug.html
 lib/erlang/lib/asn1-${VERSION.asn1}/doc/html/asn1ct.html
 lib/erlang/lib/asn1-${VERSION.asn1}/doc/html/asn1rt.html
 lib/erlang/lib/asn1-${VERSION.asn1}/doc/html/exclusive_Win_But.gif
@@ -690,6 +693,7 @@ lib/erlang/lib/inets-${VERSION.inets}/doc/html/http_uri.html
 lib/erlang/lib/inets-${VERSION.inets}/doc/html/httpc.html
 lib/erlang/lib/inets-${VERSION.inets}/doc/html/httpd.html
 lib/erlang/lib/inets-${VERSION.inets}/doc/html/httpd_conf.html
+lib/erlang/lib/inets-${VERSION.inets}/doc/html/httpd_custom_api.html
 lib/erlang/lib/inets-${VERSION.inets}/doc/html/httpd_socket.html
 lib/erlang/lib/inets-${VERSION.inets}/doc/html/httpd_util.html
 lib/erlang/lib/inets-${VERSION.inets}/doc/html/index.html
@@ -759,6 +763,12 @@ lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/e
 lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpPeer.html
 lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpSelf.html
 lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpServer.html
+lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpServerSocketTransport.html
+lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpServerTransport.html
+lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpSocketTransport.html
+lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpSocketTransportFactory.html
+lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpTransport.html
+lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/OtpTransportFactory.html
 lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/package-frame.html
 lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/package-summary.html
 lib/erlang/lib/jinterface-${VERSION.jinterface}/doc/html/java/com/ericsson/otp/erlang/package-tree.html
@@ -870,7 +880,6 @@ lib/erlang/lib/megaco-${VERSION.megaco}/info
 lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/Mnesia_App_A.html
 lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/Mnesia_App_B.html
 lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/Mnesia_App_C.html
-lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/Mnesia_App_D.html
 lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/Mnesia_chap1.html
 lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/Mnesia_chap2.html
 lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/Mnesia_chap3.html
@@ -878,6 +887,7 @@ lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/Mnesia_chap4.html
 lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/Mnesia_chap5.html
 lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/Mnesia_chap7.html
 lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/Mnesia_chap8.html
+lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/Mnesia_overview.html
 lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/book.gif
 lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/company.gif
 lib/erlang/lib/mnesia-${VERSION.mnesia}/doc/html/index.html
@@ -1062,7 +1072,6 @@ lib/erlang/lib/percept-${VERSION.percept}/doc/html/test4.gif
 lib/erlang/lib/percept-${VERSION.percept}/doc/html/users_guide.html
 lib/erlang/lib/percept-${VERSION.percept}/doc/pdf/percept-${VERSION.percept}.pdf
 lib/erlang/lib/percept-${VERSION.percept}/info
-lib/erlang/lib/public_key-${VERSION.public_key}/doc/html/cert_records.html
 lib/erlang/lib/public_key-${VERSION.public_key}/doc/html/index.html
 lib/erlang/lib/public_key-${VERSION.public_key}/doc/html/introduction.html
 lib/erlang/lib/public_key-${VERSION.public_key}/doc/html/note.gif
@@ -1210,7 +1219,6 @@ lib/erlang/lib/ssh-${VERSION.ssh}/doc/html/ssh.html
 lib/erlang/lib/ssh-${VERSION.ssh}/doc/html/ssh_channel.html
 lib/erlang/lib/ssh-${VERSION.ssh}/doc/html/ssh_client_key_api.html
 lib/erlang/lib/ssh-${VERSION.ssh}/doc/html/ssh_connection.html
-lib/erlang/lib/ssh-${VERSION.ssh}/doc/html/ssh_protocol.html
 lib/erlang/lib/ssh-${VERSION.ssh}/doc/html/ssh_server_key_api.html
 lib/erlang/lib/ssh-${VERSION.ssh}/doc/html/ssh_sftp.html
 lib/erlang/lib/ssh-${VERSION.ssh}/doc/html/ssh_sftpd.html
@@ -1224,7 +1232,10 @@ lib/erlang/lib/ssl-${VERSION.ssl}/doc/html/release_notes.html
 lib/erlang/lib/ssl-${VERSION.ssl}/doc/html/ssl.eix
 lib/erlang/lib/ssl-${VERSION.ssl}/doc/html/ssl.html
 lib/erlang/lib/ssl-${VERSION.ssl}/doc/html/ssl_app.html
+lib/erlang/lib/ssl-${VERSION.ssl}/doc/html/ssl_crl_cache.html
+lib/erlang/lib/ssl-${VERSION.ssl}/doc/html/ssl_crl_cache_api.html
 lib/erlang/lib/ssl-${VERSION.ssl}/doc/html/ssl_distribution.html
+lib/erlang/lib/ssl-${VERSION.ssl}/doc/html/ssl_introduction.html
 lib/erlang/lib/ssl-${VERSION.ssl}/doc/html/ssl_protocol.html
 lib/erlang/lib/ssl-${VERSION.ssl}/doc/html/ssl_session_cache_api.html
 lib/erlang/lib/ssl-${VERSION.ssl}/doc/html/users_guide.html
@@ -1234,6 +1245,7 @@ lib/erlang/lib/ssl-${VERSION.ssl}/doc/pdf/ssl-${VERSION.ssl}.pdf
 lib/erlang/lib/ssl-${VERSION.ssl}/info
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/STDLIB_app.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/array.html
+lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/assert.hrl.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/base64.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/beam_lib.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/binary.html
@@ -1244,6 +1256,7 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/dict.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/digraph.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/digraph_utils.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/epp.html
+lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/erl_anno.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/erl_eval.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/erl_expand_records.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/erl_id_trans.html
@@ -1275,12 +1288,12 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/ms_transform.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/notes.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/orddict.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/ordsets.html
-lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/pg.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/pool.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/proc_lib.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/proplists.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/qlc.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/queue.html
+lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/rand.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/random.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/re.html
 lib/erlang/lib/stdlib-${VERSION.stdlib}/doc/html/release_notes.html
@@ -1312,6 +1325,8 @@ lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/doc/html/erl_syntax_lib.html
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/doc/html/erl_tidy.html
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/doc/html/igor.html
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/doc/html/index.html
+lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/doc/html/merl.html
+lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/doc/html/merl_transform.html
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/doc/html/notes.html
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/doc/html/prettypr.html
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/doc/html/release_notes.html
diff --git a/lang/erlang-doc/distinfo b/lang/erlang-doc/distinfo
index 4a9690f7b18..94679635a9b 100644
--- a/lang/erlang-doc/distinfo
+++ b/lang/erlang-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2015/04/28 14:34:20 fhajny Exp $
+$NetBSD: distinfo,v 1.15 2015/07/18 08:55:16 fhajny Exp $
 
-SHA1 (erlang/otp_doc_html_17.5.tar.gz) = 2bf5c2c7dcc90cc6e54039b62d4611362cdbf249
-RMD160 (erlang/otp_doc_html_17.5.tar.gz) = 6ddf8086cbc36137d2c96453e9dc2370fee10c74
-Size (erlang/otp_doc_html_17.5.tar.gz) = 33510258 bytes
+SHA1 (erlang/otp_doc_html_18.0.tar.gz) = 634f9b88d541f23590efe7fe9c4b3d0090160061
+RMD160 (erlang/otp_doc_html_18.0.tar.gz) = 93a8defd7eb6a514fb0834ea77d4847b4b9a4495
+Size (erlang/otp_doc_html_18.0.tar.gz) = 33857396 bytes
diff --git a/lang/erlang-man/PLIST b/lang/erlang-man/PLIST
index 5677218b4d5..4c68f8edc81 100644
--- a/lang/erlang-man/PLIST
+++ b/lang/erlang-man/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2015/04/28 14:34:20 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.16 2015/07/18 08:55:16 fhajny Exp $
 lib/erlang/man/man1/cdv.1
 lib/erlang/man/man1/ct_run.1
 lib/erlang/man/man1/diameterc.1
@@ -151,6 +151,7 @@ lib/erlang/man/man3/eldap.3
 lib/erlang/man/man3/epp.3
 lib/erlang/man/man3/epp_dodger.3
 lib/erlang/man/man3/eprof.3
+lib/erlang/man/man3/erl_anno.3
 lib/erlang/man/man3/erl_boot_server.3
 lib/erlang/man/man3/erl_comment_scan.3
 lib/erlang/man/man3/erl_connect.3
@@ -219,6 +220,7 @@ lib/erlang/man/man3/http_uri.3
 lib/erlang/man/man3/httpc.3
 lib/erlang/man/man3/httpd.3
 lib/erlang/man/man3/httpd_conf.3
+lib/erlang/man/man3/httpd_custom_api.3
 lib/erlang/man/man3/httpd_socket.3
 lib/erlang/man/man3/httpd_util.3
 lib/erlang/man/man3/i.3
@@ -259,6 +261,8 @@ lib/erlang/man/man3/megaco_transport.3
 lib/erlang/man/man3/megaco_udp.3
 lib/erlang/man/man3/megaco_user.3
 lib/erlang/man/man3/memsup.3
+lib/erlang/man/man3/merl.3
+lib/erlang/man/man3/merl_transform.3
 lib/erlang/man/man3/mnesia.3
 lib/erlang/man/man3/mnesia_frag_hash.3
 lib/erlang/man/man3/mnesia_registry.3
@@ -288,7 +292,6 @@ lib/erlang/man/man3/otp_mib.3
 lib/erlang/man/man3/overload.3
 lib/erlang/man/man3/percept.3
 lib/erlang/man/man3/percept_profile.3
-lib/erlang/man/man3/pg.3
 lib/erlang/man/man3/pg2.3
 lib/erlang/man/man3/pool.3
 lib/erlang/man/man3/prettypr.3
@@ -297,6 +300,7 @@ lib/erlang/man/man3/proplists.3
 lib/erlang/man/man3/public_key.3
 lib/erlang/man/man3/qlc.3
 lib/erlang/man/man3/queue.3
+lib/erlang/man/man3/rand.3
 lib/erlang/man/man3/random.3
 lib/erlang/man/man3/rb.3
 lib/erlang/man/man3/re.3
@@ -352,6 +356,8 @@ lib/erlang/man/man3/ssh_server_key_api.3
 lib/erlang/man/man3/ssh_sftp.3
 lib/erlang/man/man3/ssh_sftpd.3
 lib/erlang/man/man3/ssl.3
+lib/erlang/man/man3/ssl_crl_cache.3
+lib/erlang/man/man3/ssl_crl_cache_api.3
 lib/erlang/man/man3/ssl_session_cache_api.3
 lib/erlang/man/man3/string.3
 lib/erlang/man/man3/supervisor.3
diff --git a/lang/erlang-man/distinfo b/lang/erlang-man/distinfo
index d752e903202..4b95d414bd8 100644
--- a/lang/erlang-man/distinfo
+++ b/lang/erlang-man/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2015/04/28 14:34:20 fhajny Exp $
+$NetBSD: distinfo,v 1.15 2015/07/18 08:55:16 fhajny Exp $
 
-SHA1 (erlang/otp_doc_man_17.5.tar.gz) = 222b2f7b6defe178521620b3a7975f667a549a7f
-RMD160 (erlang/otp_doc_man_17.5.tar.gz) = b3166f1a27622e4c290a0d929b9d935e0947e962
-Size (erlang/otp_doc_man_17.5.tar.gz) = 1363320 bytes
+SHA1 (erlang/otp_doc_man_18.0.tar.gz) = 9a1a32658c7bc45b8af9fca6fa272d147af011d7
+RMD160 (erlang/otp_doc_man_18.0.tar.gz) = c0f660607ead340b69cb782408acdb8a26bc6ead
+Size (erlang/otp_doc_man_18.0.tar.gz) = 1389178 bytes
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index bff25fcbc26..571442724a0 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2015/06/12 10:50:15 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2015/07/18 08:55:16 fhajny Exp $
 
 DISTNAME=		otp_src_${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}
 PKGNAME=		${DISTNAME:S/otp_src_/erlang-/}
-PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		http://www.erlang.org/download/
 
@@ -45,7 +44,7 @@ MAKE_ENV+=		DESTDIR=${DESTDIR}
 
 REPLACE_INTERPRETER+=	escript
 REPLACE.escript.old=	.*escript
-REPLACE.escript.new=	${LOCALBASE}/bin/escript
+REPLACE.escript.new=	${PREFIX}/bin/escript
 REPLACE_FILES.escript=	\
 	lib/diameter/bin/diameterc \
 	lib/erl_docgen/priv/bin/codeline_preprocessing.escript \
diff --git a/lang/erlang/Makefile.versions b/lang/erlang/Makefile.versions
index d21d262784a..9de72e4ccc3 100644
--- a/lang/erlang/Makefile.versions
+++ b/lang/erlang/Makefile.versions
@@ -1,61 +1,61 @@
-# $NetBSD: Makefile.versions,v 1.18 2015/04/28 14:34:20 fhajny Exp $
+# $NetBSD: Makefile.versions,v 1.19 2015/07/18 08:55:16 fhajny Exp $
 
-DIST_VERSION_MAJOR=		17
-DIST_VERSION_MINOR=		5
+DIST_VERSION_MAJOR=		18
+DIST_VERSION_MINOR=		0
 
 _VERSIONS=					\
-	asn1			3.0.4		\
-	common_test		1.10		\
-	compiler		5.0.4		\
-	cosEvent		2.1.15		\
-	cosEventDomain		1.1.14		\
-	cosFileTransfer		1.1.16		\
-	cosNotification		1.1.21		\
-	cosProperty		1.1.17		\
-	cosTime			1.1.14		\
-	cosTransactions		1.2.14		\
-	crypto			3.5		\
-	debugger		4.0.3		\
-	dialyzer		2.7.4		\
-	diameter		1.9		\
-	edoc			0.7.16		\
-	eldap			1.1.1		\
-	erl_docgen		0.3.7		\
-	erl_interface		3.7.20		\
-	erts			6.4		\
-	et			1.5		\
-	eunit			2.2.9		\
-	gs			1.5.16		\
-	hipe			3.11.3		\
-	ic			4.3.6		\
-	inets			5.10.6		\
-	jinterface		1.5.12		\
-	kernel			3.2		\
-	megaco			3.17.3		\
-	mnesia			4.12.5		\
-	observer		2.0.4		\
-	odbc			2.10.22		\
-	orber			3.7.1		\
-	os_mon			2.3.1		\
-	ose			1.0.2		\
-	otp_mibs		1.0.10		\
-	parsetools		2.0.12		\
-	percept			0.8.10		\
-	public_key		0.23		\
-	reltool			0.6.6		\
-	runtime_tools		1.8.16		\
-	sasl			2.4.1		\
-	snmp			5.1.1		\
-	ssh			3.2		\
-	ssl			6.0		\
-	stdlib			2.4		\
-	syntax_tools		1.6.18		\
-	test_server		3.8		\
-	tools			2.7.2		\
-	typer			0.9.8		\
-	webtool			0.8.10		\
-	wx			1.3.3		\
-	xmerl			1.3.7
+	asn1			4.0		\
+	common_test		1.11		\
+	compiler		6.0		\
+	cosEvent		2.2		\
+	cosEventDomain		1.2		\
+	cosFileTransfer		1.2		\
+	cosNotification		1.2		\
+	cosProperty		1.2		\
+	cosTime			1.2		\
+	cosTransactions		1.3		\
+	crypto			3.6		\
+	debugger		4.1		\
+	dialyzer		2.8		\
+	diameter		1.10		\
+	edoc			0.7.17		\
+	eldap			1.2		\
+	erl_docgen		0.4		\
+	erl_interface		3.8		\
+	erts			7.0		\
+	et			1.5.1		\
+	eunit			2.2.10		\
+	gs			1.6		\
+	hipe			3.12		\
+	ic			4.4		\
+	inets			6.0		\
+	jinterface		1.6		\
+	kernel			4.0		\
+	megaco			3.18		\
+	mnesia			4.13		\
+	observer		2.1		\
+	odbc			2.11		\
+	orber			3.8		\
+	os_mon			2.4		\
+	ose			1.1		\
+	otp_mibs		1.1		\
+	parsetools		2.1		\
+	percept			0.8.11		\
+	public_key		1.0		\
+	reltool			0.7		\
+	runtime_tools		1.9		\
+	sasl			2.5		\
+	snmp			5.2		\
+	ssh			4.0		\
+	ssl			7.0		\
+	stdlib			2.5		\
+	syntax_tools		1.7		\
+	test_server		3.9		\
+	tools			2.8		\
+	typer			0.9.9		\
+	webtool			0.9		\
+	wx			1.4		\
+	xmerl			1.3.8
 
 PLIST_SUBST+=	VERSION=${DIST_VERSION_MAJOR}
 
diff --git a/lang/erlang/PLIST b/lang/erlang/PLIST
index ae9ad12f433..7f29759401e 100644
--- a/lang/erlang/PLIST
+++ b/lang/erlang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2015/04/28 14:34:20 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.18 2015/07/18 08:55:16 fhajny Exp $
 bin/ct_run
 bin/dialyzer
 bin/epmd
@@ -183,6 +183,7 @@ lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_master_logs.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_master_status.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_netconfc.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_property_test.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_release_test.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_repeat.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_rpc.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_run.beam
@@ -193,6 +194,8 @@ lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_telnet.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_telnet_client.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_testspec.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_util.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_webtool.beam
+lib/erlang/lib/common_test-${VERSION.common_test}/ebin/ct_webtool_sup.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/cth_conn_log.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/cth_log_redirect.beam
 lib/erlang/lib/common_test-${VERSION.common_test}/ebin/cth_surefire.beam
@@ -227,6 +230,7 @@ lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_master_status.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_netconfc.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_netconfc.hrl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_property_test.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_release_test.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_repeat.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_rpc.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_run.erl
@@ -238,6 +242,8 @@ lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_telnet_client.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_testspec.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_util.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_util.hrl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_webtool.erl
+lib/erlang/lib/common_test-${VERSION.common_test}/src/ct_webtool_sup.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/cth_conn_log.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/cth_log_redirect.erl
 lib/erlang/lib/common_test-${VERSION.common_test}/src/cth_surefire.erl
@@ -268,6 +274,7 @@ lib/erlang/lib/compiler-${VERSION.compiler}/ebin/beam_z.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/cerl.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/cerl_clauses.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/cerl_inline.beam
+lib/erlang/lib/compiler-${VERSION.compiler}/ebin/cerl_sets.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/cerl_trees.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/compile.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/compiler.app
@@ -281,6 +288,7 @@ lib/erlang/lib/compiler-${VERSION.compiler}/ebin/erl_bifs.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/rec_env.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/sys_core_dsetel.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/sys_core_fold.beam
+lib/erlang/lib/compiler-${VERSION.compiler}/ebin/sys_core_fold_lists.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/sys_core_inline.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/sys_pre_attributes.beam
 lib/erlang/lib/compiler-${VERSION.compiler}/ebin/sys_pre_expand.beam
@@ -316,6 +324,7 @@ lib/erlang/lib/compiler-${VERSION.compiler}/src/beam_z.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/cerl.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/cerl_clauses.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/cerl_inline.erl
+lib/erlang/lib/compiler-${VERSION.compiler}/src/cerl_sets.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/cerl_trees.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/compile.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/core_lib.erl
@@ -329,6 +338,7 @@ lib/erlang/lib/compiler-${VERSION.compiler}/src/erl_bifs.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/rec_env.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/sys_core_dsetel.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/sys_core_fold.erl
+lib/erlang/lib/compiler-${VERSION.compiler}/src/sys_core_fold_lists.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/sys_core_inline.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/sys_pre_attributes.erl
 lib/erlang/lib/compiler-${VERSION.compiler}/src/sys_pre_expand.erl
@@ -2102,6 +2112,7 @@ lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_acceptor_sup.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_cgi.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_conf.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_connection_sup.beam
+lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_custom.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_esi.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_example.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/httpd_file.beam
@@ -2120,9 +2131,11 @@ lib/erlang/lib/inets-${VERSION.inets}/ebin/inets.app
 lib/erlang/lib/inets-${VERSION.inets}/ebin/inets.appup
 lib/erlang/lib/inets-${VERSION.inets}/ebin/inets.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/inets_app.beam
+lib/erlang/lib/inets-${VERSION.inets}/ebin/inets_lib.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/inets_regexp.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/inets_service.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/inets_sup.beam
+lib/erlang/lib/inets-${VERSION.inets}/ebin/inets_time_compat.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/inets_trace.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_actions.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_alias.beam
@@ -2139,7 +2152,6 @@ lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_esi.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_get.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_head.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_htaccess.beam
-lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_include.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_log.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_range.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/mod_responsecontrol.beam
@@ -2318,6 +2330,7 @@ lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_acceptor_sup.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_cgi.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_conf.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_connection_sup.erl
+lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_custom.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_esi.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_example.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/httpd_file.erl
@@ -2349,7 +2362,6 @@ lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_esi.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_get.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_head.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_htaccess.erl
-lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_include.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_log.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_range.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_responsecontrol.erl
@@ -2359,9 +2371,11 @@ lib/erlang/lib/inets-${VERSION.inets}/src/http_server/mod_trace.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_app.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_internal.hrl
+lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_lib.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_regexp.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_service.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_sup.erl
+lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_time_compat.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_trace.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/tftp/tftp.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/tftp/tftp.hrl
@@ -2866,6 +2880,7 @@ lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_mod_cb.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_multi_wx.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_port_cb.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_proc_cb.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_sched_cb.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_table_wx.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_term_cb.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/cdv_timer_cb.beam
@@ -2878,6 +2893,7 @@ lib/erlang/lib/observer-${VERSION.observer}/ebin/etop_txt.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/observer.app
 lib/erlang/lib/observer-${VERSION.observer}/ebin/observer.appup
 lib/erlang/lib/observer-${VERSION.observer}/ebin/observer.beam
+lib/erlang/lib/observer-${VERSION.observer}/ebin/observer_alloc_wx.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/observer_app_wx.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/observer_html_lib.beam
 lib/erlang/lib/observer-${VERSION.observer}/ebin/observer_lib.beam
@@ -2915,6 +2931,7 @@ lib/erlang/lib/observer-${VERSION.observer}/src/cdv_mod_cb.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/cdv_multi_wx.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/cdv_port_cb.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/cdv_proc_cb.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/cdv_sched_cb.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/cdv_table_wx.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/cdv_term_cb.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/cdv_timer_cb.erl
@@ -2927,6 +2944,7 @@ lib/erlang/lib/observer-${VERSION.observer}/src/etop_defs.hrl
 lib/erlang/lib/observer-${VERSION.observer}/src/etop_tr.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/etop_txt.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/observer.erl
+lib/erlang/lib/observer-${VERSION.observer}/src/observer_alloc_wx.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/observer_app_wx.erl
 lib/erlang/lib/observer-${VERSION.observer}/src/observer_defs.hrl
 lib/erlang/lib/observer-${VERSION.observer}/src/observer_html_lib.erl
@@ -3732,10 +3750,8 @@ lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_transport.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/ssh_xfer.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/sshc_sup.beam
 lib/erlang/lib/ssh-${VERSION.ssh}/ebin/sshd_sup.beam
-lib/erlang/lib/ssh-${VERSION.ssh}/include/ssh.hrl
-lib/erlang/lib/ssh-${VERSION.ssh}/include/ssh_userauth.hrl
-lib/erlang/lib/ssh-${VERSION.ssh}/include/ssh_xfer.hrl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh.erl
+lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh.hrl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_acceptor.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_acceptor_sup.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_app.erl
@@ -3768,7 +3784,9 @@ lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_sup.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_system_sup.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_transport.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_transport.hrl
+lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_userauth.hrl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_xfer.erl
+lib/erlang/lib/ssh-${VERSION.ssh}/src/ssh_xfer.hrl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/sshc_sup.erl
 lib/erlang/lib/ssh-${VERSION.ssh}/src/sshd_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls.beam
@@ -3787,6 +3805,9 @@ lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_certificate.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_cipher.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_config.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_connection.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_crl.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_crl_cache.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_crl_cache_api.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_dist_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_handshake.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_listen_tracker_sup.beam
@@ -3840,6 +3861,9 @@ lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_cipher.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_config.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_connection.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_connection.hrl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_crl.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_crl_cache.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_crl_cache_api.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_dist_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_handshake.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_handshake.hrl
@@ -3886,6 +3910,7 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/digraph_utils.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/edlin.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/edlin_expand.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/epp.beam
+lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/erl_anno.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/erl_bits.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/erl_compile.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/erl_eval.beam
@@ -3925,13 +3950,13 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/ms_transform.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/orddict.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/ordsets.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/otp_internal.beam
-lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/pg.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/pool.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/proc_lib.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/proplists.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/qlc.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/qlc_pt.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/queue.beam
+lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/rand.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/random.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/re.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/sets.beam
@@ -3950,6 +3975,7 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/unicode.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/win32reg.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/zip.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/examples/erl_id_trans.erl
+lib/erlang/lib/stdlib-${VERSION.stdlib}/include/assert.hrl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/include/erl_bits.hrl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/include/erl_compile.hrl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/include/ms_transform.hrl
@@ -3974,6 +4000,7 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/src/digraph_utils.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/edlin.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/edlin_expand.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/epp.erl
+lib/erlang/lib/stdlib-${VERSION.stdlib}/src/erl_anno.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/erl_bits.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/erl_compile.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/erl_eval.erl
@@ -4014,13 +4041,13 @@ lib/erlang/lib/stdlib-${VERSION.stdlib}/src/ms_transform.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/orddict.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/ordsets.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/otp_internal.erl
-lib/erlang/lib/stdlib-${VERSION.stdlib}/src/pg.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/pool.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/proc_lib.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/proplists.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/qlc.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/qlc_pt.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/queue.erl
+lib/erlang/lib/stdlib-${VERSION.stdlib}/src/rand.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/random.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/re.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/src/sets.erl
@@ -4044,10 +4071,13 @@ lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/ebin/erl_syntax.beam
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/ebin/erl_syntax_lib.beam
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/ebin/erl_tidy.beam
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/ebin/igor.beam
+lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/ebin/merl.beam
+lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/ebin/merl_transform.beam
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/ebin/prettypr.beam
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/ebin/syntax_tools.app
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/ebin/syntax_tools.appup
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/examples/demo.erl
+lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/include/merl.hrl
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/epp_dodger.erl
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/erl_comment_scan.erl
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/erl_prettypr.erl
@@ -4056,6 +4086,8 @@ lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/erl_syntax.erl
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/erl_syntax_lib.erl
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/erl_tidy.erl
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/igor.erl
+lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/merl.erl
+lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/merl_transform.erl
 lib/erlang/lib/syntax_tools-${VERSION.syntax_tools}/src/prettypr.erl
 lib/erlang/lib/test_server-${VERSION.test_server}/ebin/erl2html2.beam
 lib/erlang/lib/test_server-${VERSION.test_server}/ebin/test_server.app
diff --git a/lang/erlang/buildlink3.mk b/lang/erlang/buildlink3.mk
index d2a9d667670..1a0873779a5 100644
--- a/lang/erlang/buildlink3.mk
+++ b/lang/erlang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2015/04/28 14:34:20 fhajny Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2015/07/18 08:55:16 fhajny Exp $
 
 BUILDLINK_TREE+=	erlang
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	erlang
 ERLANG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.erlang+=	erlang>=10.1
-BUILDLINK_ABI_DEPENDS.erlang+=	erlang>=17.5
+BUILDLINK_ABI_DEPENDS.erlang+=	erlang>=18.0
 BUILDLINK_PKGSRCDIR.erlang?=	../../lang/erlang
 
 pkgbase := erlang
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index 6b7c880b8d8..fbc33d5b7c0 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.35 2015/04/28 14:34:20 fhajny Exp $
+$NetBSD: distinfo,v 1.36 2015/07/18 08:55:16 fhajny Exp $
 
-SHA1 (erlang/otp_src_17.5.tar.gz) = 433bafe9bb16a2230830de93985c1d6e02ec1c4e
-RMD160 (erlang/otp_src_17.5.tar.gz) = 609406d4e710c1c435dbd0090a0503e1fcb68d08
-Size (erlang/otp_src_17.5.tar.gz) = 67242289 bytes
+SHA1 (erlang/otp_src_18.0.tar.gz) = fb437bddf8df8c6db934f4ac43455dbd007c05e0
+RMD160 (erlang/otp_src_18.0.tar.gz) = b3c84eb9c132ea7a29ca7f37823ff515acfc8e1a
+Size (erlang/otp_src_18.0.tar.gz) = 68124710 bytes
 SHA1 (patch-ab) = 5f1602f3a49c05fd4c45884a7cd6be8d3f287ac3
 SHA1 (patch-am) = 11ff769b6954f950d6447e69b033cdc0bfa767e9
-SHA1 (patch-ao) = a4ee17b0a81415d541cb55d76b3c1ecc3148c2c2
+SHA1 (patch-ao) = 77f64f1e000357c0b7c28d14c9b42107d6cd1021
 SHA1 (patch-ay) = f5f1accdb11e404ba4779b056228431e3080e4cd
diff --git a/lang/erlang/patches/patch-ao b/lang/erlang/patches/patch-ao
index 2ce60ba3064..0dec9f42cd3 100644
--- a/lang/erlang/patches/patch-ao
+++ b/lang/erlang/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.2 2011/04/14 19:34:09 asau Exp $
+$NetBSD: patch-ao,v 1.3 2015/07/18 08:55:16 fhajny Exp $
 
---- erts/emulator/hipe/hipe_sparc.c.orig	2010-06-24 07:26:50.000000000 +0300
-+++ erts/emulator/hipe/hipe_sparc.c	2010-06-24 07:27:25.000000000 +0300
-@@ -130,6 +130,10 @@
+--- erts/emulator/hipe/hipe_sparc.c.orig	2015-06-23 18:56:21.000000000 +0000
++++ erts/emulator/hipe/hipe_sparc.c
+@@ -131,6 +131,10 @@ static void atexit_alloc_code_stats(void
  #define ALLOC_CODE_STATS(X)	do{}while(0)
  #endif
  
@@ -10,6 +10,6 @@ $NetBSD: patch-ao,v 1.2 2011/04/14 19:34:09 asau Exp $
 +#define MAP_ANONYMOUS MAP_ANON
 +#endif
 +
- static void morecore(unsigned int alloc_bytes)
+ static int morecore(unsigned int alloc_bytes)
  {
      unsigned int map_bytes;