Update erlang to R14B04

This release is mainly a stabilization of the R14B03 release (but as
usual there are some new functionality as well).

One pkgsrc change: add flex to USE_TOOLS, so that megaco_flex_scanner_drv
gets built on all SunOS flavors.

Read full announcement at
http://www.erlang.org/download/otp_src_R14B04.readme

4 files changed, 54 insertions, 57 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index aa830c21ad4..9c00b99f05c 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2011/05/26 20:19:43 asau Exp $
+# $NetBSD: Makefile,v 1.49 2012/01/19 10:17:56 fhajny Exp $
 
 DISTNAME=		otp_src_${DIST_VERSION_MAJOR}${DIST_VERSION_MINOR:D-${DIST_VERSION_MINOR}}
 PKGNAME=		erlang-${ERLANG_VERSION}
@@ -18,7 +18,7 @@ MAKE_JOBS_SAFE=		no
 GNU_CONFIGURE=		yes
 USE_GNU_CONFIGURE_HOST=	${USE_CROSS_COMPILE}
 OVERRIDE_DIRDEPTH=	4
-USE_TOOLS+=		gmake perl:run
+USE_TOOLS+=		gmake perl:run flex
 
 CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
 
diff --git a/lang/erlang/Makefile.versions b/lang/erlang/Makefile.versions
index 92dd60ef228..8ca9c1152b5 100644
--- a/lang/erlang/Makefile.versions
+++ b/lang/erlang/Makefile.versions
@@ -1,66 +1,66 @@
-# $NetBSD: Makefile.versions,v 1.11 2011/05/26 20:19:43 asau Exp $
+# $NetBSD: Makefile.versions,v 1.12 2012/01/19 10:17:56 fhajny Exp $
 
-ERLANG_VERSION=			14.1.3
-DIST_VERSION_MAJOR=		R14B03
+ERLANG_VERSION=			14.1.4
+DIST_VERSION_MAJOR=		R14B04
 #DIST_VERSION_MINOR=		1
 
 _VERSIONS=					\
 	appmon			2.1.13		\
-	asn1			1.6.17		\
-	common_test		1.5.4		\
-	compiler		4.7.4		\
+	asn1			1.6.18		\
+	common_test		1.5.5		\
+	compiler		4.7.5		\
 	cosEvent		2.1.11		\
 	cosEventDomain		1.1.11		\
-	cosFileTransfer		1.1.11		\
+	cosFileTransfer		1.1.12		\
 	cosNotification		1.1.17		\
 	cosProperty		1.1.14		\
 	cosTime			1.1.11		\
 	cosTransactions		1.2.11		\
-	crypto			2.0.3		\
+	crypto			2.0.4		\
 	debugger		3.2.6		\
-	dialyzer		2.4.3		\
-	diameter		0.9		\
-	docbuilder		0.9.8.10	\
-	edoc			0.7.8		\
-	erl_docgen		0.2.5		\
-	erl_interface		3.7.4		\
-	erts			5.8.4		\
-	et			1.4.3		\
-	eunit			2.1.7		\
-	gs			1.5.13		\
-	hipe			3.8		\
-	ic			4.2.26		\
-	inets			5.6		\
+	dialyzer		2.4.4		\
+	diameter		0.10		\
+	docbuilder		0.9.8.11	\
+	edoc			0.7.9		\
+	erl_docgen		0.2.6		\
+	erl_interface		3.7.5		\
+	erts			5.8.5		\
+	et			1.4.4		\
+	eunit			2.2.1		\
+	gs			1.5.14		\
+	hipe			3.8.1		\
+	ic			4.2.27		\
+	inets			5.7.1		\
 	inviso			0.6.2		\
 	jinterface		1.5.4		\
-	kernel			2.14.4		\
-	megaco			3.15.1		\
-	mnesia			4.4.19		\
-	observer		0.9.9		\
-	odbc			2.10.10		\
-	orber			3.6.21		\
-	os_mon			2.2.6		\
+	kernel			2.14.5		\
+	megaco			3.15.1.1	\
+	mnesia			4.5		\
+	observer		0.9.10		\
+	odbc			2.10.11		\
+	orber			3.6.22		\
+	os_mon			2.2.7		\
 	otp_mibs		1.0.6		\
-	parsetools		2.0.5		\
-	percept			0.8.5		\
+	parsetools		2.0.6		\
+	percept			0.8.6		\
 	pman			2.7.1		\
-	public_key		0.12		\
-	reltool			0.5.6		\
-	runtime_tools		1.8.5		\
-	sasl			2.1.9.4		\
-	snmp			4.20		\
-	ssh			2.0.7		\
-	ssl			4.1.5		\
-	stdlib			1.17.4		\
+	public_key		0.13		\
+	reltool			0.5.7		\
+	runtime_tools		1.8.6		\
+	sasl			2.1.10		\
+	snmp			4.21.1		\
+	ssh			2.0.8		\
+	ssl			4.1.6		\
+	stdlib			1.17.5		\
 	syntax_tools		1.6.7.1		\
