11 files changed, 53 insertions, 105 deletions

diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index 28e11cc3623b..3d209bdad934 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	erlang
-PORTVERSION=	9.0
-PORTREVISION=	1
+PORTVERSION=	9.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_R9B-0
+DISTNAME=	otp_src_R9B-1
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -37,9 +36,9 @@ CONFIGURE_TARGET=	# Empty
 # Don't clutter up /usr/ports/distfiles with all distfiles (including patches)
 DIST_SUBDIR=	erlang
 
-ERLANG_MAN=     otp_man_R9B-0.tar.gz
+ERLANG_MAN=     otp_man_R9B-1.tar.gz
 .if !defined(NOPORTDOCS)
-ERLANG_DOCS=	otp_html_R9B-0.tar.gz
+ERLANG_DOCS=	otp_html_R9B-1.tar.gz
 .endif
 
 .if !defined(WITHOUT_X11)
diff --git a/lang/erlang14/Makefile.lib b/lang/erlang14/Makefile.lib
index 36a808366697..bd0b54f6bd6c 100644
--- a/lang/erlang14/Makefile.lib
+++ b/lang/erlang14/Makefile.lib
@@ -1,42 +1,42 @@
 # $FreeBSD$
 
 OTP_LIBS=	appmon-2.1.1 \
-		asn1-1.4 \
-		compiler-4.1 \
-		cosEvent-2.0 \
-		cosEventDomain-1.0 \
-		cosFileTransfer-1.0.2 \
-		cosNotification-1.0.6 \
-		cosProperty-1.0.1 \
-		cosTime-1.0.1.1 \
-		cosTransactions-1.1.2 \
-		crypto-1.1.2 \
+		asn1-1.4.1 \
+		compiler-4.1.1 \
+		cosEvent-2.1 \
+		cosEventDomain-1.1 \
+		cosFileTransfer-1.1 \
+		cosNotification-1.1 \
+		cosProperty-1.1 \
+		cosTime-1.1 \
+		cosTransactions-1.2 \
+		crypto-1.1.2.1 \
 		debugger-2.1 \
 		erl_interface-3.3.2 \
 		et-1.0 \
 		eva-2.0.3 \
-		gs-1.5.0 \
+		gs-1.5.1 \
 		hipe-2.0 \
-		ic-4.1.6 \
-		inets-3.0 \
-		jinterface-1.2.1 \
-		kernel-2.8.0 \
-		megaco-1.1.0 \
+		ic-4.2 \
+		inets-3.0.3 \
+		jinterface-1.2.1.1 \
+		kernel-2.8.1.1 \
+		megaco-1.1.2 \
 		mnemosyne-1.2.5 \
-		mnesia-4.1 \
+		mnesia-4.1.3 \
 		mnesia_session-1.1.5 \
-		observer-0.9 \
-		odbc-1.0 \
-		orber-3.3 \
-		os_mon-1.6.0 \
+		observer-0.9.3 \
+		odbc-1.0.5 \
+		orber-3.4 \
+		os_mon-1.6.0.2 \
 		parsetools-1.2 \
 		pman-2.4.1 \
 		runtime_tools-1.3 \
 		sasl-1.9.4 \
 		snmp-3.3.8 \
 		ssl-2.3.5 \
-		stdlib-1.11.0 \
+		stdlib-1.11.4.1 \
 		toolbar-1.1.0 \
-		tools-2.1 \
+		tools-2.2 \
 		tv-2.0.4 \
 		webtool-0.7.1
