aboutsummaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorJimmy Olgeni <olgeni@FreeBSD.org>2017-06-24 18:34:56 +0000
committerJimmy Olgeni <olgeni@FreeBSD.org>2017-06-24 18:34:56 +0000
commit3e78d2942863bc7c9761c0894ccd6cd506e547e6 (patch)
treebc8deb1ef3293cdcb66f25ef27142a89138d1e8a /lang
parenta868e64a6433fbed6018781e91a380fabedf20e9 (diff)
downloadports-3e78d2942863bc7c9761c0894ccd6cd506e547e6.tar.gz
ports-3e78d2942863bc7c9761c0894ccd6cd506e547e6.zip
Downgrade Erlang to version 19 until it is clear how the new term format
affects all ports, or dependencies on runtime19 are in place.
Notes
Notes: svn path=/head/; revision=444236
Diffstat (limited to 'lang')
-rw-r--r--lang/erlang-java/Makefile10
-rw-r--r--lang/erlang-java/distinfo22
-rw-r--r--lang/erlang-wx/Makefile10
-rw-r--r--lang/erlang-wx/distinfo22
-rw-r--r--lang/erlang-wx/files/patch-lib_wx_c__src_wxe__impl.cpp20
-rw-r--r--lang/erlang/Makefile44
-rw-r--r--lang/erlang/distinfo26
-rw-r--r--lang/erlang/files/patch-lib_wx_c__src_wxe__impl.cpp20
-rw-r--r--lang/erlang/pkg-plist1
9 files changed, 143 insertions, 32 deletions
diff --git a/lang/erlang-java/Makefile b/lang/erlang-java/Makefile
index 3deabae22270..9a3997688c60 100644
--- a/lang/erlang-java/Makefile
+++ b/lang/erlang-java/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= erlang
-PORTVERSION= 20.0
+PORTVERSION= 19.3.6
+PORTEPOCH= 1
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \
@@ -14,7 +15,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \
LOCAL/olgeni
-PATCHFILES=
+PATCHFILES= patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \
+ patch-otp-19.3.4 patch-otp-19.3.5 patch-otp-19.3.6
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Erlang interface for Java
@@ -31,14 +33,14 @@ MAKE_JOBS_UNSAFE=yes
OPTIONS_DEFINE= DOCS
-ERL_RELEASE= 20.0
+ERL_RELEASE= 19.3
USES= gmake ncurses perl5
USE_PERL5= build
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
-APP_VERSION= 1.8
+APP_VERSION= 1.7.1
APP_DIR= ${PREFIX}/lib/erlang/lib/jinterface-${APP_VERSION}
.include <bsd.port.options.mk>
diff --git a/lang/erlang-java/distinfo b/lang/erlang-java/distinfo
index 3238c53de5bb..d2eca71de1bb 100644
--- a/lang/erlang-java/distinfo
+++ b/lang/erlang-java/distinfo
@@ -1,5 +1,17 @@
-TIMESTAMP = 1498165640
-SHA256 (erlang/otp_src_20.0.tar.gz) = fe80e1e14a2772901be717694bb30ac4e9a07eee0cc7a28988724cbd21476811
-SIZE (erlang/otp_src_20.0.tar.gz) = 87346046
-SHA256 (erlang/otp_doc_html_20.0.tar.gz) = 1ab25110b148ce263d6e68cd5a3b912299b6066cfcd9d2fce416a4e9b7d2543a
-SIZE (erlang/otp_doc_html_20.0.tar.gz) = 33948386
+TIMESTAMP = 1496937518
+SHA256 (erlang/otp_src_19.3.tar.gz) = fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83
+SIZE (erlang/otp_src_19.3.tar.gz) = 68510871
+SHA256 (erlang/otp_doc_html_19.3.tar.gz) = dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c
+SIZE (erlang/otp_doc_html_19.3.tar.gz) = 35818689
+SHA256 (erlang/patch-otp-19.3.1) = 2373f890516b58ae006812ba5f15e4af1f8820be98230011b8cd8b345f51dedd
+SIZE (erlang/patch-otp-19.3.1) = 30225
+SHA256 (erlang/patch-otp-19.3.2) = 21c56ac188177985c9db11c7066dcee0f7370760da3e15a0d03c235bd2a2cb2a
+SIZE (erlang/patch-otp-19.3.2) = 6290
+SHA256 (erlang/patch-otp-19.3.3) = dbe1cab750a3339c3755db27b800e53232519c84a304bd562263ffb060afab55
+SIZE (erlang/patch-otp-19.3.3) = 12525
+SHA256 (erlang/patch-otp-19.3.4) = 02437ac753932f913209102e8cb249a264b774833bfda8c1532b338af60ff8af
+SIZE (erlang/patch-otp-19.3.4) = 13504
+SHA256 (erlang/patch-otp-19.3.5) = 5755da205004ae7e724390958db9ecc737d99ec14e0d14abcec8b8603ea6ece5
+SIZE (erlang/patch-otp-19.3.5) = 44563
+SHA256 (erlang/patch-otp-19.3.6) = ee1b5f0fd64db3322031c38722aee96a8ee35aaac454f430c829446a198f6534
+SIZE (erlang/patch-otp-19.3.6) = 13073
diff --git a/lang/erlang-wx/Makefile b/lang/erlang-wx/Makefile
index f757425bd20c..0d28d9112c00 100644
--- a/lang/erlang-wx/Makefile
+++ b/lang/erlang-wx/Makefile
@@ -1,7 +1,8 @@
# $FreeBSD$
PORTNAME= erlang
-PORTVERSION= 20.0
+PORTVERSION= 19.3.6
+PORTEPOCH= 1
CATEGORIES= lang parallel
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \
@@ -14,7 +15,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \
LOCAL/olgeni
-PATCHFILES=
+PATCHFILES= patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \
+ patch-otp-19.3.4 patch-otp-19.3.5 patch-otp-19.3.6
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Erlang bindings for wxWindows
@@ -32,14 +34,14 @@ MAKE_JOBS_UNSAFE=yes
OPTIONS_DEFINE= DOCS
-ERL_RELEASE= 20.0
+ERL_RELEASE= 19.3
USES= gmake
USE_GL= gl glu
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
-APP_VERSION= 1.8.1
+APP_VERSION= 1.8
APP_DIR= ${PREFIX}/lib/erlang/lib/wx-${APP_VERSION}
.include <bsd.port.options.mk>
diff --git a/lang/erlang-wx/distinfo b/lang/erlang-wx/distinfo
index a655e15e731c..f1b2554b7cdb 100644
--- a/lang/erlang-wx/distinfo
+++ b/lang/erlang-wx/distinfo
@@ -1,5 +1,17 @@
-TIMESTAMP = 1498166065
-SHA256 (erlang/otp_src_20.0.tar.gz) = fe80e1e14a2772901be717694bb30ac4e9a07eee0cc7a28988724cbd21476811
-SIZE (erlang/otp_src_20.0.tar.gz) = 87346046
-SHA256 (erlang/otp_doc_html_20.0.tar.gz) = 1ab25110b148ce263d6e68cd5a3b912299b6066cfcd9d2fce416a4e9b7d2543a
-SIZE (erlang/otp_doc_html_20.0.tar.gz) = 33948386
+TIMESTAMP = 1496937511
+SHA256 (erlang/otp_src_19.3.tar.gz) = fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83
+SIZE (erlang/otp_src_19.3.tar.gz) = 68510871
+SHA256 (erlang/otp_doc_html_19.3.tar.gz) = dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c
+SIZE (erlang/otp_doc_html_19.3.tar.gz) = 35818689
+SHA256 (erlang/patch-otp-19.3.1) = 2373f890516b58ae006812ba5f15e4af1f8820be98230011b8cd8b345f51dedd
+SIZE (erlang/patch-otp-19.3.1) = 30225
+SHA256 (erlang/patch-otp-19.3.2) = 21c56ac188177985c9db11c7066dcee0f7370760da3e15a0d03c235bd2a2cb2a
+SIZE (erlang/patch-otp-19.3.2) = 6290
+SHA256 (erlang/patch-otp-19.3.3) = dbe1cab750a3339c3755db27b800e53232519c84a304bd562263ffb060afab55
+SIZE (erlang/patch-otp-19.3.3) = 12525
+SHA256 (erlang/patch-otp-19.3.4) = 02437ac753932f913209102e8cb249a264b774833bfda8c1532b338af60ff8af
+SIZE (erlang/patch-otp-19.3.4) = 13504
+SHA256 (erlang/patch-otp-19.3.5) = 5755da205004ae7e724390958db9ecc737d99ec14e0d14abcec8b8603ea6ece5
+SIZE (erlang/patch-otp-19.3.5) = 44563
+SHA256 (erlang/patch-otp-19.3.6) = ee1b5f0fd64db3322031c38722aee96a8ee35aaac454f430c829446a198f6534
+SIZE (erlang/patch-otp-19.3.6) = 13073
diff --git a/lang/erlang-wx/files/patch-lib_wx_c__src_wxe__impl.cpp b/lang/erlang-wx/files/patch-lib_wx_c__src_wxe__impl.cpp
new file mode 100644
index 000000000000..5b1e66586f2f
--- /dev/null
+++ b/lang/erlang-wx/files/patch-lib_wx_c__src_wxe__impl.cpp
@@ -0,0 +1,20 @@
+--- lib/wx/c_src/wxe_impl.cpp.orig 2017-01-30 23:13:25 UTC
++++ lib/wx/c_src/wxe_impl.cpp
+@@ -666,7 +666,7 @@ void * WxeApp::getPtr(char * bp, wxeMemE
+ throw wxe_badarg(index);
+ }
+ void * temp = memenv->ref2ptr[index];
+- if((index < memenv->next) && ((index == 0) || (temp > NULL)))
++ if((index < memenv->next) && ((index == 0) || (temp != NULL)))
+ return temp;
+ else {
+ throw wxe_badarg(index);
+@@ -678,7 +678,7 @@ void WxeApp::registerPid(char * bp, ErlD
+ if(!memenv)
+ throw wxe_badarg(index);
+ void * temp = memenv->ref2ptr[index];
+- if((index < memenv->next) && ((index == 0) || (temp > NULL))) {
++ if((index < memenv->next) && ((index == 0) || (temp != NULL))) {
+ ptrMap::iterator it;
+ it = ptr2ref.find(temp);
+ if(it != ptr2ref.end()) {
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 5a0b85540ef8..3a8eb737b859 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= erlang
-PORTVERSION= 20.0
-PORTEPOCH= 3
+PORTVERSION= 19.3.6
+PORTEPOCH= 4
CATEGORIES= lang parallel java
MASTER_SITES= http://www.erlang.org/download/:erlangorg \
http://erlang.stacken.kth.se/download/:erlangorg \
@@ -20,7 +20,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \
LOCAL/olgeni
-PATCHFILES=
+PATCHFILES= patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \
+ patch-otp-19.3.4 patch-otp-19.3.5 patch-otp-19.3.6
MAINTAINER= olgeni@FreeBSD.org
COMMENT= Functional programming language from Ericsson
@@ -65,7 +66,7 @@ OPTIONS_EXCLUDE_i386= DTRACE
# ld(1) fails to link probes: missing __dtrace_erlang___* symbols
OPTIONS_EXCLUDE_aarch64= DTRACE
-ERL_RELEASE= 20.0
+ERL_RELEASE= 19.3
USES= gmake ncurses perl5
USE_PERL5= build
@@ -73,9 +74,9 @@ USE_RC_SUBR= epmd
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
-EI_VSN= 3.10
-SNMP_VSN= 5.2.6
-TOOLS_VSN= 2.10
+EI_VSN= 3.9.3
+SNMP_VSN= 5.2.5
+TOOLS_VSN= 2.9.1
.include <bsd.port.options.mk>
@@ -233,6 +234,35 @@ post-install:
.if ${PORT_OPTIONS:MDOCS}
${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
+
+ ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-8.3/* \
+ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-8.3.5
+ ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/erts-8.3
+
+ ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/crypto-3.7.3/* \
+ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/crypto-3.7.4
+ ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/crypto-3.7.3
+
+ ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.3.6/* \
+ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.3.9
+ ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/inets-6.3.6
+
+ ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-4.4.1/* \
+ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-4.4.2
+ ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssh-4.4.1
+
+ ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssl-8.1.1/* \
+ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssl-8.1.3
+ ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/ssl-8.1.1
+
+ ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-3.1/* \
+ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-3.1.1
+ ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-3.1
+
+ ${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/xmerl-1.3.13/* \
+ ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/xmerl-1.3.14
+ ${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/xmerl-1.3.13
+
${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index dc8c2b39b341..5a9aaed5186e 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1498164950
-SHA256 (erlang/otp_src_20.0.tar.gz) = fe80e1e14a2772901be717694bb30ac4e9a07eee0cc7a28988724cbd21476811
-SIZE (erlang/otp_src_20.0.tar.gz) = 87346046
-SHA256 (erlang/otp_doc_man_20.0.tar.gz) = b7f1542a94a170f8791f5d80a85706f9e8838924ea65d4301032d0c0cfb845cc
-SIZE (erlang/otp_doc_man_20.0.tar.gz) = 1430939
-SHA256 (erlang/otp_doc_html_20.0.tar.gz) = 1ab25110b148ce263d6e68cd5a3b912299b6066cfcd9d2fce416a4e9b7d2543a
-SIZE (erlang/otp_doc_html_20.0.tar.gz) = 33948386
+TIMESTAMP = 1496937493
+SHA256 (erlang/otp_src_19.3.tar.gz) = fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83
+SIZE (erlang/otp_src_19.3.tar.gz) = 68510871
+SHA256 (erlang/otp_doc_man_19.3.tar.gz) = f8192ffdd7367083c055695eeddf198155da43dcc221aed1d870d1e3871dd95c
+SIZE (erlang/otp_doc_man_19.3.tar.gz) = 1410781
+SHA256 (erlang/otp_doc_html_19.3.tar.gz) = dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c
+SIZE (erlang/otp_doc_html_19.3.tar.gz) = 35818689
SHA256 (erlang/armstrong_thesis_2003.pdf) = da585b914eb07350e2d6f727db5eb0fb1551f49fc1270f7d4dc079f2c8c1ab7a
SIZE (erlang/armstrong_thesis_2003.pdf) = 859249
SHA256 (erlang/bjarnelic.pdf) = 9544d4af5cea324e5c9cf77e670d9561ad61ddc240cdb5c2afecebc0a3d7429b
@@ -17,3 +17,15 @@ SHA256 (erlang/mnesia_overview.pdf) = f07f9edd4ba865a1c50647dd6fa4a8f49277f8f3be
SIZE (erlang/mnesia_overview.pdf) = 150266
SHA256 (erlang/programming_rules.pdf) = b95f8851004832b044e064c12976a422613ece897e98308a27ee8b66738b4502
SIZE (erlang/programming_rules.pdf) = 77025
+SHA256 (erlang/patch-otp-19.3.1) = 2373f890516b58ae006812ba5f15e4af1f8820be98230011b8cd8b345f51dedd
+SIZE (erlang/patch-otp-19.3.1) = 30225
+SHA256 (erlang/patch-otp-19.3.2) = 21c56ac188177985c9db11c7066dcee0f7370760da3e15a0d03c235bd2a2cb2a
+SIZE (erlang/patch-otp-19.3.2) = 6290
+SHA256 (erlang/patch-otp-19.3.3) = dbe1cab750a3339c3755db27b800e53232519c84a304bd562263ffb060afab55
+SIZE (erlang/patch-otp-19.3.3) = 12525
+SHA256 (erlang/patch-otp-19.3.4) = 02437ac753932f913209102e8cb249a264b774833bfda8c1532b338af60ff8af
+SIZE (erlang/patch-otp-19.3.4) = 13504
+SHA256 (erlang/patch-otp-19.3.5) = 5755da205004ae7e724390958db9ecc737d99ec14e0d14abcec8b8603ea6ece5
+SIZE (erlang/patch-otp-19.3.5) = 44563
+SHA256 (erlang/patch-otp-19.3.6) = ee1b5f0fd64db3322031c38722aee96a8ee35aaac454f430c829446a198f6534
+SIZE (erlang/patch-otp-19.3.6) = 13073
diff --git a/lang/erlang/files/patch-lib_wx_c__src_wxe__impl.cpp b/lang/erlang/files/patch-lib_wx_c__src_wxe__impl.cpp
new file mode 100644
index 000000000000..5b1e66586f2f
--- /dev/null
+++ b/lang/erlang/files/patch-lib_wx_c__src_wxe__impl.cpp
@@ -0,0 +1,20 @@
+--- lib/wx/c_src/wxe_impl.cpp.orig 2017-01-30 23:13:25 UTC
++++ lib/wx/c_src/wxe_impl.cpp
+@@ -666,7 +666,7 @@ void * WxeApp::getPtr(char * bp, wxeMemE
+ throw wxe_badarg(index);
+ }
+ void * temp = memenv->ref2ptr[index];
+- if((index < memenv->next) && ((index == 0) || (temp > NULL)))
++ if((index < memenv->next) && ((index == 0) || (temp != NULL)))
+ return temp;
+ else {
+ throw wxe_badarg(index);
+@@ -678,7 +678,7 @@ void WxeApp::registerPid(char * bp, ErlD
+ if(!memenv)
+ throw wxe_badarg(index);
+ void * temp = memenv->ref2ptr[index];
+- if((index < memenv->next) && ((index == 0) || (temp > NULL))) {
++ if((index < memenv->next) && ((index == 0) || (temp != NULL))) {
+ ptrMap::iterator it;
+ it = ptr2ref.find(temp);
+ if(it != ptr2ref.end()) {
diff --git a/lang/erlang/pkg-plist b/lang/erlang/pkg-plist
index e026829d4258..b8d970c8c2fa 100644
--- a/lang/erlang/pkg-plist
+++ b/lang/erlang/pkg-plist
@@ -8,6 +8,7 @@ bin/escript
bin/run_erl
bin/snmpc
bin/to_erl
+bin/typer
etc/man.d/erlang.conf
%%PORTDOCS%%%%DOCSDIR%%/armstrong_thesis_2003.pdf
%%PORTDOCS%%%%DOCSDIR%%/bjarnelic.pdf
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 20:38:22 +0000