Upgrade to version R12B-3.

10 files changed, 54 insertions, 128 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index fe2a96614b73..8df3c28ea4c3 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	r12b2
-PORTREVISION=	1
+PORTVERSION=	r12b3
 PORTEPOCH=	1
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/        \
@@ -15,7 +14,7 @@ MASTER_SITES=	http://www.erlang.org/download/        \
 		http://www.erlang.org/download/        \
 		http://erlang.stacken.kth.se/download/ \
 		http://www.csd.uu.se/ftp/mirror/erlang/download/
-DISTNAME=	otp_src_R12B-2
+DISTNAME=	otp_src_R12B-3
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -55,7 +54,7 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_RC_SUBR=	epmd.sh
 GNU_CONFIGURE=	yes
-ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS=	i386 amd64 sparc64
 REINPLACE_ARGS=	-i
 
 .include <bsd.port.pre.mk>
@@ -77,9 +76,9 @@ LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
 .endif
 .endif
 
-ERLANG_MAN=	otp_doc_man_R12B-2.tar.gz
+ERLANG_MAN=	otp_doc_man_R12B-3.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_doc_html_R12B-2.tar.gz
+ERLANG_DOCS=	otp_doc_html_R12B-3.tar.gz
 .endif
 ERLANG_PLIST=	${WRKDIR}/pkg-plist
 
diff --git a/lang/erlang/Makefile.lib b/lang/erlang/Makefile.lib
index f023f82573d7..f1aacd6ae1bf 100644
--- a/lang/erlang/Makefile.lib
+++ b/lang/erlang/Makefile.lib
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
-ERTS_VSN=	5.6.2
+ERTS_VSN=	5.6.3
 TOOLS_VSN=	2.6.1
 OTP_LIBS=	appmon-2.1.9 \
-		asn1-1.5.1 \
-		common_test-1.3.1 \
-		compiler-4.5.2 \
+		asn1-1.5.2 \
+		common_test-1.3.2 \
+		compiler-4.5.3 \
 		cosEvent-2.1.3 \
 		cosEventDomain-1.1.3 \
 		cosFileTransfer-1.1.5 \
@@ -13,41 +13,41 @@ OTP_LIBS=	appmon-2.1.9 \
 		cosProperty-1.1.6 \
 		cosTime-1.1.3 \
 		cosTransactions-1.2.4 \
-		crypto-1.5.1.1 \
-		debugger-3.1.1.2 \
-		dialyzer-1.8.0 \
+		crypto-1.5.2 \
+		debugger-3.1.1.3 \
+		dialyzer-1.8.1 \
 		docbuilder-0.9.8.4 \
-		edoc-0.7.5 \
-		erl_interface-3.5.6 \
+		edoc-0.7.6 \
+		erl_interface-3.5.7 \
 		et-1.3 \
 		gs-1.5.9 \
-		hipe-3.6.6 \
-		ic-4.2.17 \
-		inets-5.0.5 \
+		hipe-3.6.7 \
+		ic-4.2.18 \
+		inets-5.0.9 \
 		inviso-0.6 \
-		jinterface-1.4 \
-		kernel-2.12.2 \
-		megaco-3.7.4 \
-		mnesia-4.4.2 \
+		jinterface-1.4.1 \
+		kernel-2.12.3 \
+		megaco-3.8 \
+		mnesia-4.4.3 \
 		observer-0.9.7.4 \
-		odbc-2.10 \
+		odbc-2.10.2 \
 		orber-3.6.9 \
-		os_mon-2.1.5 \
+		os_mon-2.1.6 \
 		otp_mibs-1.0.4.1 \
-		parsetools-1.4.4 \
-		percept-0.7.1 \
+		parsetools-1.4.5 \
+		percept-0.7.2 \
 		pman-2.6 \
 		runtime_tools-1.7.2 \
-		sasl-2.1.5.2 \
-		snmp-4.10.3 \
+		sasl-2.1.5.3 \
+		snmp-4.11 \
 		ssh-0.9.9.6 \
 		ssl-3.9 \
-		stdlib-1.15.2 \
-		syntax_tools-1.5.4 \
+		stdlib-1.15.3 \
+		syntax_tools-1.5.5 \
 		test_server-3.2.2 \
 		toolbar-1.3.0.1 \
 		tools-2.6.1 \
 		tv-2.1.4.2 \
-		typer-0.1.2 \
+		typer-0.1.3 \
 		webtool-0.8.3.2 \
-		xmerl-1.1.8
+		xmerl-1.1.9
diff --git a/lang/erlang/Makefile.man b/lang/erlang/Makefile.man
index 9a5624ecbeff..4ebef4509d2e 100644
--- a/lang/erlang/Makefile.man
+++ b/lang/erlang/Makefile.man
@@ -278,6 +278,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	queue.3 \
 	random.3 \
 	rb.3 \