diff --git a/lang/erlang14/distinfo b/lang/erlang14/distinfo
index fb87e06924f3..c010cf527cde 100644
--- a/lang/erlang14/distinfo
+++ b/lang/erlang14/distinfo
@@ -1,3 +1,3 @@
-MD5 (erlang/otp_src_R9B-0.tar.gz) = 573be64365dd6cb0e83063a71ae65f70
-MD5 (erlang/otp_man_R9B-0.tar.gz) = d0d92745e4e1a1710ee05f1cc920b129
-MD5 (erlang/otp_html_R9B-0.tar.gz) = d26d9709074d7a37ef5d54e98df5f9a0
+MD5 (erlang/otp_src_R9B-1.tar.gz) = 37ac7d5e4e9fa7730775e590f4796bbf
+MD5 (erlang/otp_man_R9B-1.tar.gz) = e616921266ed22c9eff6167dfcf6853e
+MD5 (erlang/otp_html_R9B-1.tar.gz) = f29f9438dde6608c219280e8083aee9d
diff --git a/lang/erlang14/files/patch-Makefile.in b/lang/erlang14/files/patch-Makefile.in
deleted file mode 100644
index a9f5d78f5bdf..000000000000
--- a/lang/erlang14/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Wed Nov 13 00:21:47 2002
-+++ Makefile.in	Wed Nov 13 00:24:24 2002
-@@ -281,7 +281,7 @@
- # Erlang base public files
- #
- install.bin:
--	rm -f $(BINDIR)/erl $(BINDIR)/erlc
-+	rm -f $(BINDIR)/erl $(BINDIR)/erlc $(BINDIR)/ecc $(BINDIR)/elink $(BINDIR)/ear $(BINDIR)/escript
- 	${LN_S} $(ERLANG_BINDIR)/erl      $(BINDIR)/erl
- 	${LN_S} $(ERLANG_BINDIR)/erlc     $(BINDIR)/erlc
- 	${LN_S} $(ERLANG_BINDIR)/ecc      $(BINDIR)/ecc
diff --git a/lang/erlang14/files/patch-aj b/lang/erlang14/files/patch-aj
index c737dadeb146..6b8104ce7904 100644
--- a/lang/erlang14/files/patch-aj
+++ b/lang/erlang14/files/patch-aj
@@ -1,8 +1,11 @@
---- erts/etc/unix/Install.src.orig	Tue Oct 15 13:40:55 2002
-+++ erts/etc/unix/Install.src	Sat Nov  2 15:43:51 2002
-@@ -97,7 +97,8 @@
-   chmod 755 start_erl
- fi
+
+$FreeBSD$
+
+--- erts/etc/unix/Install.src.orig	Wed Mar  5 17:20:07 2003
++++ erts/etc/unix/Install.src	Wed Mar  5 17:21:04 2003
+@@ -119,7 +119,8 @@
+ sed -e "s;%EMU%;%EMULATOR%%EMULATOR_NUMBER%;" $ERL_ROOT/erts-%I_VSN%/bin/start_erl.src > start_erl
+ chmod 755 start_erl
  
 -if [ -d $ERL_ROOT/lib/sasl* ]
 +set $ERL_ROOT/lib/sasl*
@@ -10,7 +13,7 @@
  then
      (cd $ERL_ROOT/releases
       echo %I_VSN% %I_SYSTEM_VSN% > start_erl.data)
-@@ -171,4 +172,4 @@
+@@ -193,4 +194,4 @@
      ./misc/format_man_pages $ERL_ROOT
  fi
  
