Update erlang to 12b.0; from maintainer Jon Olsson

ok jasper
This commit is contained in:
sthen 2007-12-19 22:51:29 +00:00
parent 181c0ee62c
commit ac50ce691f
8 changed files with 791 additions and 653 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.29 2007/10/05 21:05:24 kili Exp $
# $OpenBSD: Makefile,v 1.30 2007/12/19 22:51:29 sthen Exp $
COMMENT= real-time, concurrent and distributed functional language
V= R11B-5
V= R12B-0
DISTNAME= otp_src_${V}
PKGNAME= erlang-11b.5p0
PKGNAME= erlang-12b.0
CATEGORIES= lang
MAINTAINER= Jon Olsson <jon@abc.se>
@ -45,59 +45,59 @@ DOC_DIR= ${PREFIX}/lib/erlang
# find ${WRKSRC} -name 'vsn.mk' -exec \
# awk '/_VSN =/ { print $1"\t"$3" \\" }' {} \; | grep -v 'PRE'
ERL_VERSIONS= \
ET_VSN 1.0.0.1 \
GS_VSN 1.5.7 \
IC_VSN 4.2.13 \
TV_VSN 2.1.4.1 \
SSH_VSN 0.9.9.1 \
SSL_VSN 3.1.1.1 \
ASN1_VSN 1.4.5 \
EDOC_VSN 0.7.3 \
HIPE_VSN 3.6.3 \
ODBC_VSN 2.0.8 \
PMAN_VSN 2.6 \
SASL_VSN 2.1.5.1 \
SNMP_VSN 4.9.3 \
DIALYZER_VSN 1.7.0 \
COSTIME_VSN 1.1.1 \
MNEMOSYNE_VSN 1.2.7.1 \
MNESIA_SESSION_VSN 1.1.6.1 \
PARSETOOLS_VSN 1.4.1.1 \
INETS_VSN 4.7.16 \
ORBER_VSN 3.6.6 \
EMACS_VSN 2.4.13 \
TOOLS_VSN 2.5.5 \
TYPER_VSN 0.1.0.1 \
XMERL_VSN 1.1.4 \
SYNTAX_TOOLS_VSN 1.5.3 \
EI_VSN 3.5.5.3 \
OTP_MIBS_VSN 1.0.4.1 \
APPMON_VSN 2.1.9 \
CRYPTO_VSN 1.5.1.1 \
COMPILER_VSN 4.4.5 \
DEBUGGER_VSN 3.1.1.1 \
COSEVENT_VSN 2.1.1 \
TOOLBAR_VSN 1.3.0.1 \
INVISO_VSN 0.4 \
KERNEL_VSN 2.11.5 \
MEGACO_VSN 3.6.0.1 \
MNESIA_VSN 4.3.5 \
OS_MON_VSN 2.1.2.1 \
STDLIB_VSN 1.14.5 \
DOCB_VSN 0.9 \
COSFILETRANSFER_VSN 1.1.3 \
JINTERFACE_VSN 1.3 \
COSPROPERTY_VSN 1.1.4 \
RUNTIME_TOOLS_VSN 1.6.6 \
OBSERVER_VSN 0.9.7.4 \
COSEVENTDOMAIN_VSN 1.1.1 \
COSTRANSACTIONS_VSN 1.2.2 \
COSNOTIFICATION_VSN 1.1.5 \
SYSTEM_VSN R11B \
HIPE_VSN 3.6.3 \
ERTS_VSN 5.5.5 \
DOCBUILDER_VSN 0.9 \
WEBTOOL_VSN 0.8.3.1 \
ET_VSN 1.3 \
GS_VSN 1.5.7 \
IC_VSN 4.2.16 \
TV_VSN 2.1.4.1 \
SSH_VSN 0.9.9.3 \
SSL_VSN 3.9 \
ASN1_VSN 1.5 \
EDOC_VSN 0.7.4 \
HIPE_VSN 3.6.4 \
ODBC_VSN 2.0.9 \
PMAN_VSN 2.6 \
SASL_VSN 2.1.5.2 \
SNMP_VSN 4.10 \
DIALYZER_VSN 1.7.1 \
COSTIME_VSN 1.1.2 \
PARSETOOLS_VSN 1.4.2 \
INETS_VSN 5.0 \
ORBER_VSN 3.6.8 \
EMACS_VSN 2.4.13 \
TOOLS_VSN 2.6 \
TYPER_VSN 0.1.1 \
XMERL_VSN 1.1.6 \
COMMON_TEST_VSN 1.3.0 \
SYNTAX_TOOLS_VSN 1.5.3 \
EI_VSN 3.5.5.3 \
OTP_MIBS_VSN 1.0.4.1 \
APPMON_VSN 2.1.9 \
CRYPTO_VSN 1.5.1.1 \
COMPILER_VSN 4.5 \
DEBUGGER_VSN 3.1.1.1 \
COSEVENT_VSN 2.1.2 \
TOOLBAR_VSN 1.3.0.1 \
INVISO_VSN 0.6 \
KERNEL_VSN 2.12 \
MEGACO_VSN 3.7 \
MNESIA_VSN 4.4 \
OS_MON_VSN 2.1.3 \
TEST_SERVER_VSN 3.2.0 \
STDLIB_VSN 1.15 \
DOCB_VSN 0.9.7 \
COSFILETRANSFER_VSN 1.1.4 \
JINTERFACE_VSN 1.4 \
COSPROPERTY_VSN 1.1.5 \
RUNTIME_TOOLS_VSN 1.7 \
PERCEPT_VSN 0.5.0 \
OBSERVER_VSN 0.9.7.4 \
COSEVENTDOMAIN_VSN 1.1.2 \
COSTRANSACTIONS_VSN 1.2.3 \
COSNOTIFICATION_VSN 1.1.6 \
SYSTEM_VSN R12B \
ERTS_VSN 5.6 \
DOCBUILDER_VSN 0.9.7 \
WEBTOOL_VSN 0.8.3.2 \
.for _n _v in ${ERL_VERSIONS}
${_n}=${_v}
@ -119,8 +119,6 @@ COSTRANSACTIONS=cosTransactions-${COSTRANSACTIONS_VSN}
post-configure:
@touch ${WRKSRC}/lib/odbc/SKIP
# Make sure stdlib/shell.erl gets rebuilt
rm -f ${WRKSRC}/lib/stdlib/ebin/shell.beam
post-install:
tar zxf ${FULLDISTDIR}/otp_doc_man_${V}.tar.gz -C ${DOC_DIR}