+	re.3 \
 	regexp.3 \
 	registry.3 \
 	release_handler.3 \
@@ -308,6 +309,7 @@ MAN3=	CosEventChannelAdmin.3 \
 	snmpa_mpd.3 \
 	snmpa_network_interface.3 \
 	snmpa_network_interface_filter.3 \
+	snmpa_notification_delivery_info_receiver.3 \
 	snmpa_notification_filter.3 \
 	snmpa_supervisor.3 \
 	snmpc.3 \
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index 157fd1b0bf08..516096668405 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-MD5 (erlang/otp_src_R12B-2.tar.gz) = 05861c7f75d7b2ed5af42c93cebe5801
-SHA256 (erlang/otp_src_R12B-2.tar.gz) = ba84af52b5ff10029a9f68c03d53c350d359ca1ed9247ac609765746692a89c1
-SIZE (erlang/otp_src_R12B-2.tar.gz) = 41190987
-MD5 (erlang/otp_doc_man_R12B-2.tar.gz) = 645a4486f02338a5cf22be7563b862f9
-SHA256 (erlang/otp_doc_man_R12B-2.tar.gz) = 712140af4b49cf696f6968244e13a753cb6f53c09e46fedb8d93407bf21c95c4
-SIZE (erlang/otp_doc_man_R12B-2.tar.gz) = 777982
-MD5 (erlang/otp_doc_html_R12B-2.tar.gz) = 57e4c7afc0e4319250aa3fc7cbd1029d
-SHA256 (erlang/otp_doc_html_R12B-2.tar.gz) = f169acca450eb84d58377b1fabee18268ea9cf1a59393c0b970fefdb894b771e
-SIZE (erlang/otp_doc_html_R12B-2.tar.gz) = 5616891
+MD5 (erlang/otp_src_R12B-3.tar.gz) = c2e7f0ad54b8fadebde2d94106608d97
+SHA256 (erlang/otp_src_R12B-3.tar.gz) = a8ed977d468454ca8d849ee5fa08ac3d521d76f23649bef531b76bdfa73f8eb2
+SIZE (erlang/otp_src_R12B-3.tar.gz) = 42195557
+MD5 (erlang/otp_doc_man_R12B-3.tar.gz) = 13098954c9d5804bb8394fe7badb3d0d
+SHA256 (erlang/otp_doc_man_R12B-3.tar.gz) = 08e3ed5a285eabe94fef6726bd591e02c42a8425ddcdb6a6d3f38f4a2d517e62
+SIZE (erlang/otp_doc_man_R12B-3.tar.gz) = 809746
+MD5 (erlang/otp_doc_html_R12B-3.tar.gz) = 8865d406c256abbff63eaff62d2216aa
+SHA256 (erlang/otp_doc_html_R12B-3.tar.gz) = 4690829f270a40d6c1849a34e9854ba4f55e1ec1a1e91dbc09e6a0a0a7228005
+SIZE (erlang/otp_doc_html_R12B-3.tar.gz) = 5655205
diff --git a/lang/erlang/files/patch-erts-emulator-Makefile.in b/lang/erlang/files/patch-erts-emulator-Makefile.in
index 20d61548c764..9910f98f5f1c 100644
--- a/lang/erlang/files/patch-erts-emulator-Makefile.in
+++ b/lang/erlang/files/patch-erts-emulator-Makefile.in
@@ -3,13 +3,23 @@ $FreeBSD$
 
 --- erts/emulator/Makefile.in.orig
 +++ erts/emulator/Makefile.in
-@@ -265,7 +265,9 @@
+@@ -265,8 +265,10 @@
  endif
  WITH_SCTP=@WITH_SCTP@
  ifdef WITH_SCTP
 +ifneq ($(findstring freebsd,$(TARGET)),freebsd)
  LIBS += -lsctp
-+endif
  endif
++endif
  
  ORG_THR_LIBS=@EMU_THR_LIBS@