diff --git a/lang/erlang14/files/patch-ap b/lang/erlang14/files/patch-ap
deleted file mode 100644
index 051d70948357..000000000000
--- a/lang/erlang14/files/patch-ap
+++ /dev/null
@@ -1,11 +0,0 @@
---- erts/config.h.in.orig	Wed Oct 16 10:41:05 2002
-+++ erts/config.h.in	Sat Nov  2 15:43:51 2002
-@@ -258,6 +258,9 @@
- /* Define if you have the strerror function.  */
- #undef HAVE_STRERROR
- 
-+/* Define if you have the strerror_r function.  */
-+#undef HAVE_STRERROR_R
-+
- /* Define if you have the strncasecmp function.  */
- #undef HAVE_STRNCASECMP
diff --git a/lang/erlang14/files/patch-erts_boot_src_Makefile b/lang/erlang14/files/patch-erts_boot_src_Makefile
deleted file mode 100644
index 75729da81402..000000000000
--- a/lang/erlang14/files/patch-erts_boot_src_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- erts/boot/src/Makefile.orig	Sat Nov  2 16:15:36 2002
-+++ erts/boot/src/Makefile	Sat Nov  2 16:16:17 2002
-@@ -103,7 +103,7 @@
- 	$(INSTALL_DIR) $(RELSYSDIR)
- 	$(INSTALL_DATA) erlang.ear $(RELSYSDIR)/erlang.ear
- 	$(INSTALL_DIR) $(RELSYSDIR)/bin
--	$(INSTALL_PROGRAM) ecc elink escript ear esh $(RELSYSDIR)/bin
-+	$(INSTALL_SCRIPT) ecc elink escript ear esh $(RELSYSDIR)/bin
- endif
- 
- bootstrap: ${BEAM} ${FAKES} elink
diff --git a/lang/erlang14/files/patch-erts_configure b/lang/erlang14/files/patch-erts_configure
deleted file mode 100644
index 7ecc4f41d310..000000000000
--- a/lang/erlang14/files/patch-erts_configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- erts/configure.orig	Wed Oct 16 10:41:01 2002
-+++ erts/configure	Sat Nov  2 15:43:52 2002
-@@ -3960,7 +3960,7 @@
- 
- 
- for ac_func in ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \
--		poll pread pwrite writev memmove strerror strncasecmp \
-+		poll pread pwrite writev memmove strerror strerror_r strncasecmp \
- 		gethrtime localtime_r gmtime_r mremap memcpy mallopt
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
diff --git a/lang/erlang14/files/patch-erts_configure.in b/lang/erlang14/files/patch-erts_configure.in
deleted file mode 100644
index a81d2ede3fe4..000000000000
--- a/lang/erlang14/files/patch-erts_configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- erts/configure.in.orig	Thu Oct 10 16:18:27 2002
-+++ erts/configure.in	Sat Nov  2 15:43:51 2002
-@@ -546,7 +546,7 @@
- dnl ----------------------------------------------------------------------
- 
- AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \
--		poll pread pwrite writev memmove strerror strncasecmp \
-+		poll pread pwrite writev memmove strerror strerror_r strncasecmp \
- 		gethrtime localtime_r gmtime_r mremap memcpy mallopt])
- AC_FUNC_SETVBUF_REVERSED
- AC_FUNC_VFORK
diff --git a/lang/erlang14/files/patch-lib_erl__interface_src_configure.in b/lang/erlang14/files/patch-lib_erl__interface_src_configure.in
deleted file mode 100644
index feda49221378..000000000000
--- a/lang/erlang14/files/patch-lib_erl__interface_src_configure.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/erl_interface/src/configure.in.orig	Fri Sep 22 16:09:38 2000
-+++ lib/erl_interface/src/configure.in	Sat Nov  2 15:43:51 2002
-@@ -28,7 +28,7 @@
- AC_FUNC_MEMCMP
- AC_TYPE_SIGNAL
- AC_FUNC_VPRINTF
--AC_CHECK_FUNCS(gethostname gettimeofday select socket strdup strerror strstr uname)
-+AC_CHECK_FUNCS(gethostname gettimeofday select socket strdup strerror strerror_r strstr uname)
- 
- AC_OUTPUT(GNUmakefile)
diff --git a/lang/erlang14/files/patch-lib_observer_src_Makefile b/lang/erlang14/files/patch-lib_observer_src_Makefile
new file mode 100644
index 000000000000..dc51a15fee3c
--- /dev/null
+++ b/lang/erlang14/files/patch-lib_observer_src_Makefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- lib/observer/src/Makefile.orig	Wed Mar  5 19:37:25 2003
++++ lib/observer/src/Makefile	Wed Mar  5 19:37:30 2003
+@@ -102,7 +102,7 @@
+ 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) $(RELSYSDIR)/priv/bin
+-	$(INSTALL_PROGRAM) $(EXECUTABLES) $(RELSYSDIR)/priv/bin
++	$(INSTALL_SCRIPT) $(EXECUTABLES) $(RELSYSDIR)/priv/bin
+ 
+ release_docs_spec:
+