1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-03 11:12:13 +00:00

Upgrade to version R12B-0 with OSP1 source patch.

This commit is contained in:
Jimmy Olgeni 2007-12-23 21:57:50 +00:00
parent 5d56e046d8
commit 2c334d055b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=204414
12 changed files with 170 additions and 168 deletions

View File

@ -6,20 +6,23 @@
#
PORTNAME= erlang
PORTVERSION= r11b5
PORTREVISION= 1
PORTVERSION= r12b0.1
PORTEPOCH= 1
CATEGORIES= lang parallel
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/ \
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_R11B-5
DISTNAME= otp_src_R12B-0
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
DIST_SUBDIR= erlang
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PATCH_SITES= http://www.erlang.org/download/
PATCHFILES= otp_src_R12B-0-osp1.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= olgeni@FreeBSD.org
COMMENT= A functional programming language from Ericsson
@ -71,9 +74,9 @@ LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
.endif
.endif
ERLANG_MAN= otp_doc_man_R11B-5.tar.gz
ERLANG_MAN= otp_doc_man_R12B-0.tar.gz
.if !defined(NOPORTDOCS)
ERLANG_DOCS= otp_doc_html_R11B-5.tar.gz
ERLANG_DOCS= otp_doc_html_R12B-0.tar.gz
.endif
ERLANG_PLIST= ${WRKDIR}/pkg-plist

View File

@ -1,52 +1,53 @@
# $FreeBSD$
ERTS_VSN= 5.5.5
TOOLS_VSN= 2.5.5
ERTS_VSN= 5.6
TOOLS_VSN= 2.6
OTP_LIBS= appmon-2.1.9 \
asn1-1.4.5 \
compiler-4.4.5 \
cosEvent-2.1.1 \
cosEventDomain-1.1.1 \
cosFileTransfer-1.1.3 \
cosNotification-1.1.5 \
cosProperty-1.1.4 \
cosTime-1.1.1 \
cosTransactions-1.2.2 \
asn1-1.5 \
common_test-1.3.0 \
compiler-4.5 \
cosEvent-2.1.2 \
cosEventDomain-1.1.2 \
cosFileTransfer-1.1.4 \
cosNotification-1.1.6 \
cosProperty-1.1.5 \
cosTime-1.1.2 \
cosTransactions-1.2.3 \
crypto-1.5.1.1 \
debugger-3.1.1.1 \
dialyzer-1.7.0 \
docbuilder-0.9 \
edoc-0.7.3 \
dialyzer-1.7.1 \
docbuilder-0.9.7 \
edoc-0.7.4 \
erl_interface-3.5.5.3 \
et-1.0.0.1 \
et-1.3 \
gs-1.5.7 \
hipe-3.6.3 \
ic-4.2.13 \
inets-4.7.16 \
inviso-0.4 \
jinterface-1.3 \
kernel-2.11.5 \
megaco-3.6.0.1 \
mnemosyne-1.2.7.1 \
mnesia-4.3.5 \
mnesia_session-1.1.6.1 \
hipe-3.6.4 \
ic-4.2.16 \
inets-5.0 \
inviso-0.6 \
jinterface-1.4 \
kernel-2.12 \
megaco-3.7 \
mnesia-4.4 \
observer-0.9.7.4 \
odbc-2.0.8 \
orber-3.6.6 \
os_mon-2.1.2.1 \
odbc-2.0.9 \
orber-3.6.8 \
os_mon-2.1.3 \
otp_mibs-1.0.4.1 \
parsetools-1.4.1.1 \
parsetools-1.4.2 \
percept-0.5.0 \
pman-2.6 \
runtime_tools-1.6.6 \
sasl-2.1.5.1 \
snmp-4.9.3 \
ssh-0.9.9.1 \
ssl-3.1.1.1 \
stdlib-1.14.5 \
runtime_tools-1.7 \
sasl-2.1.5.2 \
snmp-4.10 \
ssh-0.9.9.3 \
ssl-3.9 \
stdlib-1.15 \
syntax_tools-1.5.3 \
test_server-3.2.0 \
toolbar-1.3.0.1 \
tools-2.5.5 \
tools-2.6 \
tv-2.1.4.1 \
typer-0.1.0.1 \
webtool-0.8.3.1 \
xmerl-1.1.4
typer-0.1.1 \
webtool-0.8.3.2 \
xmerl-1.1.6