+ THR_LIB_NAME=@EMU_THR_LIB_NAME@
+@@ -544,7 +546,7 @@
+ endif
+ 
+ $(OBJDIR)/%.o: beam/%.c
+-	$(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
++	$(CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@
+ 
+ else
+ 
diff --git a/lang/erlang/files/patch-lib_dialyzer_src_Makefile b/lang/erlang/files/patch-lib_dialyzer_src_Makefile
deleted file mode 100644
index 43e0e8ebadce..000000000000
--- a/lang/erlang/files/patch-lib_dialyzer_src_Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-
-$FreeBSD$
-
---- lib/dialyzer/src/Makefile.orig
-+++ lib/dialyzer/src/Makefile
-@@ -68,8 +68,6 @@
- 	dialyzer_typesig \
- 	dialyzer_utils
- 
--EXTRA_FILES=  ../plt/dialyzer_init_plt	## automatically generated
--
- HRL_FILES= dialyzer.hrl dialyzer_callgraph.hrl
- ERL_FILES= $(MODULES:%=%.erl)
- INSTALL_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
-@@ -92,13 +90,12 @@
- # Targets
- # ----------------------------------------------------
- 
--debug opt: $(TARGET_FILES) $(DIALYZER_DIR)/plt/dialyzer_init_plt
-+debug opt: $(TARGET_FILES)
- 
- docs:
- 
- clean:
- 	rm -f $(TARGET_FILES)
--	rm -f $(EXTRA_FILES)
- 	rm -f core
- 
- # ----------------------------------------------------
-@@ -153,11 +150,10 @@
- 
- release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/src
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \
-+	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) \
- 		$(RELSYSDIR)/src
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin
- 	$(INSTALL_DIR) $(RELSYSDIR)/plt
--	$(INSTALL_DATA) ../plt/dialyzer_init_plt $(RELSYSDIR)/plt
- 
- release_docs_spec:
diff --git a/lang/erlang/files/patch-lib_dialyzer_src_dialyzer__cl.erl b/lang/erlang/files/patch-lib_dialyzer_src_dialyzer__cl.erl
deleted file mode 100644
index 4c2e014af58e..000000000000
--- a/lang/erlang/files/patch-lib_dialyzer_src_dialyzer__cl.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib/dialyzer/src/dialyzer_cl.erl.orig
-+++ lib/dialyzer/src/dialyzer_cl.erl
-@@ -93,7 +93,7 @@
- check_if_installed() ->
-   case filename:basename(code:lib_dir(dialyzer)) of
-     "dialyzer" -> false;
--    "dialyzer-" ++ _Version -> true
-+    "dialyzer-" ++ _Version -> false
-   end.  
- 
- create_init_plt(MD5, Libs, InitPlt, IncludeDirs) ->  
diff --git a/lang/erlang/files/patch-lib_dialyzer_src_dialyzer__cl__parse.erl b/lang/erlang/files/patch-lib_dialyzer_src_dialyzer__cl__parse.erl
deleted file mode 100644
index a02691d2d845..000000000000
--- a/lang/erlang/files/patch-lib_dialyzer_src_dialyzer__cl__parse.erl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib/dialyzer/src/dialyzer_cl_parse.erl.orig
-+++ lib/dialyzer/src/dialyzer_cl_parse.erl
-@@ -159,7 +159,7 @@
-   throw({dialyzer_cl_parse_error, Msg}).
- 
- init() ->
--  InitPlt = filename:join([code:lib_dir(dialyzer), "plt","dialyzer_init_plt"]),
-+  InitPlt = filename:join([os:getenv ("HOME"), ".dialyzer_init_plt"]),
-   put(dialyzer_init_plt, InitPlt),
-   put(dialyzer_only_check_init_plt, false),
-   put(dialyzer_options_gui, true),
diff --git a/lang/erlang/files/patch-lib_typer_src_typer__info.erl b/lang/erlang/files/patch-lib_typer_src_typer__info.erl
deleted file mode 100644
index 953e440d5980..000000000000
--- a/lang/erlang/files/patch-lib_typer_src_typer__info.erl
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- lib/typer/src/typer_info.erl.orig
-+++ lib/typer/src/typer_info.erl
-@@ -123,6 +123,5 @@
- 	     dialyzerObj=NewDialyzerObj}.
- 
- get_dialyzer_plt() ->
--  DialyzerDir = code:lib_dir(dialyzer),
--  Dialyzer_Init_Plt = filename:join([DialyzerDir,"plt","dialyzer_init_plt"]),
-+  Dialyzer_Init_Plt = filename:join([os:getenv ("HOME"), ".dialyzer_init_plt"]),
-   dialyzer_plt:from_file(typer_plt, Dialyzer_Init_Plt).
diff --git a/lang/erlang/pkg-plist b/lang/erlang/pkg-plist
index f51b95c32ee0..a0f7e5f47607 100644
--- a/lang/erlang/pkg-plist
+++ b/lang/erlang/pkg-plist
@@ -10,8 +10,6 @@ bin/typer
 @comment Insert PLIST here
 @comment -=[ begin PLIST.lib-erlang ]=-
 @comment -=[ end PLIST.lib-erlang ]=-
-@exec mkdir %D/lib/erlang/erts-%%ERTS_VSN%%/man
-@exec mkdir %D/lib/erlang/usr/lib
 @dirrm lib/erlang/man/man6
 @dirrm lib/erlang/man/man4
 @dirrm lib/erlang/man/man3