summaryrefslogtreecommitdiff
path: root/lang/erlang14
diff options
context:
space:
mode:
authorJimmy Olgeni <olgeni@FreeBSD.org>2008-02-07 22:40:44 +0000
committerJimmy Olgeni <olgeni@FreeBSD.org>2008-02-07 22:40:44 +0000
commit455d7f5a30cc98838e1b5436f9eb9d5dcf486a3d (patch)
tree705f458fc46c3d42375e35e409095e6f309d0a50 /lang/erlang14
parent- Fix build with gcc 4.2 (diff)
Upgrade to version R12B-1.
Notes
Notes: svn path=/head/; revision=206869
Diffstat (limited to 'lang/erlang14')
-rw-r--r--lang/erlang14/Makefile10
-rw-r--r--lang/erlang14/Makefile.lib46
-rw-r--r--lang/erlang14/Makefile.man7
-rw-r--r--lang/erlang14/distinfo21
-rw-r--r--lang/erlang14/files/patch-erts-emulator-drivers-common-inet_drv.c29
-rw-r--r--lang/erlang14/files/patch-erts_configure149
6 files changed, 43 insertions, 219 deletions
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index 5e02a247fc73..291658cffa31 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= erlang
-PORTVERSION= r12b0.1
+PORTVERSION= r12b1
PORTEPOCH= 1
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/ \
@@ -14,14 +14,12 @@ 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_R12B-0
+DISTNAME= otp_src_R12B-1
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
@@ -78,9 +76,9 @@ LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc
.endif
.endif
-ERLANG_MAN= otp_doc_man_R12B-0.tar.gz
+ERLANG_MAN= otp_doc_man_R12B-1.tar.gz
.if !defined(NOPORTDOCS)
-ERLANG_DOCS= otp_doc_html_R12B-0.tar.gz
+ERLANG_DOCS= otp_doc_html_R12B-1.tar.gz
.endif
ERLANG_PLIST= ${WRKDIR}/pkg-plist
diff --git a/lang/erlang14/Makefile.lib b/lang/erlang14/Makefile.lib
index 94d9672a49bf..57b8f3d0279a 100644
--- a/lang/erlang14/Makefile.lib
+++ b/lang/erlang14/Makefile.lib
@@ -1,11 +1,11 @@
# $FreeBSD$
-ERTS_VSN= 5.6
-TOOLS_VSN= 2.6
+ERTS_VSN= 5.6.1
+TOOLS_VSN= 2.6.1
OTP_LIBS= appmon-2.1.9 \
asn1-1.5 \
- common_test-1.3.0 \
- compiler-4.5 \
+ common_test-1.3.1 \
+ compiler-4.5.1 \
cosEvent-2.1.2 \
cosEventDomain-1.1.2 \
cosFileTransfer-1.1.4 \
@@ -14,39 +14,39 @@ OTP_LIBS= appmon-2.1.9 \
cosTime-1.1.2 \
cosTransactions-1.2.3 \
crypto-1.5.1.1 \
- debugger-3.1.1.1 \
- dialyzer-1.7.1 \
- docbuilder-0.9.7 \
+ debugger-3.1.1.2 \
+ dialyzer-1.7.2 \
+ docbuilder-0.9.8 \
edoc-0.7.4 \
- erl_interface-3.5.5.3 \
+ erl_interface-3.5.5.4 \
et-1.3 \
- gs-1.5.7 \
- hipe-3.6.4 \
+ gs-1.5.8 \
+ hipe-3.6.5 \
ic-4.2.16 \
- inets-5.0 \
+ inets-5.0.2 \
inviso-0.6 \
jinterface-1.4 \
- kernel-2.12 \
- megaco-3.7 \
+ kernel-2.12.1 \
+ megaco-3.7.1 \
mnesia-4.4 \
observer-0.9.7.4 \
- odbc-2.0.9 \
+ odbc-2.10 \
orber-3.6.8 \
- os_mon-2.1.3 \
+ os_mon-2.1.5 \
otp_mibs-1.0.4.1 \
- parsetools-1.4.2 \
- percept-0.5.0 \
+ parsetools-1.4.3 \
+ percept-0.6.2 \
pman-2.6 \
- runtime_tools-1.7 \
+ runtime_tools-1.7.1 \
sasl-2.1.5.2 \
- snmp-4.10 \
- ssh-0.9.9.3 \
+ snmp-4.10.1 \
+ ssh-0.9.9.5 \
ssl-3.9 \
- stdlib-1.15 \
+ stdlib-1.15.1 \
syntax_tools-1.5.3 \
- test_server-3.2.0 \
+ test_server-3.2.1 \
toolbar-1.3.0.1 \
- tools-2.6 \
+ tools-2.6.1 \
tv-2.1.4.1 \
typer-0.1.1 \
webtool-0.8.3.2 \
diff --git a/lang/erlang14/Makefile.man b/lang/erlang14/Makefile.man
index 9acff375e529..9a5624ecbeff 100644
--- a/lang/erlang14/Makefile.man
+++ b/lang/erlang14/Makefile.man
@@ -105,6 +105,7 @@ MAN3= CosEventChannelAdmin.3 \
cprof.3 \
cpu_sup.3 \
crashdump.3 \
+ crypto.3 \
ct.3 \
ct_cover.3 \
ct_ftp.3 \
@@ -247,6 +248,7 @@ MAN3= CosEventChannelAdmin.3 \
ms_transform.3 \
net_adm.3 \
net_kernel.3 \
+ new_ssl.3 \
nteventlog.3 \
odbc.3 \
orber.3 \
@@ -264,6 +266,7 @@ MAN3= CosEventChannelAdmin.3 \
overload.3 \
packages.3 \
percept.3 \
+ percept_profile.3 \
pg.3 \
pg2.3 \
pman.3 \
@@ -322,6 +325,8 @@ MAN3= CosEventChannelAdmin.3 \
ssh_ssh.3 \
ssh_sshd.3 \
ssh_transport.3 \
+ ssl.3 \
+ ssl_pkix.3 \
string.3 \
supervisor.3 \
supervisor_bridge.3 \
@@ -359,11 +364,13 @@ MAN4= app.4 \
script.4
MAN6= common_test.6 \
+ crypto.6 \
docbuilder.6 \
kernel.6 \
observer.6 \
runtime_tools.6 \
sasl.6 \
snmp.6 \
+ ssl.6 \
stdlib.6 \
test_server.6
diff --git a/lang/erlang14/distinfo b/lang/erlang14/distinfo
index 6a426f98683c..31aeaf77b6b4 100644
--- a/lang/erlang14/distinfo
+++ b/lang/erlang14/distinfo
@@ -1,12 +1,9 @@
-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
+MD5 (erlang/otp_src_R12B-1.tar.gz) = 6de3630b446e9c2150edfe01e383c917
+SHA256 (erlang/otp_src_R12B-1.tar.gz) = 1f2b28d1291dcf8fe7202612779173ccce257cf4045c7d2ff7917fb9a0d5879b
+SIZE (erlang/otp_src_R12B-1.tar.gz) = 41291517
+MD5 (erlang/otp_doc_man_R12B-1.tar.gz) = 96da62bcfb40e5d3ec2945bb2b050024
+SHA256 (erlang/otp_doc_man_R12B-1.tar.gz) = e6713b5121dd0e6b9fa9945cb4bc92452b5f5313c5f04b333a640cc7e815c0d5
+SIZE (erlang/otp_doc_man_R12B-1.tar.gz) = 772833
+MD5 (erlang/otp_doc_html_R12B-1.tar.gz) = 3dd8aee17fcbd3e5fda7313208fce6ac
+SHA256 (erlang/otp_doc_html_R12B-1.tar.gz) = 9eb99a9d0f9b0f9a999d299829f0ba7e605f4041a422974079aacc14cec8f805
+SIZE (erlang/otp_doc_html_R12B-1.tar.gz) = 5899379
diff --git a/lang/erlang14/files/patch-erts-emulator-drivers-common-inet_drv.c b/lang/erlang14/files/patch-erts-emulator-drivers-common-inet_drv.c
deleted file mode 100644
index f7d48c82139c..000000000000
--- a/lang/erlang14/files/patch-erts-emulator-drivers-common-inet_drv.c
+++ /dev/null
@@ -1,29 +0,0 @@
-
-$FreeBSD$
-
---- erts/emulator/drivers/common/inet_drv.c.orig
-+++ erts/emulator/drivers/common/inet_drv.c
-@@ -5684,7 +5684,11 @@
- arg.es.sctp_peer_error_event = get_int8(curr); curr++;
- arg.es.sctp_shutdown_event = get_int8(curr); curr++;
- arg.es.sctp_partial_delivery_event = get_int8(curr); curr++;
-+# ifdef HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE_SCTP_ADAPTATION_LAYER_EVENT
-+ arg.es.sctp_adaptation_layer_event = get_int8(curr); curr++;
-+# else
- arg.es.sctp_adaption_layer_event = get_int8(curr); curr++;
-+# endif
-
- proto = IPPROTO_SCTP;
- type = SCTP_EVENTS;
-@@ -6580,7 +6584,11 @@
- i = LOAD_BOOL (spec, i, evs.sctp_peer_error_event);
- i = LOAD_BOOL (spec, i, evs.sctp_shutdown_event);
- i = LOAD_BOOL (spec, i, evs.sctp_partial_delivery_event);
-+# ifdef HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE_SCTP_ADAPTATION_LAYER_EVENT
-+ i = LOAD_BOOL (spec, i, evs.sctp_adaptation_layer_event);
-+# else
- i = LOAD_BOOL (spec, i, evs.sctp_adaption_layer_event);
-+# endif
- /* NB: sctp_authentication_event is not yet supported in Linux */
- i = LOAD_TUPLE (spec, i, 9);
- i = LOAD_TUPLE (spec, i, 2);
diff --git a/lang/erlang14/files/patch-erts_configure b/lang/erlang14/files/patch-erts_configure
deleted file mode 100644
index a2756de41f1b..000000000000
--- a/lang/erlang14/files/patch-erts_configure
+++ /dev/null
@@ -1,149 +0,0 @@
-
-$FreeBSD$
-
---- erts/configure.orig
-+++ erts/configure
-@@ -11040,6 +11040,125 @@
-
-
- fi
-+echo "$as_me:$LINENO: checking for struct sctp_event_subscribe.sctp_adaptation_layer_event" >&5
-+echo $ECHO_N "checking for struct sctp_event_subscribe.sctp_adaptation_layer_event... $ECHO_C" >&6
-+if test "${ac_cv_member_struct_sctp_event_subscribe_sctp_adaptation_layer_event+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#if HAVE_SYS_SOCKET_H
-+ #include <sys/socket.h>
-+ #endif
-+ #include <netinet/sctp.h>
-+
-+
-+int
-+main ()
-+{
-+static struct sctp_event_subscribe ac_aggr;
-+if (ac_aggr.sctp_adaptation_layer_event)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_member_struct_sctp_event_subscribe_sctp_adaptation_layer_event=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#if HAVE_SYS_SOCKET_H
-+ #include <sys/socket.h>
-+ #endif
-+ #include <netinet/sctp.h>
-+
-+
-+int
-+main ()
-+{
-+static struct sctp_event_subscribe ac_aggr;
-+if (sizeof ac_aggr.sctp_adaptation_layer_event)
-+return 0;
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag"
-+ || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest.$ac_objext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_member_struct_sctp_event_subscribe_sctp_adaptation_layer_event=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_member_struct_sctp_event_subscribe_sctp_adaptation_layer_event=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_member_struct_sctp_event_subscribe_sctp_adaptation_layer_event" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_sctp_event_subscribe_sctp_adaptation_layer_event" >&6
-+if test $ac_cv_member_struct_sctp_event_subscribe_sctp_adaptation_layer_event = yes; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE_SCTP_ADAPTATION_LAYER_EVENT 1
-+_ACEOF
-+
-+
-+fi
-
- fi
-
-@@ -19219,7 +19338,7 @@
- DED_LD_FLAG_RUNTIME_LIBRARY_PATH=
- STATIC_CFLAGS="-mdynamic-no-pic"
- ;;
-- linux*)
-+ linux*|freebsd*)
- DED_LD="$CC"
- DED_LDFLAGS="-shared"
- ;;
-@@ -19530,7 +19649,7 @@
- /bin/rm -f $ERL_TOP/lib/$a/SKIP
- done
-
--SSL_DYNAMIC_ONLY=no
-+SSL_DYNAMIC_ONLY=yes
-
- if test "x$with_ssl" = "xno"; then
- SSL_APP=
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 14:48:29 +0000