View File

@ -82,6 +82,7 @@ MAN3= CosEventChannelAdmin.3 \
any.3 \
application.3 \
appmon.3 \
array.3 \
asn1ct.3 \
asn1rt.3 \
auth.3 \
@ -104,7 +105,13 @@ MAN3= CosEventChannelAdmin.3 \
cprof.3 \
cpu_sup.3 \
crashdump.3 \
crypto.3 \
ct.3 \
ct_cover.3 \
ct_ftp.3 \
ct_master.3 \
ct_rpc.3 \
ct_snmp.3 \
ct_telnet.3 \
dbg.3 \
debugger.3 \
dets.3 \
@ -124,6 +131,7 @@ MAN3= CosEventChannelAdmin.3 \
edoc_layout.3 \
edoc_lib.3 \
edoc_run.3 \
egd.3 \
ei.3 \
ei_connect.3 \
epp.3 \
@ -198,6 +206,7 @@ MAN3= CosEventChannelAdmin.3 \
ic_clib.3 \
igor.3 \
inet.3 \
inets.3 \
init.3 \
instrument.3 \
int.3 \
@ -228,11 +237,9 @@ MAN3= CosEventChannelAdmin.3 \
megaco_udp.3 \
megaco_user.3 \
memsup.3 \
mnemosyne.3 \
mnesia.3 \
mnesia_frag_hash.3 \
mnesia_registry.3 \
mnesia_session.3 \
mod_alias.3 \
mod_auth.3 \
mod_esi.3 \
@ -256,6 +263,7 @@ MAN3= CosEventChannelAdmin.3 \
otp_mib.3 \
overload.3 \
packages.3 \
percept.3 \
pg.3 \
pg2.3 \
pman.3 \
@ -296,6 +304,7 @@ MAN3= CosEventChannelAdmin.3 \
snmpa_local_db.3 \
snmpa_mpd.3 \
snmpa_network_interface.3 \
snmpa_network_interface_filter.3 \
snmpa_notification_filter.3 \
snmpa_supervisor.3 \
snmpc.3 \
@ -313,19 +322,20 @@ MAN3= CosEventChannelAdmin.3 \
ssh_ssh.3 \
ssh_sshd.3 \
ssh_transport.3 \
ssl.3 \
ssl_pkix.3 \
string.3 \
supervisor.3 \
supervisor_bridge.3 \
sys.3 \
systools.3 \
tags.3 \
test_server.3 \
test_server_ctrl.3 \
tftp.3 \
timer.3 \
toolbar.3 \
ttb.3 \
tv.3 \
unix_telnet.3 \
user.3 \
webtool.3 \
win32reg.3 \
@ -348,12 +358,12 @@ MAN4= app.4 \
relup.4 \
script.4
MAN6= crypto.6 \
MAN6= common_test.6 \
docbuilder.6 \
kernel.6 \
observer.6 \
runtime_tools.6 \
sasl.6 \
snmp.6 \
ssl.6 \
stdlib.6
stdlib.6 \
test_server.6

View File

