7 files changed, 78 insertions, 129 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 49a10f4b4277..ad9f8877fbb4 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	8.0
+PORTVERSION=	8.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.erlang.org/pub/download/     \
 		http://www.erlang.org/download/        \
 		http://erlang.stacken.kth.se/download/ \
 		http://www.csd.uu.se/ftp/mirror/erlang/download/
-DISTNAME=	otp_src_R8B-0
+DISTNAME=	otp_src_R8B-1
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -37,9 +37,9 @@ CONFIGURE_TARGET=	# Empty
 # Don't clutter up /usr/ports/distfiles with all distfiles (including patches)
 DIST_SUBDIR=	erlang
 
-ERLANG_MAN=     otp_man_R8B-0.tar.gz
+ERLANG_MAN=     otp_man_R8B-1.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_html_R8B-0.tar.gz
+ERLANG_DOCS=	otp_html_R8B-1.tar.gz
 .endif
 
 .if !defined(WITHOUT_X11)
@@ -141,36 +141,24 @@ MAN3=		CORBA_Environment_alloc.3 CosEventChannelAdmin.3 \
 		CosEventChannelAdmin_ProxyPullSupplier.3 \
 		CosEventChannelAdmin_ProxyPushConsumer.3 \
 		CosEventChannelAdmin_ProxyPushSupplier.3 \
-		CosEventChannelAdmin_SupplierAdmin.3 CosNaming.3 \
+		CosEventChannelAdmin_SupplierAdmin.3 \
+		CosFileTransfer_Directory.3 CosFileTransfer_File.3 \
+		CosFileTransfer_FileIterator.3 \
+		CosFileTransfer_FileTransferSession.3 \
+		CosFileTransfer_VirtualFileSystem.3 CosNaming.3 \
 		CosNaming_BindingIterator.3 CosNaming_NamingContext.3 \
-		CosTransactions_Control.3 CosTransactions_Coordinator.3 \
-		CosTransactions_RecoveryCoordinator.3 \
-		CosTransactions_Resource.3 \
-		CosTransactions_SubtransactionAwareResource.3 \
-		CosTransactions_Terminator.3 \
-		CosNaming_NamingContextExt.3 \
-		cosTime.3 CosTime_TIO.3 CosTime_TimeService.3 CosTime_UTO.3 \
-		CosTimerEvent_TimerEventHandler.3 \
-		CosTimerEvent_TimerEventService.3 \
-		cosNotificationApp.3 \
-		CosNotifyChannelAdmin_EventChannelFactory.3 \
-		CosNotifyChannelAdmin_EventChannel.3 \
-		CosNotification_QoSAdmin.3 \
+		CosNaming_NamingContextExt.3 CosNotification.3 \
 		CosNotification_AdminPropertiesAdmin.3 \
+		CosNotification_QoSAdmin.3 \
 		CosNotifyChannelAdmin_ConsumerAdmin.3 \
-		CosNotifyChannelAdmin_SupplierAdmin.3 \
-		CosNotifyComm_NotifyPublish.3 \
-		CosNotifyComm_NotifySubscribe.3 \
-		CosNotifyFilter_FilterAdmin.3 \
-		CosNotifyFilter_FilterFactory.3 \
-		CosNotifyFilter_Filter.3 \
-		CosNotifyFilter_MappingFilter.3 \
+		CosNotifyChannelAdmin_EventChannel.3 \
+		CosNotifyChannelAdmin_EventChannelFactory.3 \
 		CosNotifyChannelAdmin_ProxyConsumer.3 \
-		CosNotifyChannelAdmin_ProxySupplier.3 \
 		CosNotifyChannelAdmin_ProxyPullConsumer.3 \
 		CosNotifyChannelAdmin_ProxyPullSupplier.3 \
 		CosNotifyChannelAdmin_ProxyPushConsumer.3 \
 		CosNotifyChannelAdmin_ProxyPushSupplier.3 \
+		CosNotifyChannelAdmin_ProxySupplier.3 \
 		CosNotifyChannelAdmin_SequenceProxyPullConsumer.3 \
 		CosNotifyChannelAdmin_SequenceProxyPullSupplier.3 \
 		CosNotifyChannelAdmin_SequenceProxyPushConsumer.3 \
@@ -179,57 +167,73 @@ MAN3=		CORBA_Environment_alloc.3 CosEventChannelAdmin.3 \
 		CosNotifyChannelAdmin_StructuredProxyPullSupplier.3 \
 		CosNotifyChannelAdmin_StructuredProxyPushConsumer.3 \
 		CosNotifyChannelAdmin_StructuredProxyPushSupplier.3 \