View File

@ -1,15 +1,15 @@
MD5 (otp_doc_html_R11B-5.tar.gz) = akAUbYVfmNAkaCzSTpu1vA==
MD5 (otp_doc_man_R11B-5.tar.gz) = XDhxYq5tJV9SXXKpFIHRNQ==
MD5 (otp_src_R11B-5.tar.gz) = lqzsQdqH1u4O8Y4aqzb/3Q==
RMD160 (otp_doc_html_R11B-5.tar.gz) = c/gFa2bzvG7GuTw8Pb/fRwdPiXQ=
RMD160 (otp_doc_man_R11B-5.tar.gz) = YtIAvmFDGDoX9SY7c0HsQK/imMc=
RMD160 (otp_src_R11B-5.tar.gz) = Z+rBKokd8OjUazg+oJl/neOqasY=
SHA1 (otp_doc_html_R11B-5.tar.gz) = pEQ57JJMNYlrPNtTT1AB2vbi6N0=
SHA1 (otp_doc_man_R11B-5.tar.gz) = OAn6pjrDQg/QMpFEO/CnMHWkeB8=
SHA1 (otp_src_R11B-5.tar.gz) = wDVp8Dh7BLCvzF9ZmDeSZ2/UOCs=
SHA256 (otp_doc_html_R11B-5.tar.gz) = fepnmAuVj/6/epTz2UvZyHTgQfT17ldMVqq2LFSnHSg=
SHA256 (otp_doc_man_R11B-5.tar.gz) = qzZK9unbRz0rxcBkaptwmJuFiVPKnAU7eKUJlgpPnKo=
SHA256 (otp_src_R11B-5.tar.gz) = 1B/fukD4alDgS3ImrlzEWBBy+tJtFL5eHKBmA4E7sXU=
SIZE (otp_doc_html_R11B-5.tar.gz) = 4968176
SIZE (otp_doc_man_R11B-5.tar.gz) = 725858
SIZE (otp_src_R11B-5.tar.gz) = 38332865
MD5 (otp_doc_html_R12B-0.tar.gz) = 3btITr6XqDdkDlEwXMdVeg==
MD5 (otp_doc_man_R12B-0.tar.gz) = qjoSoW4D0arexA4mX1Hnxg==
MD5 (otp_src_R12B-0.tar.gz) = VM1ag2l8UV9XHkTU6pnI0w==
RMD160 (otp_doc_html_R12B-0.tar.gz) = CL7datii1VgeWUNeO7P20sIl7V0=
RMD160 (otp_doc_man_R12B-0.tar.gz) = p7WNlcKASGbjofWYT3oO6RSwSlY=
RMD160 (otp_src_R12B-0.tar.gz) = ywfqN/K1bh6i/AfJBjtkffdjWys=
SHA1 (otp_doc_html_R12B-0.tar.gz) = XiFmUZ99nL2kCS0WPQOlnzADaLs=
SHA1 (otp_doc_man_R12B-0.tar.gz) = 3roHMGnXqK5tbJTBfh60W17A9kc=
SHA1 (otp_src_R12B-0.tar.gz) = 4sbhjSLjSnmfxrwl+i0l7tswvMw=
SHA256 (otp_doc_html_R12B-0.tar.gz) = SfdLrdSYQOKiMWE45p/tbhiKvJLVfC7f6eWB7VTEBkw=
SHA256 (otp_doc_man_R12B-0.tar.gz) = AoVWzBp/NvSDwW5P14OMeX7ewCiQ/qSKGod88BZ53ho=
SHA256 (otp_src_R12B-0.tar.gz) = hBXnpKsOD3DfjV4vGedC749sDRvfkapiloMyzz2Svlc=
SIZE (otp_doc_html_R12B-0.tar.gz) = 5859638
SIZE (otp_doc_man_R12B-0.tar.gz) = 757429
SIZE (otp_src_R12B-0.tar.gz) = 41074760

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.9 2007/07/04 05:38:58 steven Exp $
--- Makefile.in.orig Mon Jun 11 14:55:05 2007
+++ Makefile.in Mon Jul 2 15:38:36 2007
$OpenBSD: patch-Makefile_in,v 1.10 2007/12/19 22:51:29 sthen Exp $
--- Makefile.in.orig Mon Nov 26 19:57:49 2007
+++ Makefile.in Thu Dec 6 09:46:12 2007
@@ -49,8 +49,7 @@ exec_prefix = @exec_prefix@
# useful e.g. when installing on a server that stores the files with a
# different path from where the clients access them. Or when building
@ -11,7 +11,7 @@ $OpenBSD: patch-Makefile_in,v 1.9 2007/07/04 05:38:58 steven Exp $
# The directory in which user executables (ERL_BASE_PUB_FILES) are put
BINDIR = $(INSTALL_PREFIX)@bindir@
@@ -680,7 +679,7 @@ else
@@ -707,7 +706,7 @@ else
endif
install.Install:
@ -20,7 +20,7 @@ $OpenBSD: patch-Makefile_in,v 1.9 2007/07/04 05:38:58 steven Exp $
#
# Install erlang base public files
@@ -688,7 +687,7 @@ install.Install:
@@ -715,7 +714,7 @@ install.Install:
install.bin:
for file in $(ERL_BASE_PUB_FILES); do \
rm -f $(BINDIR)/$$file; \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-erts_emulator_Makefile_in,v 1.5 2007/03/29 17:18:57 steven Exp $
--- erts/emulator/Makefile.in.orig Tue Mar 27 15:26:54 2007
+++ erts/emulator/Makefile.in Thu Mar 29 17:56:02 2007
@@ -152,7 +152,7 @@ darwinCFLAGS=-DDARWIN
$OpenBSD: patch-erts_emulator_Makefile_in,v 1.6 2007/12/19 22:51:29 sthen Exp $
--- erts/emulator/Makefile.in.orig Mon Nov 26 19:55:14 2007
+++ erts/emulator/Makefile.in Thu Dec 6 09:46:12 2007
@@ -135,7 +135,7 @@ darwinCFLAGS=-DDARWIN
noopsysCFLAGS=
OPSYSCFLAGS=$($(OPSYS)CFLAGS)
ARCH=@ARCH@
@ -10,7 +10,7 @@ $OpenBSD: patch-erts_emulator_Makefile_in,v 1.5 2007/03/29 17:18:57 steven Exp $
ARCHCFLAGS=$($(ARCH)CFLAGS)
ifdef HIPE_ENABLED
@@ -201,12 +201,12 @@ endif
@@ -184,12 +184,12 @@ endif
ifeq ($(CC), gcc)
ifeq ($(NO_INLINE_FUNCTIONS),true)
@ -26,7 +26,7 @@ $OpenBSD: patch-erts_emulator_Makefile_in,v 1.5 2007/03/29 17:18:57 steven Exp $
endif
endif
UNROLL_FLG = -funroll-loops
@@ -827,7 +827,7 @@ $(OBJDIR)/%.o: hipe/%.S
@@ -814,7 +814,7 @@ $(OBJDIR)/%.o: hipe/%.S
$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
$(OBJDIR)/%.o: hipe/%.c

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-lib_compiler_src_v3_codegen_erl,v 1.1 2007/12/19 22:51:29 sthen Exp $
Fix a compiler bug, http://thread.gmane.org/gmane.comp.lang.erlang.general/26285
--- lib/compiler/src/v3_codegen.erl.orig Thu Dec 6 09:52:02 2007
+++ lib/compiler/src/v3_codegen.erl Thu Dec 6 09:53:20 2007
@@ -1457,6 +1457,8 @@ cg_binary_size_1([], Bits, Acc) ->
Sizes = filter(fun({_,{integer,0}}) -> false;
(_) -> true end, Sizes0),
case Sizes of
+ [] ->
+ {bs_init2,[{integer,0}]};
[{1,_}|_] ->
{bs_init_bits,cg_binary_bytes_to_bits(Sizes, [])};
[{8,_}|_] ->

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-lib_dialyzer_src_Makefile,v 1.5 2007/07/04 05:38:58 steven Exp $
$OpenBSD: patch-lib_dialyzer_src_Makefile,v 1.6 2007/12/19 22:51:29 sthen Exp $
$FreeBSD: ports/lang/erlang/files/patch-lib_dialyzer_src_Makefile,v 1.1 2006/05/28 14:20:46 olgeni Exp $
--- lib/dialyzer/src/Makefile.orig Mon Jun 11 14:57:45 2007
+++ lib/dialyzer/src/Makefile Mon Jul 2 15:38:35 2007
--- lib/dialyzer/src/Makefile.orig Mon Nov 26 20:00:46 2007
+++ lib/dialyzer/src/Makefile Thu Dec 6 09:46:02 2007
@@ -68,7 +68,7 @@ MODULES = \
dialyzer_typesig \
dialyzer_utils
@ -10,7 +10,7 @@ $FreeBSD: ports/lang/erlang/files/patch-lib_dialyzer_src_Makefile,v 1.1 2006/05/
-EXTRA_FILES= ../plt/dialyzer_init_plt ## automatically generated
+EXTRA_FILES= #../plt/dialyzer_init_plt ## automatically generated
HRL_FILES= dialyzer.hrl
HRL_FILES= dialyzer.hrl dialyzer_callgraph.hrl
ERL_FILES= $(MODULES:%=%.erl)
@@ -92,7 +92,7 @@ ERL_COMPILE_FLAGS += -I$(HIPE_ICODE_DIR) +warn_unused_
# Targets
@ -21,7 +21,7 @@ $FreeBSD: ports/lang/erlang/files/patch-lib_dialyzer_src_Makefile,v 1.1 2006/05/
docs:
@@ -156,6 +156,5 @@ release_spec: opt
@@ -158,6 +158,5 @@ release_spec: opt
$(INSTALL_DIR) $(RELSYSDIR)/ebin
$(INSTALL_DATA) $(INSTALL_FILES) $(RELSYSDIR)/ebin
$(INSTALL_DIR) $(RELSYSDIR)/plt

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-lib_tools_c_src_Makefile_in,v 1.3 2007/03/29 17:18:57 steven Exp $
--- lib/tools/c_src/Makefile.in.orig Tue Aug 29 11:51:29 2006
+++ lib/tools/c_src/Makefile.in Thu Mar 29 17:56:02 2007
@@ -107,7 +107,7 @@ EMEM_INCLUDES = -I$(ERL_TOP)/erts/include \
$OpenBSD: patch-lib_tools_c_src_Makefile_in,v 1.4 2007/12/19 22:51:29 sthen Exp $
--- lib/tools/c_src/Makefile.in.orig Mon Nov 26 20:03:50 2007
+++ lib/tools/c_src/Makefile.in Thu Dec 6 09:46:12 2007
@@ -108,7 +108,7 @@ EMEM_INCLUDES = -I$(ERL_TOP)/erts/include \
EMEM_HEADERS = erl_memory_trace_block_table.h
EMEM_SRCS = erl_memory.c erl_memory_trace_block_table.c

File diff suppressed because it is too large Load Diff