@ -1,9 +1,12 @@
MD5 (erlang/otp_src_R11B-5.tar.gz) = 96acec41da87d6ee0ef18e1aab36ffdd
SHA256 (erlang/otp_src_R11B-5.tar.gz) = d41fdfba40f86a50e04b7226ae5cc4581072fad26d14be5e1ca06603813bb175
SIZE (erlang/otp_src_R11B-5.tar.gz) = 38332865
MD5 (erlang/otp_doc_man_R11B-5.tar.gz) = 5c387162ae6d255f525d72a91481d135
SHA256 (erlang/otp_doc_man_R11B-5.tar.gz) = ab364af6e9db473d2bc5c0646a9b70989b858953ca9c053b78a509960a4f9caa
SIZE (erlang/otp_doc_man_R11B-5.tar.gz) = 725858
MD5 (erlang/otp_doc_html_R11B-5.tar.gz) = 6a40146d855f98d024682cd24e9bb5bc
SHA256 (erlang/otp_doc_html_R11B-5.tar.gz) = 7dea67980b958ffebf7a94f3d94bd9c874e041f4f5ee574c56aab62c54a71d28
SIZE (erlang/otp_doc_html_R11B-5.tar.gz) = 4968176
MD5 (erlang/otp_src_R12B-0.tar.gz) = 54cd5a83697c515f571e44d4ea99c8d3
SHA256 (erlang/otp_src_R12B-0.tar.gz) = 8415e7a4ab0e0f70df8d5e2f19e742ef8f6c0d1bdf91aa62968332cf3d92be57
SIZE (erlang/otp_src_R12B-0.tar.gz) = 41074760
MD5 (erlang/otp_doc_man_R12B-0.tar.gz) = aa3a12a16e03d1aadec40e265f51e7c6
SHA256 (erlang/otp_doc_man_R12B-0.tar.gz) = 028556cc1a7f36f483c16e4fd7838c797edec02890fea48a1a877cf01679de1a
SIZE (erlang/otp_doc_man_R12B-0.tar.gz) = 757429
MD5 (erlang/otp_doc_html_R12B-0.tar.gz) = ddbb484ebe97a837640e51305cc7557a
SHA256 (erlang/otp_doc_html_R12B-0.tar.gz) = 49f74badd49840e2a2316138e69fed6e188abc92d57c2edfe9e581ed54c4064c
SIZE (erlang/otp_doc_html_R12B-0.tar.gz) = 5859638
MD5 (erlang/otp_src_R12B-0-osp1.patch) = aa67b2cdc6c6fa885d145a982cd500cd
SHA256 (erlang/otp_src_R12B-0-osp1.patch) = f6f4992a424ebf460358cf45e5caa8bef4a19a600da4a04533e8f8e4b1c04b26
SIZE (erlang/otp_src_R12B-0-osp1.patch) = 50620

View File

@ -3,16 +3,16 @@ $FreeBSD$
--- lib/dialyzer/src/Makefile.orig
+++ lib/dialyzer/src/Makefile
@@ -66,8 +66,6 @@
dialyzer_succ_typings \
dialyzer_typesig
@@ -68,8 +68,6 @@
dialyzer_typesig \
dialyzer_utils
-EXTRA_FILES= ../plt/dialyzer_init_plt ## automatically generated
-
HRL_FILES= dialyzer.hrl
HRL_FILES= dialyzer.hrl dialyzer_callgraph.hrl
ERL_FILES= $(MODULES:%=%.erl)
INSTALL_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
@@ -91,13 +89,12 @@
@@ -92,13 +90,12 @@
# Targets
# ----------------------------------------------------
@ -27,7 +27,7 @@ $FreeBSD$
rm -f core
# ----------------------------------------------------
@@ -149,11 +146,10 @@
@@ -153,11 +150,10 @@
release_spec: opt
$(INSTALL_DIR) $(RELSYSDIR)/src

View File

@ -1,16 +0,0 @@
$FreeBSD$
--- lib/stdlib/src/io_lib_pretty.erl.orig
+++ lib/stdlib/src/io_lib_pretty.erl
@@ -159,7 +159,9 @@
%% Reuse the list created by io_lib:write_binary()...
pp_binary([LT,LT,S,GT,GT], Col, Ll, Ind, LD) ->
N = max(8, Ll - Col - LD),
- [LT,LT,pp_binary(S, N, N, Ind),GT,GT].
+ [LT,LT,pp_binary(S, N, N, Ind),GT,GT];
+pp_binary(S, _Col, _Ll, _Ind, _LD) ->
+ S.
pp_binary([BS, $, | S], N, N0, Ind) ->
Len = length(BS) + 1,