-		CosTransactions_TransactionFactory.3 Module_Interface.3 \
-		beam_lib.3 digraph_utils.3 orddict.3 sets.3 win32reg.3 \
-		comet.3 erl_com.3 \
-		alarm_handler.3 any.3 application.3 appmon.3 asn1ct.3 \
-		asn1rt.3 auth.3 c.3 calendar.3 code.3 compile.3 \
-		corba.3 corba_object.3 cosTransactions.3 cpu_sup.3 crypto.3 \
-		dbg.3 dets.3 dict.3 digraph.3 disk_log.3 disksup.3 epp.3 \
-		eprof.3 erl_boot_server.3 erl_connect.3 erl_ddll.3 \
-		erl_error.3 erl_eterm.3 erl_eval.3 erl_format.3 erl_global.3 \
-		erl_id_trans.3 erl_internal.3 erl_lint.3 erl_malloc.3 \
-		erl_marshal.3 erl_parse.3 erl_pp.3 erl_prim_loader.3 \
-		erl_scan.3 erl_set_memory_block.3 erlang.3 error_handler.3 \
-		error_logger.3 ets.3 eva.3 eva_log.3 eva_log_snmp.3 \
-		eva_server.3 eva_snmp_adaptation.3 eva_sup.3 \
-		file.3 filename.3 ftp.3 gen_event.3 gen_fsm.3 gen_server.3 \
-		gen_tcp.3 gen_udp.3 global.3 global_group.3 gs.3 heart.3 \
-		httpd.3 httpd_conf.3 httpd_core.3 httpd_socket.3 httpd_util.3 \
-		i.3 ic.3 inet.3 init.3 instrument.3 int.3 io.3 io_lib.3 lib.3 \
-		lists.3 lname.3 lname_component.3 log.3 log_mf_h.3 \
-		log_server.3 log_snmp.3 log_snmpea.3 make.3 math.3 memsup.3 \
-		mnemosyne.3 mnesia.3 \
-		mnesia_registry.3 mnesia_session.3 mod_actions.3 mod_alias.3 \
-		mod_auth.3 mod_cgi.3 mod_dir.3 mod_disk_log.3 mod_esi.3 \
-		mod_include.3 mod_log.3 mod_security.3 net_adm.3 net_kernel.3 \
-		nteventlog.3 odbc.3 orber.3 orber_ifr.3 orber_tc.3 ordsets.3 \
-		os.3 os_mon.3 os_sup.3 overload.3 pg.3 pg2.3 pman.3 pool.3 \
-		proc_lib.3 queue.3 random.3 rb.3 regexp.3 registry.3 \
-		release_handler.3 rpc.3 seq_trace.3 shell.3 shell_default.3 \
-		slave.3 snmp.3 snmp_community_mib.3 snmp_error.3 \
-		snmp_framework_mib.3 snmp_generic.3 snmp_index.3 \
-		snmp_local_db.3 snmp_mgr.3 snmp_mpd.3 snmp_notification_mib.3 \
-		snmp_pdus.3 snmp_standard_mib.3 snmp_supervisor.3 \
-		snmp_target_mib.3 snmp_user_based_sm_mib.3 \
-		snmp_view_based_acm_mib.3 ssl.3 ssl_socket.3 string.3 \
-		supervisor.3 supervisor_bridge.3 sys.3 systools.3 tags.3 \
-		timer.3 toolbar.3 tv.3 unix.3 user.3 wrap_log_reader.3 \
-		xref.3 yecc.3 CosFileTransfer_Directory.3 \
-		CosFileTransfer_File.3 CosFileTransfer_FileIterator.3 \
-		CosFileTransfer_FileTransferSession.3 \
-		CosFileTransfer_VirtualFileSystem.3 \
+		CosNotifyChannelAdmin_SupplierAdmin.3 \
+		CosNotifyComm_NotifyPublish.3 \
+		CosNotifyComm_NotifySubscribe.3 CosNotifyFilter_Filter.3 \
+		CosNotifyFilter_FilterAdmin.3 \
+		CosNotifyFilter_FilterFactory.3 \
+		CosNotifyFilter_MappingFilter.3 \
 		CosPropertyService_PropertiesIterator.3 \
 		CosPropertyService_PropertyNamesIterator.3 \
 		CosPropertyService_PropertySet.3 \
 		CosPropertyService_PropertySetDef.3 \
 		CosPropertyService_PropertySetDefFactory.3 \