-	test_server		3.4.4		\
-	toolbar			1.4.1		\
-	tools			2.6.6.4		\
+	test_server		3.4.5		\
+	toolbar			1.4.2		\
+	tools			2.6.6.5		\
 	tv			2.1.4.7		\
-	typer			0.9.1		\
-	webtool			0.8.8		\
-	wx			0.98.10		\
-	xmerl			1.2.9
+	typer			0.9.2		\
+	webtool			0.8.9		\
+	wx			0.99		\
+	xmerl			1.2.10
 
 PLIST_SUBST+=	VERSION=${DIST_VERSION_MAJOR}
 
diff --git a/lang/erlang/PLIST b/lang/erlang/PLIST
index ef46ce03005..f457746a1a7 100644
--- a/lang/erlang/PLIST
+++ b/lang/erlang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2011/05/26 20:19:43 asau Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/01/19 10:17:56 fhajny Exp $
 bin/dialyzer
 bin/epmd
 bin/erl
@@ -3022,11 +3022,8 @@ lib/erlang/lib/observer-${VERSION.observer}/ebin/ttb_et.beam
 lib/erlang/lib/observer-${VERSION.observer}/examples/multitrace.erl
 lib/erlang/lib/observer-${VERSION.observer}/include/etop.hrl
 lib/erlang/lib/observer-${VERSION.observer}/priv/bin/cdv
-lib/erlang/lib/observer-${VERSION.observer}/priv/bin/cdv.bat
 lib/erlang/lib/observer-${VERSION.observer}/priv/bin/etop
-lib/erlang/lib/observer-${VERSION.observer}/priv/bin/etop.bat
 lib/erlang/lib/observer-${VERSION.observer}/priv/bin/getop
-lib/erlang/lib/observer-${VERSION.observer}/priv/bin/getop.bat
 lib/erlang/lib/observer-${VERSION.observer}/priv/crashdump_viewer.tool
 lib/erlang/lib/observer-${VERSION.observer}/priv/crashdump_viewer/collapsd.gif
 lib/erlang/lib/observer-${VERSION.observer}/priv/crashdump_viewer/exploded.gif
@@ -3583,7 +3580,6 @@ lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_target_cache.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_trap.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_usm.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpa_vacm.beam
-lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpc
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpc.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpc_lib.beam
 lib/erlang/lib/snmp-${VERSION.snmp}/ebin/snmpc_mib_gram.beam
@@ -4316,7 +4312,6 @@ lib/erlang/lib/webtool-${VERSION.webtool}/ebin/webtool.appup
 lib/erlang/lib/webtool-${VERSION.webtool}/ebin/webtool.beam
 lib/erlang/lib/webtool-${VERSION.webtool}/ebin/webtool_sup.beam
 lib/erlang/lib/webtool-${VERSION.webtool}/priv/bin/start_webtool
-lib/erlang/lib/webtool-${VERSION.webtool}/priv/bin/start_webtool.bat
 lib/erlang/lib/webtool-${VERSION.webtool}/priv/root/conf/mime.types
 lib/erlang/lib/webtool-${VERSION.webtool}/priv/root/doc/index.html
 lib/erlang/lib/webtool-${VERSION.webtool}/priv/root/doc/start_info.html
@@ -4438,6 +4433,7 @@ lib/erlang/lib/wx-${VERSION.wx}/ebin/wxListBox.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxListCtrl.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxListEvent.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxListItem.beam
+lib/erlang/lib/wx-${VERSION.wx}/ebin/wxListItemAttr.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxListView.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxListbook.beam
 lib/erlang/lib/wx-${VERSION.wx}/ebin/wxLogNull.beam
@@ -4766,6 +4762,7 @@ lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxListBox.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxListCtrl.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxListEvent.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxListItem.erl
+lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxListItemAttr.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxListView.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxListbook.erl
 lib/erlang/lib/wx-${VERSION.wx}/src/gen/wxLogNull.erl
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index 88ec097d312..60cde9d1d40 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2011/12/14 11:08:50 hans Exp $
+$NetBSD: distinfo,v 1.26 2012/01/19 10:17:56 fhajny Exp $
 
-SHA1 (erlang/otp_src_R14B03.tar.gz) = 109812114ef7c2855ade14b90813a870c89f6d43
-RMD160 (erlang/otp_src_R14B03.tar.gz) = 468736a53b2e74ab0cd0f706751b5b03cbfa87cd
-Size (erlang/otp_src_R14B03.tar.gz) = 70620709 bytes
+SHA1 (erlang/otp_src_R14B04.tar.gz) = e469c20c8be6c51bb584a2dec235c4714a60b4db
+RMD160 (erlang/otp_src_R14B04.tar.gz) = 1619a05e7d3df9cb5f9c41e32d9cfb0d8b4edd56
+Size (erlang/otp_src_R14B04.tar.gz) = 70773703 bytes
 SHA1 (patch-ab) = 26592a499a404de3a4d5846f07c2b5bce2ea7aca
 SHA1 (patch-ai) = e0b05313bb5198b339ff0c8d277cbe62a13d0c94
 SHA1 (patch-am) = 273390e10f5bb3a8e858f5f831c7f5afded068bf