View File

@ -6,20 +6,23 @@
#
PORTNAME= erlang
PORTVERSION= r11b5
PORTREVISION= 1
PORTVERSION= r12b0.1
PORTEPOCH= 1
CATEGORIES= lang parallel
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/ \
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_R11B-5
DISTNAME= otp_src_R12B-0
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
DIST_SUBDIR= erlang
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PATCH_SITES= http://www.erlang.org/download/
PATCHFILES= otp_src_R12B-0-osp1.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= olgeni@FreeBSD.org
COMMENT= A functional programming language from Ericsson
@ -71,9 +74,9 @@ LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
.endif
.endif
ERLANG_MAN= otp_doc_man_R11B-5.tar.gz
ERLANG_MAN= otp_doc_man_R12B-0.tar.gz
.if !defined(NOPORTDOCS)
ERLANG_DOCS= otp_doc_html_R11B-5.tar.gz
ERLANG_DOCS= otp_doc_html_R12B-0.tar.gz
.endif
ERLANG_PLIST= ${WRKDIR}/pkg-plist

View File

@ -1,52 +1,53 @@
# $FreeBSD$
ERTS_VSN= 5.5.5
TOOLS_VSN= 2.5.5
ERTS_VSN= 5.6
TOOLS_VSN= 2.6
OTP_LIBS= appmon-2.1.9 \
asn1-1.4.5 \
compiler-4.4.5 \
cosEvent-2.1.1 \
cosEventDomain-1.1.1 \
cosFileTransfer-1.1.3 \
cosNotification-1.1.5 \
cosProperty-1.1.4 \
cosTime-1.1.1 \
cosTransactions-1.2.2 \
asn1-1.5 \
common_test-1.3.0 \
compiler-4.5 \
cosEvent-2.1.2 \
cosEventDomain-1.1.2 \
cosFileTransfer-1.1.4 \
cosNotification-1.1.6 \
cosProperty-1.1.5 \
cosTime-1.1.2 \
cosTransactions-1.2.3 \
crypto-1.5.1.1 \
debugger-3.1.1.1 \
dialyzer-1.7.0 \
docbuilder-0.9 \
edoc-0.7.3 \
dialyzer-1.7.1 \
docbuilder-0.9.7 \
edoc-0.7.4 \
erl_interface-3.5.5.3 \
et-1.0.0.1 \
et-1.3 \
gs-1.5.7 \
hipe-3.6.3 \
ic-4.2.13 \
inets-4.7.16 \
inviso-0.4 \
jinterface-1.3 \
kernel-2.11.5 \
megaco-3.6.0.1 \
mnemosyne-1.2.7.1 \
mnesia-4.3.5 \
mnesia_session-1.1.6.1 \
hipe-3.6.4 \
ic-4.2.16 \
inets-5.0 \
inviso-0.6 \
jinterface-1.4 \
kernel-2.12 \
megaco-3.7 \
mnesia-4.4 \
observer-0.9.7.4 \
odbc-2.0.8 \
orber-3.6.6 \
os_mon-2.1.2.1 \
odbc-2.0.9 \
orber-3.6.8 \
os_mon-2.1.3 \
otp_mibs-1.0.4.1 \
parsetools-1.4.1.1 \
parsetools-1.4.2 \
percept-0.5.0 \
pman-2.6 \
runtime_tools-1.6.6 \
sasl-2.1.5.1 \
snmp-4.9.3 \
ssh-0.9.9.1 \
ssl-3.1.1.1 \
stdlib-1.14.5 \
runtime_tools-1.7 \
sasl-2.1.5.2 \
snmp-4.10 \
ssh-0.9.9.3 \
ssl-3.9 \
stdlib-1.15 \
syntax_tools-1.5.3 \
test_server-3.2.0 \
toolbar-1.3.0.1 \
tools-2.5.5 \
tools-2.6 \
tv-2.1.4.1 \
typer-0.1.0.1 \
webtool-0.8.3.1 \
xmerl-1.1.4
typer-0.1.1 \
webtool-0.8.3.2 \
xmerl-1.1.6