-		CosPropertyService_PropertySetFactory.3 \
-		com_gen.3 cosEventApp.3 cosFileTransferApp.3 \
-		cosProperty.3 cover.3 ei.3 ei_connect.3 file_sorter.3 \
-		fprof.3 gb_sets.3 gb_trees.3 interceptors.3 megaco.3 \
+		CosPropertyService_PropertySetFactory.3 CosTime_TIO.3 \
+		CosTime_TimeService.3 CosTime_UTO.3 \
+		CosTimerEvent_TimerEventHandler.3 \
+		CosTimerEvent_TimerEventService.3 CosTransactions_Control.3 \
+		CosTransactions_Coordinator.3 \
+		CosTransactions_RecoveryCoordinator.3 \
+		CosTransactions_Resource.3 \
+		CosTransactions_SubtransactionAwareResource.3 \
+		CosTransactions_Terminator.3 \
+		CosTransactions_TransactionFactory.3 Module_Interface.3 \
+		alarm_handler.3 any.3 application.3 appmon.3 asn1ct.3 \
+		asn1rt.3 auth.3 beam_lib.3 c.3 calendar.3 code.3 \
+		com_gen.3 comet.3 compile.3 corba.3 corba_object.3 \
+		cosEventApp.3 cosFileTransferApp.3 cosNotificationApp.3 \
+		cosProperty.3 cosTime.3 cosTransactions.3 cover.3 \
+		cpu_sup.3 crypto.3 dbg.3 debugger.3 dets.3 dict.3 \
+		digraph.3 digraph_utils.3 disk_log.3 disksup.3 ei.3 \
+		ei_connect.3 epp.3 eprof.3 erl_boot_server.3 erl_com.3 \
+		erl_connect.3 erl_ddll.3 erl_error.3 erl_eterm.3 \
+		erl_eval.3 erl_format.3 erl_global.3 erl_id_trans.3 \
+		erl_internal.3 erl_lint.3 erl_malloc.3 erl_marshal.3 \
+		erl_parse.3 erl_pp.3 erl_prim_loader.3 erl_scan.3 \
+		erl_set_memory_block.3 erlang.3 error_handler.3 \
+		error_logger.3 ets.3 eva.3 eva_log.3 eva_log_snmp.3 \
+		eva_server.3 eva_snmp_adaptation.3 eva_sup.3 file.3 \
+		file_sorter.3 filename.3 fprof.3 ftp.3 gb_sets.3 \
+		gb_trees.3 gen_event.3 gen_fsm.3 gen_server.3 \
+		gen_tcp.3 gen_udp.3 global.3 global_group.3 gs.3 \
+		heart.3 httpd.3 httpd_conf.3 httpd_core.3 httpd_socket.3 \
+		httpd_util.3 i.3 ic.3 inet.3 init.3 instrument.3 \
+		int.3 interceptors.3 io.3 io_lib.3 lib.3 lists.3 \
+		lname.3 lname_component.3 log.3 log_mf_h.3 log_server.3 \
+		log_snmp.3 log_snmpea.3 make.3 math.3 megaco.3 \
+		megaco_codec_meas.3 megaco_codec_transform.3 \
 		megaco_flex_scanner.3 megaco_tcp.3 megaco_udp.3 \
