Attached is a patch which updates Erlang to the latest release R12B-2, for more
info: http://www.erlang.org/download/otp_src_R12B-2.readme
Makefile | 120 +++++++++++++++----------------
distinfo | 30 +++----
patches/patch-lib_stdlib_src_dets_v9_erl | 13 ---
pkg/PLIST | 57 +++++++++++---
4 files changed, 122 insertions(+), 98 deletions(-)
--
Jon
diff -ruN -x CVS erlang/Makefile erlang.new/Makefile
--- erlang/Makefile Thu Feb 14 23:44:36 2008
+++ erlang.new/Makefile Wed Apr 9 21:50:11 2008
@@ -2,9 +2,9 @@
COMMENT= real-time, concurrent and distributed functional language
-V= R12B-1
+V= R12B-2
DISTNAME= otp_src_${V}
-PKGNAME= erlang-12b.1
+PKGNAME= erlang-12b.2
CATEGORIES= lang
MAINTAINER= Jon Olsson <[EMAIL PROTECTED]>
@@ -41,63 +41,60 @@
DOC_DIR= ${PREFIX}/lib/erlang
-# retrieve most of the version list with something like
-# find ${WRKSRC} -name 'vsn.mk' -exec \
-# awk '/_VSN =/ { print $1"\t"$3" \\" }' {} \; | grep -v 'PRE'
+# Use the target 'gen-version' to update this list
ERL_VERSIONS= \
-ET_VSN 1.3 \
-GS_VSN 1.5.8 \
-IC_VSN 4.2.16 \
-TV_VSN 2.1.4.1 \
-SSH_VSN 0.9.9.5 \
-SSL_VSN 3.9 \
-ASN1_VSN 1.5 \
-EDOC_VSN 0.7.4 \
-HIPE_VSN 3.6.5 \
-ODBC_VSN 2.10 \
-PMAN_VSN 2.6 \
-SASL_VSN 2.1.5.2 \
-SNMP_VSN 4.10.1 \
-DIALYZER_VSN 1.7.2 \
-COSTIME_VSN 1.1.2 \
-PARSETOOLS_VSN 1.4.3 \
-INETS_VSN 5.0.2 \
-ORBER_VSN 3.6.8 \
-EMACS_VSN 2.4.13 \
-TOOLS_VSN 2.6.1 \
-TYPER_VSN 0.1.1 \
-XMERL_VSN 1.1.6 \
-COMMON_TEST_VSN 1.3.1 \
-SYNTAX_TOOLS_VSN 1.5.3 \
-EI_VSN 3.5.5.4 \
-OTP_MIBS_VSN 1.0.4.1 \
-APPMON_VSN 2.1.9 \
-CRYPTO_VSN 1.5.1.1 \
-COMPILER_VSN 4.5.1 \
-DEBUGGER_VSN 3.1.1.2 \
-COSEVENT_VSN 2.1.2 \
-TOOLBAR_VSN 1.3.0.1 \
-INVISO_VSN 0.6 \
-KERNEL_VSN 2.12.1 \
-MEGACO_VSN 3.7.1 \
-MNESIA_VSN 4.4 \
-OS_MON_VSN 2.1.5 \
-TEST_SERVER_VSN 3.2.1 \
-STDLIB_VSN 1.15.1 \
-DOCB_VSN 0.9.8 \
-COSFILETRANSFER_VSN 1.1.4 \
-JINTERFACE_VSN 1.4 \
-COSPROPERTY_VSN 1.1.5 \
-RUNTIME_TOOLS_VSN 1.7.1 \
-PERCEPT_VSN 0.6.2 \
-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.1 \
-DOCBUILDER_VSN 0.9.8 \
+ET_VSN 1.3 \
+GS_VSN 1.5.9 \
+IC_VSN 4.2.17 \
+TV_VSN 2.1.4.2 \
+SSH_VSN 0.9.9.6 \
+SSL_VSN 3.9 \
+ASN1_VSN 1.5.1 \
+EDOC_VSN 0.7.5 \
+HIPE_VSN 3.6.6 \
+ODBC_VSN 2.10 \
+PMAN_VSN 2.6 \
+SASL_VSN 2.1.5.2 \
+SNMP_VSN 4.10.3 \
+DIALYZER_VSN 1.8.0 \
+COSTIME_VSN 1.1.3 \
+PARSETOOLS_VSN 1.4.4 \
+INETS_VSN 5.0.5 \
+ORBER_VSN 3.6.9 \
+EMACS_VSN 2.4.13 \
+TOOLS_VSN 2.6.1 \
+TYPER_VSN 0.1.2 \
+XMERL_VSN 1.1.8 \
+COMMON_TEST_VSN 1.3.1 \
+SYNTAX_TOOLS_VSN 1.5.4 \
+EI_VSN 3.5.6 \
+OTP_MIBS_VSN 1.0.4.1 \
+APPMON_VSN 2.1.9 \
+CRYPTO_VSN 1.5.1.1 \
+COMPILER_VSN 4.5.2 \
+DEBUGGER_VSN 3.1.1.2 \
+COSEVENT_VSN 2.1.3 \
+TOOLBAR_VSN 1.3.0.1 \
+INVISO_VSN 0.6 \
+KERNEL_VSN 2.12.2 \
+MEGACO_VSN 3.7.4 \
+MNESIA_VSN 4.4.2 \
+OS_MON_VSN 2.1.5 \
+TEST_SERVER_VSN 3.2.2 \
+STDLIB_VSN 1.15.2 \
+DOCBUILDER_VSN 0.9.8.4 \
+COSFILETRANSFER_VSN 1.1.5 \
+JINTERFACE_VSN 1.4 \
+COSPROPERTY_VSN 1.1.6 \
+RUNTIME_TOOLS_VSN 1.7.2 \
+PERCEPT_VSN 0.7.1 \
+OBSERVER_VSN 0.9.7.4 \
+COSEVENTDOMAIN_VSN 1.1.3 \
+COSTRANSACTIONS_VSN 1.2.4 \
+COSNOTIFICATION_VSN 1.1.7 \
+SYSTEM_VSN R12B \
WEBTOOL_VSN 0.8.3.2 \
+ERTS_VSN 5.6.2
.for _n _v in ${ERL_VERSIONS}
${_n}=${_v}
@@ -119,13 +116,18 @@
post-configure:
@touch ${WRKSRC}/lib/odbc/SKIP
- # Ensure dets_v9.erl gets rebuilt
- @rm ${WRKSRC}/lib/stdlib/ebin/dets_v9.beam
post-install:
tar zxf ${FULLDISTDIR}/otp_doc_man_${V}.tar.gz -C ${DOC_DIR}
tar zxf ${FULLDISTDIR}/otp_doc_html_${V}.tar.gz -C ${DOC_DIR}
rm -rf ${DOC_DIR}/lib/${JINTERFACE}
rm -rf ${DOC_DIR}/lib/${ODBC}
+
+# Special maintainer target, scan through vsn.mk files and build 'ERL_VERSIONS'
+# list
+gen-versions: extract
+ @find ${WRKSRC} -name 'vsn.mk' -exec awk '/_VSN =/ { print $$1"\t"$$3 "
\\" }' {} \; | grep -v 'PRE' | sed 's/DOCB_VSN/DOCBUILDER_VSN/'
+ @find ${WRKSRC} -name 'vsn.mk' -exec awk -F'=' '/_VSN=/ { print
$$1"\t"$$2 " \\" }' {} \; | grep -v 'PRE'
+ @grep VSN ${WRKSRC}/erts/vsn.mk |awk '/^VSN/ { print "ERTS_VSN\t" $$3 }'
.include <bsd.port.mk>
diff -ruN -x CVS erlang/distinfo erlang.new/distinfo
--- erlang/distinfo Thu Feb 14 23:44:36 2008
+++ erlang.new/distinfo Wed Apr 9 13:52:03 2008
@@ -1,15 +1,15 @@
-MD5 (otp_doc_html_R12B-1.tar.gz) = Pdiu4X/L0+X9pzEyCPzmrA==
-MD5 (otp_doc_man_R12B-1.tar.gz) = ltpivPtA5dPsKUW7KwUAJA==
-MD5 (otp_src_R12B-1.tar.gz) = beNjC0RunCFQ7f4B44PJFw==
-RMD160 (otp_doc_html_R12B-1.tar.gz) = Mp/VED1JDZuBS6tJKJnFHCYh/4o=
-RMD160 (otp_doc_man_R12B-1.tar.gz) = N4pHOytJ0VW3BeXsUTX11KYytQk=
-RMD160 (otp_src_R12B-1.tar.gz) = q5aScv7VbuyFF1/W679xUkZS12Y=
-SHA1 (otp_doc_html_R12B-1.tar.gz) = 0fhrKK+Sg75k59ko70LGrpVvGNQ=
-SHA1 (otp_doc_man_R12B-1.tar.gz) = uIHZo1i2OhWFjRYabooi8mFeWYE=
-SHA1 (otp_src_R12B-1.tar.gz) = cOvKzb2q5EiLG7dlH+oeEkXrwMA=
-SHA256 (otp_doc_html_R12B-1.tar.gz) =
nrmanQ+bD5qZnSmYKfC6fmBfQEGkIpdAearMFM7I+AU=
-SHA256 (otp_doc_man_R12B-1.tar.gz) =
5nE7USHdDmufqZRctLySRStfUxPF8EszOmQMx+gVwNU=
-SHA256 (otp_src_R12B-1.tar.gz) = Hyso0Skdz4/nICYSd5FzzM4lfPQEXH0v95F/uaDVh5s=
-SIZE (otp_doc_html_R12B-1.tar.gz) = 5899379
-SIZE (otp_doc_man_R12B-1.tar.gz) = 772833
-SIZE (otp_src_R12B-1.tar.gz) = 41291517
+MD5 (otp_doc_html_R12B-2.tar.gz) = V+THr8DkMZJQqj/Hy9ECnQ==
+MD5 (otp_doc_man_R12B-2.tar.gz) = ZFpEhvAjOKXPIr51Y7hi+Q==
+MD5 (otp_src_R12B-2.tar.gz) = BYYcf3XXsu1a9CyTzr5YAQ==
+RMD160 (otp_doc_html_R12B-2.tar.gz) = 3c65sgqkhdiqucT0Pg8z/Iun640=
+RMD160 (otp_doc_man_R12B-2.tar.gz) = lj64JHri3znOT5mNcok+n/LWRqA=
+RMD160 (otp_src_R12B-2.tar.gz) = FHArkHwaLM4kA+LCTbgYeQQDlpc=
+SHA1 (otp_doc_html_R12B-2.tar.gz) = n7sfjlFKs0D/9DfnlCQ7TVMO1oI=
+SHA1 (otp_doc_man_R12B-2.tar.gz) = wyvhjMEhQSr5fZSOEmKhhSBsrcs=
+SHA1 (otp_src_R12B-2.tar.gz) = o4rfBJim0PUDiJnZ9KiszJNef/0=
+SHA256 (otp_doc_html_R12B-2.tar.gz) =
8WmsykUOuE1YN3sfq+4YJo6pzxpZOTwLlw/v24lLdx4=
+SHA256 (otp_doc_man_R12B-2.tar.gz) =
cSFAr0tJz2lvaWgkThOnU8tvU8CeRv7bjZNAe/IclcQ=
+SHA256 (otp_src_R12B-2.tar.gz) = uoSvUrX/EAKan2jAPVPDUNNZyh7ZJHrGCXZXRmkqicE=
+SIZE (otp_doc_html_R12B-2.tar.gz) = 5616891
+SIZE (otp_doc_man_R12B-2.tar.gz) = 777982
+SIZE (otp_src_R12B-2.tar.gz) = 41190987
diff -ruN -x CVS erlang/patches/patch-lib_stdlib_src_dets_v9_erl
erlang.new/patches/patch-lib_stdlib_src_dets_v9_erl
--- erlang/patches/patch-lib_stdlib_src_dets_v9_erl Thu Feb 14 23:44:36 2008
+++ erlang.new/patches/patch-lib_stdlib_src_dets_v9_erl Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
-Fixes issue described in
http://thread.gmane.org/gmane.comp.lang.erlang.general/27478
-$OpenBSD: patch-lib_stdlib_src_dets_v9_erl,v 1.1 2008/02/14 22:44:36 sthen Exp
$
---- lib/stdlib/src/dets_v9.erl.orig Thu Feb 7 16:22:04 2008
-+++ lib/stdlib/src/dets_v9.erl Thu Feb 7 16:22:39 2008
-@@ -1934,6 +1934,8 @@ grow(Head, Extra, _SegZero) when Extra =< 0 ->
- {Head, ok};
- grow(Head, Extra, undefined) ->
- grow(Head, Extra, seg_zero());
-+grow(Head, _Extra, _SegZero) when Head#head.next >= Head#head.max_no_slots ->
-+ {Head, ok};
- grow(Head, Extra, SegZero) ->
- #head{n = N, next = Next, m = M} = Head,
- SegNum = Next div ?SEGSZP,
diff -ruN -x CVS erlang/pkg/PLIST erlang.new/pkg/PLIST
--- erlang/pkg/PLIST Thu Feb 14 23:44:36 2008
+++ erlang.new/pkg/PLIST Wed Apr 9 21:34:32 2008
@@ -341,6 +341,7 @@
lib/erlang/${ERTS}/include/internal/
lib/erlang/${ERTS}/include/internal/README
lib/erlang/${ERTS}/include/internal/erl_memory_trace_protocol.h
+lib/erlang/${ERTS}/include/internal/erl_misc_utils.h
lib/erlang/${ERTS}/include/internal/erl_printf.h
lib/erlang/${ERTS}/include/internal/erl_printf_format.h
lib/erlang/${ERTS}/include/internal/ethread.h
@@ -2015,7 +2016,6 @@
lib/erlang/lib/${DIALYZER}/doc/html/ref_man_term.html
lib/erlang/lib/${DIALYZER}/doc/html/warning.gif
lib/erlang/lib/${DIALYZER}/doc/manual.txt
-lib/erlang/lib/${DIALYZER}/doc/overview.txt
lib/erlang/lib/${DIALYZER}/doc/warnings.txt
lib/erlang/lib/${DIALYZER}/ebin/
lib/erlang/lib/${DIALYZER}/ebin/dialyzer.app
@@ -2030,7 +2030,6 @@
lib/erlang/lib/${DIALYZER}/ebin/dialyzer_dataflow.beam
lib/erlang/lib/${DIALYZER}/ebin/dialyzer_dep.beam
lib/erlang/lib/${DIALYZER}/ebin/dialyzer_gui.beam
-lib/erlang/lib/${DIALYZER}/ebin/dialyzer_icode.beam
lib/erlang/lib/${DIALYZER}/ebin/dialyzer_options.beam
lib/erlang/lib/${DIALYZER}/ebin/dialyzer_plt.beam
lib/erlang/lib/${DIALYZER}/ebin/dialyzer_succ_typings.beam
@@ -2051,7 +2050,6 @@
lib/erlang/lib/${DIALYZER}/src/dialyzer_dataflow.erl
lib/erlang/lib/${DIALYZER}/src/dialyzer_dep.erl
lib/erlang/lib/${DIALYZER}/src/dialyzer_gui.erl
-lib/erlang/lib/${DIALYZER}/src/dialyzer_icode.erl
lib/erlang/lib/${DIALYZER}/src/dialyzer_options.erl
lib/erlang/lib/${DIALYZER}/src/dialyzer_plt.erl
lib/erlang/lib/${DIALYZER}/src/dialyzer_succ_typings.erl
@@ -4640,13 +4638,10 @@
lib/erlang/lib/${ORBER}/include/orber_pi.hrl
lib/erlang/lib/${ORBER}/info
lib/erlang/lib/${ORBER}/priv/
-lib/erlang/lib/${ORBER}/priv/bin/
-lib/erlang/lib/${ORBER}/priv/bin/obj_init_port
lib/erlang/lib/${ORBER}/priv/blank.html
lib/erlang/lib/${ORBER}/priv/include/
lib/erlang/lib/${ORBER}/priv/include/InitialReference.hh
lib/erlang/lib/${ORBER}/priv/info_frames.html
-lib/erlang/lib/${ORBER}/priv/lib/
lib/erlang/lib/${ORBER}/priv/main_frame.html
lib/erlang/lib/${ORBER}/priv/orber.tool
lib/erlang/lib/${ORBER}/priv/orber_help.txt
@@ -4913,7 +4908,50 @@
lib/erlang/lib/${PERCEPT}/doc/html/test2.gif
lib/erlang/lib/${PERCEPT}/doc/html/test3.gif
lib/erlang/lib/${PERCEPT}/doc/html/test4.gif
+lib/erlang/lib/${PERCEPT}/ebin/
+lib/erlang/lib/${PERCEPT}/ebin/egd.beam
+lib/erlang/lib/${PERCEPT}/ebin/egd_font.beam
+lib/erlang/lib/${PERCEPT}/ebin/egd_png.beam
+lib/erlang/lib/${PERCEPT}/ebin/egd_primitives.beam
+lib/erlang/lib/${PERCEPT}/ebin/egd_render.beam
+lib/erlang/lib/${PERCEPT}/ebin/percept.app
+lib/erlang/lib/${PERCEPT}/ebin/percept.appup
+lib/erlang/lib/${PERCEPT}/ebin/percept.beam
+lib/erlang/lib/${PERCEPT}/ebin/percept_analyzer.beam
+lib/erlang/lib/${PERCEPT}/ebin/percept_db.beam
+lib/erlang/lib/${PERCEPT}/ebin/percept_graph.beam
+lib/erlang/lib/${PERCEPT}/ebin/percept_html.beam
+lib/erlang/lib/${PERCEPT}/ebin/percept_image.beam
lib/erlang/lib/${PERCEPT}/info
+lib/erlang/lib/${PERCEPT}/priv/
+lib/erlang/lib/${PERCEPT}/priv/fonts/
+lib/erlang/lib/${PERCEPT}/priv/fonts/6x11_latin1.wingsfont
+lib/erlang/lib/${PERCEPT}/priv/logs/
+lib/erlang/lib/${PERCEPT}/priv/server_root/
+lib/erlang/lib/${PERCEPT}/priv/server_root/conf/
+lib/erlang/lib/${PERCEPT}/priv/server_root/conf/mime.types
+lib/erlang/lib/${PERCEPT}/priv/server_root/css/
+lib/erlang/lib/${PERCEPT}/priv/server_root/css/percept.css
+lib/erlang/lib/${PERCEPT}/priv/server_root/htdocs/
+lib/erlang/lib/${PERCEPT}/priv/server_root/htdocs/guide.html
+lib/erlang/lib/${PERCEPT}/priv/server_root/htdocs/index.html
+lib/erlang/lib/${PERCEPT}/priv/server_root/images/
+lib/erlang/lib/${PERCEPT}/priv/server_root/scripts/
+lib/erlang/lib/${PERCEPT}/priv/server_root/scripts/percept_area_select.js
+lib/erlang/lib/${PERCEPT}/priv/server_root/scripts/percept_error_handler.js
+lib/erlang/lib/${PERCEPT}/priv/server_root/scripts/percept_select_all.js
+lib/erlang/lib/${PERCEPT}/src/
+lib/erlang/lib/${PERCEPT}/src/egd.erl
+lib/erlang/lib/${PERCEPT}/src/egd_font.erl
+lib/erlang/lib/${PERCEPT}/src/egd_png.erl
+lib/erlang/lib/${PERCEPT}/src/egd_primitives.erl
+lib/erlang/lib/${PERCEPT}/src/egd_render.erl
+lib/erlang/lib/${PERCEPT}/src/percept.erl
+lib/erlang/lib/${PERCEPT}/src/percept_analyzer.erl
+lib/erlang/lib/${PERCEPT}/src/percept_db.erl
+lib/erlang/lib/${PERCEPT}/src/percept_graph.erl
+lib/erlang/lib/${PERCEPT}/src/percept_html.erl
+lib/erlang/lib/${PERCEPT}/src/percept_image.erl
lib/erlang/lib/${PMAN}/
lib/erlang/lib/${PMAN}/doc/
lib/erlang/lib/${PMAN}/doc/html/
@@ -6421,22 +6459,19 @@
lib/erlang/lib/${TYPER}/ebin/typer.app
lib/erlang/lib/${TYPER}/ebin/typer.appup
lib/erlang/lib/${TYPER}/ebin/typer.beam
-lib/erlang/lib/${TYPER}/ebin/typer_generator.beam
+lib/erlang/lib/${TYPER}/ebin/typer_annotator.beam
lib/erlang/lib/${TYPER}/ebin/typer_info.beam
lib/erlang/lib/${TYPER}/ebin/typer_map.beam
lib/erlang/lib/${TYPER}/ebin/typer_options.beam
-lib/erlang/lib/${TYPER}/ebin/typer_parse.beam
lib/erlang/lib/${TYPER}/ebin/typer_preprocess.beam
lib/erlang/lib/${TYPER}/src/
lib/erlang/lib/${TYPER}/src/typer.erl
lib/erlang/lib/${TYPER}/src/typer.hrl
-lib/erlang/lib/${TYPER}/src/typer_generator.erl
+lib/erlang/lib/${TYPER}/src/typer_annotator.erl
lib/erlang/lib/${TYPER}/src/typer_info.erl
lib/erlang/lib/${TYPER}/src/typer_map.erl
lib/erlang/lib/${TYPER}/src/typer_options.erl
lib/erlang/lib/${TYPER}/src/typer_options.hrl
-lib/erlang/lib/${TYPER}/src/typer_parse.erl
-lib/erlang/lib/${TYPER}/src/typer_parse.yrl
lib/erlang/lib/${TYPER}/src/typer_preprocess.erl
lib/erlang/lib/${WEBTOOL}/
lib/erlang/lib/${WEBTOOL}/doc/