View File

@ -82,6 +82,7 @@ MAN3= CosEventChannelAdmin.3 \
any.3 \
application.3 \
appmon.3 \
array.3 \
asn1ct.3 \
asn1rt.3 \
auth.3 \
@ -104,7 +105,13 @@ MAN3= CosEventChannelAdmin.3 \
cprof.3 \
cpu_sup.3 \
crashdump.3 \
crypto.3 \
ct.3 \
ct_cover.3 \
ct_ftp.3 \
ct_master.3 \
ct_rpc.3 \
ct_snmp.3 \
ct_telnet.3 \
dbg.3 \
debugger.3 \
dets.3 \
@ -124,6 +131,7 @@ MAN3= CosEventChannelAdmin.3 \
edoc_layout.3 \
edoc_lib.3 \
edoc_run.3 \
egd.3 \
ei.3 \
ei_connect.3 \
epp.3 \
@ -198,6 +206,7 @@ MAN3= CosEventChannelAdmin.3 \
ic_clib.3 \
igor.3 \
inet.3 \
inets.3 \
init.3 \
instrument.3 \
int.3 \
@ -228,11 +237,9 @@ MAN3= CosEventChannelAdmin.3 \
megaco_udp.3 \
megaco_user.3 \
memsup.3 \
mnemosyne.3 \
mnesia.3 \
mnesia_frag_hash.3 \
mnesia_registry.3 \
mnesia_session.3 \
mod_alias.3 \
mod_auth.3 \
mod_esi.3 \
@ -256,6 +263,7 @@ MAN3= CosEventChannelAdmin.3 \
otp_mib.3 \
overload.3 \
packages.3 \
percept.3 \
pg.3 \
pg2.3 \
pman.3 \
@ -296,6 +304,7 @@ MAN3= CosEventChannelAdmin.3 \
snmpa_local_db.3 \
snmpa_mpd.3 \
snmpa_network_interface.3 \
snmpa_network_interface_filter.3 \
snmpa_notification_filter.3 \
snmpa_supervisor.3 \
snmpc.3 \
@ -313,19 +322,20 @@ MAN3= CosEventChannelAdmin.3 \
ssh_ssh.3 \
ssh_sshd.3 \
ssh_transport.3 \
ssl.3 \
ssl_pkix.3 \
string.3 \
supervisor.3 \
supervisor_bridge.3 \
sys.3 \
systools.3 \
tags.3 \
test_server.3 \
test_server_ctrl.3 \
tftp.3 \
timer.3 \
toolbar.3 \
ttb.3 \
tv.3 \
unix_telnet.3 \
user.3 \
webtool.3 \
win32reg.3 \
@ -348,12 +358,12 @@ MAN4= app.4 \
relup.4 \
script.4
MAN6= crypto.6 \
MAN6= common_test.6 \
docbuilder.6 \
kernel.6 \
observer.6 \
runtime_tools.6 \
sasl.6 \
snmp.6 \
ssl.6 \
stdlib.6
stdlib.6 \
test_server.6

View File