-		megaco_user.3 mod_browser.3 mod_htaccess.3 sofs.3 webtool.3
+		megaco_user.3 memsup.3 mnemosyne.3 mnesia.3 \
+		mnesia_registry.3 mnesia_session.3 mod_actions.3 \
+		mod_alias.3 mod_auth.3 mod_browser.3 mod_cgi.3 \
+		mod_dir.3 mod_disk_log.3 mod_esi.3 mod_htaccess.3 \
+		mod_include.3 mod_log.3 mod_security.3 net_adm.3 \
+		net_kernel.3 nteventlog.3 odbc.3 orber.3 orber_ifr.3 \
+		orber_tc.3 orddict.3 ordsets.3 os.3 os_mon.3 os_sup.3 \
+		overload.3 pg.3 pg2.3 pman.3 pool.3 proc_lib.3 \
+		queue.3 random.3 rb.3 regexp.3 registry.3 \
+		release_handler.3 rpc.3 seq_trace.3 sets.3 shell.3 \
+		shell_default.3 sl_alloc.3 slave.3 snmp.3 \
+		snmp_community_mib.3 snmp_error.3 snmp_error_io.3 \
+		snmp_error_report.3 snmp_framework_mib.3 snmp_generic.3 \
+		snmp_index.3 snmp_local_db.3 snmp_mgr.3 snmp_mpd.3 \
+		snmp_notification_mib.3 snmp_pdus.3 snmp_standard_mib.3 \
+		snmp_supervisor.3 snmp_target_mib.3 \
+		snmp_user_based_sm_mib.3 snmp_view_based_acm_mib.3 \
+		sofs.3 ssl.3 ssl_socket.3 string.3 supervisor.3 \
+		supervisor_bridge.3 sys.3 systools.3 tags.3 timer.3 \
+		toolbar.3 tv.3 unix.3 user.3 webtool.3 win32reg.3 \
+		wrap_log_reader.3 xref.3 yecc.3
 
 MAN4PREFIX=	${PREFIX}/lib/erlang
 MAN4=		app.4 appup.4 config.4 rel.4 relup.4 script.4
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index c2ce573dcd63..f04e94cd3dec 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,3 +1,3 @@
-MD5 (erlang/otp_src_R8B-0.tar.gz) = 93c2696f543b5ed601f8bad91f0d4a84
-MD5 (erlang/otp_man_R8B-0.tar.gz) = e01c6b99fb9ef19cfeb8d37c6254a810
-MD5 (erlang/otp_html_R8B-0.tar.gz) = c25bc3981d7c3b2b20a30fd152a19e01
+MD5 (erlang/otp_src_R8B-1.tar.gz) = cdf31c6d6b9442d1f5b6781fdfac0fc5
+MD5 (erlang/otp_man_R8B-1.tar.gz) = 01abea9881bff0d4e437a8c6a6c72370
+MD5 (erlang/otp_html_R8B-1.tar.gz) = e1effcda29f7ea1d85a5ca236c865bca
diff --git a/lang/erlang/files/patch-ab b/lang/erlang/files/patch-ab
deleted file mode 100644
index 69155f380ed1..000000000000
--- a/lang/erlang/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/inets/priv/Makefile.orig	Tue Nov 28 20:38:31 2000
-+++ lib/inets/priv/Makefile	Tue Nov 28 20:38:38 2000
-@@ -57,7 +57,7 @@
- 
- release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
--	$(INSTALL_PROGRAM) $(EXECUTABLES) $(RELSYSDIR)/priv/bin
-+	$(INSTALL_SCRIPT) $(EXECUTABLES) $(RELSYSDIR)/priv/bin
- 
- release_docs_spec:
-
-# End
diff --git a/lang/erlang/files/patch-ak b/lang/erlang/files/patch-ak
deleted file mode 100644
index 446cd1c7323a..000000000000
--- a/lang/erlang/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/inets/examples/Makefile.orig	Tue Nov 28 20:35:48 2000
-+++ lib/inets/examples/Makefile	Tue Nov 28 20:36:24 2000
-@@ -176,7 +176,7 @@
- 	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/auth
- 	$(INSTALL_DATA) $(AUTH_FILES) $(RELSYSDIR)/examples/server_root/auth
- 	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/cgi-bin
--	$(INSTALL_PROGRAM) $(CGI_FILES) $(RELSYSDIR)/examples/server_root/cgi-bin
-+	$(INSTALL_SCRIPT) $(CGI_FILES) $(RELSYSDIR)/examples/server_root/cgi-bin
- 	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/conf
- 	$(INSTALL_DATA) $(CONF_FILES) $(RELSYSDIR)/examples/server_root/conf
- 	$(INSTALL_DIR) $(RELSYSDIR)/examples/server_root/htdocs/open
diff --git a/lang/erlang/files/patch-am b/lang/erlang/files/patch-am
deleted file mode 100644
index 268f1f53eeec..000000000000
--- a/lang/erlang/files/patch-am
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/mnesia/examples/Makefile.orig	Sun Dec  2 19:00:59 2001
-+++ lib/mnesia/examples/Makefile	Sun Dec  2 19:01:32 2001
-@@ -95,7 +95,7 @@
-           bench.config6 \
-           bench.config7 \
-           $(RELSYSDIR)/examples/bench)
--	(cd bench; $(INSTALL_PROGRAM) bench.sh $(RELSYSDIR)/examples/bench)
-+	(cd bench; $(INSTALL_SCRIPT) bench.sh $(RELSYSDIR)/examples/bench)
- 
- release_docs_spec:
- 
diff --git a/lang/erlang/files/patch-ao b/lang/erlang/files/patch-ao
deleted file mode 100644
index d7632c35fe0d..000000000000
--- a/lang/erlang/files/patch-ao
+++ /dev/null
@@ -1,10 +0,0 @@
---- make/otp.mk.in.orig	Fri Dec  7 17:59:22 2001
-+++ make/otp.mk.in	Fri Dec  7 17:59:32 2001
-@@ -41,6 +41,7 @@
- INSTALL = @INSTALL@
- INSTALL_DIR = @INSTALL_DIR@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- 
- CC = @CC@
diff --git a/lang/erlang/files/patch-aq b/lang/erlang/files/patch-aq
deleted file mode 100644
index 9c4fbac0aa59..000000000000
--- a/lang/erlang/files/patch-aq
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/emacs/erlang.el.orig	Sun Mar 31 11:42:59 2002
-+++ lib/emacs/erlang.el	Sun Mar 31 11:42:49 2002
-@@ -5242,7 +5242,7 @@
-       (let ((msg nil))
- 	(while (save-excursion
- 		 (goto-char (process-mark inferior-erlang-process))
--		 (beginning-of-line)
-+		 (forward-line 0)
- 		 (not (looking-at comint-prompt-regexp)))
- 	  (if msg
- 	      ()