diff options
author | olgeni <olgeni@FreeBSD.org> | 2006-09-07 20:00:50 +0800 |
---|---|---|
committer | olgeni <olgeni@FreeBSD.org> | 2006-09-07 20:00:50 +0800 |
commit | cb2da4c7ddf764d87f14f80882a9e65a3c2854bb (patch) | |
tree | 050395d151f0c8d3197345825c37b765e6228348 /lang/erlang14 | |
parent | e7e2d61aa8232da1e7163fc28b811da299820a30 (diff) | |
download | freebsd-ports-gnome-cb2da4c7ddf764d87f14f80882a9e65a3c2854bb.tar.gz freebsd-ports-gnome-cb2da4c7ddf764d87f14f80882a9e65a3c2854bb.tar.zst freebsd-ports-gnome-cb2da4c7ddf764d87f14f80882a9e65a3c2854bb.zip |
Upgrade to version R11B-1.
Diffstat (limited to 'lang/erlang14')
-rw-r--r-- | lang/erlang14/Makefile | 9 | ||||
-rw-r--r-- | lang/erlang14/Makefile.lib | 32 | ||||
-rw-r--r-- | lang/erlang14/distinfo | 18 | ||||
-rw-r--r-- | lang/erlang14/files/patch-erts_configure | 21 | ||||
-rw-r--r-- | lang/erlang14/files/patch-erts_emulator_utils_beam__makeops | 14 | ||||
-rw-r--r-- | lang/erlang14/files/patch-lib_dialyzer_src_Makefile | 38 | ||||
-rw-r--r-- | lang/erlang14/files/patch-lib_dialyzer_src_dialyzer.hrl.src | 14 | ||||
-rw-r--r-- | lang/erlang14/files/patch-lib_ssh_src_ssh__sftp.erl | 16 |
8 files changed, 29 insertions, 133 deletions
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile index f208a36178a3..4d8e95b3a694 100644 --- a/lang/erlang14/Makefile +++ b/lang/erlang14/Makefile @@ -6,8 +6,7 @@ # PORTNAME= erlang -PORTVERSION= r11b0 -PORTREVISION= 1 +PORTVERSION= r11b1 PORTEPOCH= 1 CATEGORIES= lang parallel 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_R11B-0 +DISTNAME= otp_src_R11B-1 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS} DIST_SUBDIR= erlang EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -61,9 +60,9 @@ LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc .endif .endif -ERLANG_MAN= otp_doc_man_R11B-0.tar.gz +ERLANG_MAN= otp_doc_man_R11B-1.tar.gz .if !defined(NOPORTDOCS) -ERLANG_DOCS= otp_doc_html_R11B-0.tar.gz +ERLANG_DOCS= otp_doc_html_R11B-1.tar.gz .endif ERLANG_PLIST= ${WRKDIR}/pkg-plist diff --git a/lang/erlang14/Makefile.lib b/lang/erlang14/Makefile.lib index 9c27cb9d7dac..98b328b902fa 100644 --- a/lang/erlang14/Makefile.lib +++ b/lang/erlang14/Makefile.lib @@ -1,9 +1,9 @@ # $FreeBSD$ -ERTS_VSN= 5.5 +ERTS_VSN= 5.5.1 OTP_LIBS= appmon-2.1.6 \ - asn1-1.4.4.10 \ - compiler-4.4 \ + asn1-1.4.4.11 \ + compiler-4.4.1 \ cosEvent-2.1 \ cosEventDomain-1.1 \ cosFileTransfer-1.1.2 \ @@ -13,37 +13,37 @@ OTP_LIBS= appmon-2.1.6 \ cosTransactions-1.2 \ crypto-1.5 \ debugger-3.1 \ - dialyzer-1.4.1 \ + dialyzer-1.4.2 \ edoc-0.6.9 \ - erl_interface-3.5.5 \ + erl_interface-3.5.5.1 \ et-1.0 \ gs-1.5.5 \ - hipe-3.5.5 \ + hipe-3.5.6 \ ic-4.2.11 \ - inets-4.7.4 \ + inets-4.7.5 \ inviso-0.1 \ jinterface-1.3 \ - kernel-2.11 \ - megaco-3.3.5 \ + kernel-2.11.1 \ + megaco-3.4.3 \ mnemosyne-1.2.6 \ - mnesia-4.3.1 \ + mnesia-4.3.2 \ mnesia_session-1.1.6 \ observer-0.9.7 \ odbc-2.0.6 \ orber-3.6.3 \ - os_mon-2.1 \ + os_mon-2.1.1 \ otp_mibs-1.0.4 \ parsetools-1.4 \ pman-2.5.2 \ runtime_tools-1.6 \ - sasl-2.1.2 \ - snmp-4.7.4 \ - ssh-0.9.2 \ + sasl-2.1.3 \ + snmp-4.8.1 \ + ssh-0.9.4 \ ssl-3.0.12 \ - stdlib-1.14 \ + stdlib-1.14.1 \ syntax_tools-1.5.0 \ toolbar-1.3 \ - tools-2.5 \ + tools-2.5.1 \ tv-2.1.3 \ webtool-0.8.3 \ xmerl-1.0.5 diff --git a/lang/erlang14/distinfo b/lang/erlang14/distinfo index d45464cf1e2d..f543498a28f4 100644 --- a/lang/erlang14/distinfo +++ b/lang/erlang14/distinfo @@ -1,9 +1,9 @@ -MD5 (erlang/otp_src_R11B-0.tar.gz) = 367d9d3ba979cd278b78d6d0393982ba -SHA256 (erlang/otp_src_R11B-0.tar.gz) = 1806ea681b72be216e5365b29479dcb5253f0d828c021282711f5eae984c9f11 -SIZE (erlang/otp_src_R11B-0.tar.gz) = 10844070 -MD5 (erlang/otp_doc_man_R11B-0.tar.gz) = 172591538db42e81b814a77f30da4fa4 -SHA256 (erlang/otp_doc_man_R11B-0.tar.gz) = 09b93f43b6bb048d3b66296e94bb6379dbac11217e2ffbe074c2492fe777ee39 -SIZE (erlang/otp_doc_man_R11B-0.tar.gz) = 624684 -MD5 (erlang/otp_doc_html_R11B-0.tar.gz) = 8d163f4d16c98ba2e979688842a55a9f -SHA256 (erlang/otp_doc_html_R11B-0.tar.gz) = 68cb74d5979dd2ea75c03e892e7ce1446eff27af37d9bdd4fd9778a433a19f68 -SIZE (erlang/otp_doc_html_R11B-0.tar.gz) = 4662110 +MD5 (erlang/otp_src_R11B-1.tar.gz) = 1fe3707d9bed898bc51444cb529fdd79 +SHA256 (erlang/otp_src_R11B-1.tar.gz) = d5a8530dfee0b2348c4ad0107409fa73ac3233f31e2300ece625a2abd9eb4da7 +SIZE (erlang/otp_src_R11B-1.tar.gz) = 11144896 +MD5 (erlang/otp_doc_man_R11B-1.tar.gz) = dbd2d3da878fed7474b7a9aa03e13c7d +SHA256 (erlang/otp_doc_man_R11B-1.tar.gz) = 706e7da589cddee06b9d0a24a09e2105ae719bbfb8b6a08fe55ae45d5dbf4bd6 +SIZE (erlang/otp_doc_man_R11B-1.tar.gz) = 627132 +MD5 (erlang/otp_doc_html_R11B-1.tar.gz) = f5d3b25821f6d0763defd09f1dd4f51f +SHA256 (erlang/otp_doc_html_R11B-1.tar.gz) = 225212891e2290d0ea21e489445113d7f79ad51e4b3e3e4f0042f8876383a7bc +SIZE (erlang/otp_doc_html_R11B-1.tar.gz) = 4717809 diff --git a/lang/erlang14/files/patch-erts_configure b/lang/erlang14/files/patch-erts_configure deleted file mode 100644 index 6d776f45c1e0..000000000000 --- a/lang/erlang14/files/patch-erts_configure +++ /dev/null @@ -1,21 +0,0 @@ ---- erts/configure.orig Tue May 16 19:39:04 2006 -+++ erts/configure Thu May 18 15:40:47 2006 -@@ -1319,6 +1319,7 @@ - i586) ARCH=x86;; - i686) ARCH=x86;; - x86_64) ARCH=amd64;; -+amd64) ARCH=amd64;; - ppc) ARCH=ppc;; - ppc64) ARCH=ppc64;; - "Power Macintosh") ARCH=ppc;; -@@ -6799,7 +6800,9 @@ - - echo $ac_n "checking for unreliable floating point execptions""... $ac_c" 1>&6 - echo "configure:6802: checking for unreliable floating point execptions" >&5 --if test "$cross_compiling" = yes; then -+if test "${ARCH}" = amd64; then -+ erl_ok=reliable -+elif test "$cross_compiling" = yes; then - erl_ok=unreliable - else - cat > conftest.$ac_ext <<EOF diff --git a/lang/erlang14/files/patch-erts_emulator_utils_beam__makeops b/lang/erlang14/files/patch-erts_emulator_utils_beam__makeops deleted file mode 100644 index 543a2180196c..000000000000 --- a/lang/erlang14/files/patch-erts_emulator_utils_beam__makeops +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- erts/emulator/utils/beam_makeops.orig -+++ erts/emulator/utils/beam_makeops -@@ -481,7 +481,7 @@ - print "\n"; - print "#ifdef ARCH_64\n"; - print "# define BEAM_LOOSE_MASK 0x1FFFUL\n"; -- print "# define BEAM_TIGHT_MASK 0xFFCUL\n"; -+ print "# define BEAM_TIGHT_MASK 0x1FF8UL\n"; - print "# define BEAM_LOOSE_SHIFT 16\n"; - print "# define BEAM_TIGHT_SHIFT 16\n"; - print "#else\n"; diff --git a/lang/erlang14/files/patch-lib_dialyzer_src_Makefile b/lang/erlang14/files/patch-lib_dialyzer_src_Makefile deleted file mode 100644 index 521909e142a2..000000000000 --- a/lang/erlang14/files/patch-lib_dialyzer_src_Makefile +++ /dev/null @@ -1,38 +0,0 @@ - -$FreeBSD$ - ---- lib/dialyzer/src/Makefile.orig -+++ lib/dialyzer/src/Makefile -@@ -65,7 +65,7 @@ - dialyzer_plt \ - dialyzer_typesig - --EXTRA_FILES= dialyzer.hrl ../plt/dialyzer_init_plt ## automatically generated -+EXTRA_FILES= dialyzer.hrl ## automatically generated - - ERL_FILES= $(MODULES:%=%.erl) - INSTALL_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET) -@@ -89,7 +89,7 @@ - # Targets - # ---------------------------------------------------- - --debug opt: $(TARGET_FILES) $(DIALYZER_DIR)/plt/dialyzer_init_plt -+debug opt: $(TARGET_FILES) - - docs: - -@@ -125,7 +125,6 @@ - dialyzer.hrl: dialyzer.hrl.src ../vsn.mk Makefile - sed -e "s;%VSN%;$(VSN);" \ - -e "s;%DEF_LIBS%;\[$(DIALYZER_DEF_LIBS)\];" \ -- -e "s;%DIALYZER_DIR%;\"$(DIALYZER_DIR)\";" \ - $< > $@ - - # --------------------------------------------------------------------- -@@ -155,6 +154,5 @@ - $(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/erlang14/files/patch-lib_dialyzer_src_dialyzer.hrl.src b/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer.hrl.src deleted file mode 100644 index 698769adb62a..000000000000 --- a/lang/erlang14/files/patch-lib_dialyzer_src_dialyzer.hrl.src +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- lib/dialyzer/src/dialyzer.hrl.src.orig -+++ lib/dialyzer/src/dialyzer.hrl.src -@@ -22,7 +22,7 @@ - - %% Values will be set by the Makefile - -define(DEFAULT_LIBS, %DEF_LIBS%). ---define(DIALYZER_DIR, %DIALYZER_DIR%). -+-define(DIALYZER_DIR, code:lib_dir (dialyzer)). - - -record(analysis, {analysis_pid, core_transform=cerl_typean, - defines=[], doc_plt, diff --git a/lang/erlang14/files/patch-lib_ssh_src_ssh__sftp.erl b/lang/erlang14/files/patch-lib_ssh_src_ssh__sftp.erl deleted file mode 100644 index 2d165fe159af..000000000000 --- a/lang/erlang14/files/patch-lib_ssh_src_ssh__sftp.erl +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- lib/ssh/src/ssh_sftp.erl.orig -+++ lib/ssh/src/ssh_sftp.erl -@@ -283,8 +283,10 @@ - {stop, Error } - end; - init([Host,Port,Opts]) -> -+ SaveFlag = process_flag(trap_exit, true), - case ssh_xfer:connect(Host, Port, Opts) of - {ok, Xf, RBuf} -> -+ process_flag(trap_exit, SaveFlag), - {ok, #state { req_id = 0, xf = Xf, rep_buf=RBuf }}; - Error -> - {stop, Error} |