@ -1,9 +1,12 @@
MD5 (erlang/otp_src_R11B-5.tar.gz) = 96acec41da87d6ee0ef18e1aab36ffdd
SHA256 (erlang/otp_src_R11B-5.tar.gz) = d41fdfba40f86a50e04b7226ae5cc4581072fad26d14be5e1ca06603813bb175
SIZE (erlang/otp_src_R11B-5.tar.gz) = 38332865
MD5 (erlang/otp_doc_man_R11B-5.tar.gz) = 5c387162ae6d255f525d72a91481d135
SHA256 (erlang/otp_doc_man_R11B-5.tar.gz) = ab364af6e9db473d2bc5c0646a9b70989b858953ca9c053b78a509960a4f9caa
SIZE (erlang/otp_doc_man_R11B-5.tar.gz) = 725858
MD5 (erlang/otp_doc_html_R11B-5.tar.gz) = 6a40146d855f98d024682cd24e9bb5bc
SHA256 (erlang/otp_doc_html_R11B-5.tar.gz) = 7dea67980b958ffebf7a94f3d94bd9c874e041f4f5ee574c56aab62c54a71d28
SIZE (erlang/otp_doc_html_R11B-5.tar.gz) = 4968176
MD5 (erlang/otp_src_R12B-0.tar.gz) = 54cd5a83697c515f571e44d4ea99c8d3
SHA256 (erlang/otp_src_R12B-0.tar.gz) = 8415e7a4ab0e0f70df8d5e2f19e742ef8f6c0d1bdf91aa62968332cf3d92be57
SIZE (erlang/otp_src_R12B-0.tar.gz) = 41074760
MD5 (erlang/otp_doc_man_R12B-0.tar.gz) = aa3a12a16e03d1aadec40e265f51e7c6
SHA256 (erlang/otp_doc_man_R12B-0.tar.gz) = 028556cc1a7f36f483c16e4fd7838c797edec02890fea48a1a877cf01679de1a
SIZE (erlang/otp_doc_man_R12B-0.tar.gz) = 757429
MD5 (erlang/otp_doc_html_R12B-0.tar.gz) = ddbb484ebe97a837640e51305cc7557a
SHA256 (erlang/otp_doc_html_R12B-0.tar.gz) = 49f74badd49840e2a2316138e69fed6e188abc92d57c2edfe9e581ed54c4064c
SIZE (erlang/otp_doc_html_R12B-0.tar.gz) = 5859638
MD5 (erlang/otp_src_R12B-0-osp1.patch) = aa67b2cdc6c6fa885d145a982cd500cd
SHA256 (erlang/otp_src_R12B-0-osp1.patch) = f6f4992a424ebf460358cf45e5caa8bef4a19a600da4a04533e8f8e4b1c04b26
SIZE (erlang/otp_src_R12B-0-osp1.patch) = 50620

View File

@ -3,16 +3,16 @@ $FreeBSD$
--- lib/dialyzer/src/Makefile.orig
+++ lib/dialyzer/src/Makefile
@@ -66,8 +66,6 @@
dialyzer_succ_typings \
dialyzer_typesig
@@ -68,8 +68,6 @@
dialyzer_typesig \
dialyzer_utils
-EXTRA_FILES= ../plt/dialyzer_init_plt ## automatically generated
-
HRL_FILES= dialyzer.hrl
HRL_FILES= dialyzer.hrl dialyzer_callgraph.hrl
ERL_FILES= $(MODULES:%=%.erl)
INSTALL_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
@@ -91,13 +89,12 @@
@@ -92,13 +90,12 @@
# Targets
# ----------------------------------------------------
@ -27,7 +27,7 @@ $FreeBSD$
rm -f core
# ----------------------------------------------------
@@ -149,11 +146,10 @@
@@ -153,11 +150,10 @@
release_spec: opt
$(INSTALL_DIR) $(RELSYSDIR)/src

View File

@ -1,16 +0,0 @@
$FreeBSD$
--- lib/stdlib/src/io_lib_pretty.erl.orig
+++ lib/stdlib/src/io_lib_pretty.erl
@@ -159,7 +159,9 @@
%% Reuse the list created by io_lib:write_binary()...
pp_binary([LT,LT,S,GT,GT], Col, Ll, Ind, LD) ->
N = max(8, Ll - Col - LD),
- [LT,LT,pp_binary(S, N, N, Ind),GT,GT].
+ [LT,LT,pp_binary(S, N, N, Ind),GT,GT];
+pp_binary(S, _Col, _Ll, _Ind, _LD) ->
+ S.
pp_binary([BS, $, | S], N, N0, Ind) ->
Len = length(BS) + 1,