diff --git lang/Makefile lang/Makefile index 13a58b67ae77..1c978c4f8f7c 100644 --- lang/Makefile +++ lang/Makefile @@ -65,10 +65,6 @@ SUBDIR += erlang-doc SUBDIR += erlang-java SUBDIR += erlang-riak - SUBDIR += erlang-runtime15 - SUBDIR += erlang-runtime16 - SUBDIR += erlang-runtime17 - SUBDIR += erlang-runtime18 SUBDIR += erlang-runtime19 SUBDIR += erlang-runtime20 SUBDIR += erlang-runtime21 diff --git lang/erlang-runtime15/Makefile lang/erlang-runtime15/Makefile deleted file mode 100644 index 713df32591b3..000000000000 --- lang/erlang-runtime15/Makefile +++ /dev/null @@ -1,128 +0,0 @@ -# Created by: ruslan@shevchenko.kiev.ua -# $FreeBSD$ - -PORTNAME= erlang -PORTVERSION= 15.b.03.1 -PORTREVISION= 13 -CATEGORIES= lang parallel java -MASTER_SITES= http://www.erlang.org/download/:erlangorg \ - http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ - http://olgeni.olgeni.com/~olgeni/distfiles/:local \ - LOCAL/olgeni:local -PKGNAMESUFFIX= -runtime15 -DISTNAME= otp_src_${ERLANG_REL} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg -DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= erlang@FreeBSD.org -COMMENT= Functional programming language from Ericsson - -WRKSRC= ${WRKDIR}/otp_src_R15B03 - -ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} -ERLANG_REL= R${PORTVERSION:S/.//g:tu:S/1$/-1/} - -SUB_FILES= pkg-message -SUB_LIST= ERLANG_LIB=${ERLANG_LIB} - -MAKE_JOBS_UNSAFE=yes - -OPTIONS_DEFINE= DTRACE GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX -OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS - -GS_DESC= Enable GS application (deprecated) -HIPE_DESC= Build native HiPE compiler -KQUEUE_DESC= Enable Kernel Poll (kqueue) support -SCTP_DESC= Enable SCTP support -SMP_DESC= Enable SMP support -WX_DESC= Enable WX application - -.if !exists(/usr/sbin/dtrace) -OPTIONS_EXCLUDE+= DTRACE -.endif - -OPTIONS_EXCLUDE_DragonFly= HIPE SCTP - -OPENSSL_VARS= BROKEN_SSL=openssl111 - -GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake ncurses perl5 -USE_PERL5= build - -# If you run Erlang and get a message resembling "WARNING: number of -# probes fixed does not match the number of defined probes (54 != 132, -# respectively)" you probably misconfigured DTrace in some way. - -DTRACE_CFLAGS= -fno-omit-frame-pointer -DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace -DTRACE_VARS= STRIP="" -GS_USES= tk:run -HIPE_CONFIGURE_ENABLE= hipe -JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" -JAVA_CONFIGURE_WITH= javac -JAVA_VARS= USE_JAVA=yes -KQUEUE_CONFIGURE_ENABLE=kernel-poll -ODBC_CONFIGURE_WITH= odbc -ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC -OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} -OPENSSL_USES= ssl -SCTP_CONFIGURE_ENABLE= sctp -SMP_CONFIGURE_ENABLE= smp-support -THREADS_CONFIGURE_ENABLE= threads -WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} -WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" - -.include - -.include - -.if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base -BROKEN= Does not support OpenSSL 1.1, use Erlang 19+ -. endif -.endif - -.if ${OPSYS} == FreeBSD -CFLAGS+= -DMAP_NORESERVE=0 -.endif - -.if ${ARCH} == i386 -MAKE_ARGS+= ARCH=x86 -.endif - -.if ${ARCH} == armv6 || ${ARCH} == armv7 -MAKE_ARGS+= ARCH=arm -.endif - -pre-configure-MX-off: - echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP - -post-configure-ODBC-on: - ${RM} ${WRKSRC}/lib/odbc/SKIP - -post-install-GS-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-* - -post-install-JAVA-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-* - -post-install-ODBC-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-* - -post-install-OPENSSL-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-* - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-* - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-* - -post-install-WX-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* - -post-stage: - ${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete - @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \ - | ${SORT} >> ${TMPPLIST} - -.include diff --git lang/erlang-runtime15/distinfo lang/erlang-runtime15/distinfo deleted file mode 100644 index 1318bc931ca5..000000000000 --- lang/erlang-runtime15/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1523228884 -SHA256 (erlang/otp_src_R15B03-1.tar.gz) = 4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c -SIZE (erlang/otp_src_R15B03-1.tar.gz) = 76123810 diff --git lang/erlang-runtime15/files/patch-Makefile.in lang/erlang-runtime15/files/patch-Makefile.in deleted file mode 100644 index 78481057f296..000000000000 --- lang/erlang-runtime15/files/patch-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig -+++ Makefile.in -@@ -56,7 +56,7 @@ - libdir = @libdir@ - - # Where Erlang/OTP is located --libdir_suffix = /erlang -+libdir_suffix = /erlang15 - erlang_libdir = $(libdir)$(libdir_suffix) - erlang_bindir = $(erlang_libdir)/bin - -@@ -913,7 +913,7 @@ - # - # Order is important here, don't change it! - # --INST_DEP += install.dirs install.emulator install.libs install.Install install.bin -+INST_DEP += install.dirs install.emulator install.libs install.Install - - install: $(INST_DEP) - diff --git lang/erlang-runtime15/files/patch-erts-emulator-Makefile.in lang/erlang-runtime15/files/patch-erts-emulator-Makefile.in deleted file mode 100644 index 6fb3ee10e081..000000000000 --- lang/erlang-runtime15/files/patch-erts-emulator-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- erts/emulator/Makefile.in.orig -+++ erts/emulator/Makefile.in -@@ -544,7 +546,7 @@ - endif - - $(OBJDIR)/%.o: beam/%.c -- $(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ -+ $(CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@ - - else - diff --git lang/erlang-runtime15/files/patch-erts_emulator_drivers_common_efile__drv.c lang/erlang-runtime15/files/patch-erts_emulator_drivers_common_efile__drv.c deleted file mode 100644 index b36abb3db944..000000000000 --- lang/erlang-runtime15/files/patch-erts_emulator_drivers_common_efile__drv.c +++ /dev/null @@ -1,341 +0,0 @@ ---- erts/emulator/drivers/common/efile_drv.c.orig -+++ erts/emulator/drivers/common/efile_drv.c -@@ -311,6 +311,18 @@ - unsigned flags; /* Original flags from FILE_OPEN. */ - void (*invoke)(void *); - struct t_data *d; -+ /* -+ * If an operation against a compressed file is being executed -+ * by an async thread, ensure the stop callback doesn't close -+ * the fd (gzFile) while the async thread doesn't finish using -+ * the fd (gzFile) - otherwise it accesses a dangling pointer. -+ * The following comp_op_* variables are used to coordinate the -+ * driver stop callback with the ongoing async operation. -+ */ -+ int comp_op_in_progress; -+ volatile int comp_op_done; -+ erts_mtx_t comp_op_mtx; -+ erts_cnd_t comp_op_cnd; - void (*free)(void *); - struct t_data *cq_head; /* Queue of incoming commands */ - struct t_data *cq_tail; /* -""- */ -@@ -426,6 +438,9 @@ - struct t_data *next; - int command; - int level; -+ int volatile *comp_op_done; -+ erts_mtx_t *comp_op_mtx; -+ erts_cnd_t *comp_op_cnd; - void (*invoke)(void *); - void (*free)(void *); - int again; -@@ -714,6 +729,14 @@ - return d; - } - -+static void signal_comp_op_done(struct t_data *d) { -+ if (d->comp_op_done != NULL) { -+ erts_mtx_lock(d->comp_op_mtx); -+ *(d->comp_op_done) = 1; -+ erts_cnd_signal(d->comp_op_cnd); -+ erts_mtx_unlock(d->comp_op_mtx); -+ } -+} - - /********************************************************************* - * Driver entry point -> init -@@ -757,6 +780,8 @@ - desc->key = (unsigned int) (UWord) port; - desc->flags = 0; - desc->invoke = NULL; -+ desc->comp_op_in_progress = 0; -+ desc->comp_op_done = 0; - desc->d = NULL; - desc->free = NULL; - desc->cq_head = NULL; -@@ -800,6 +825,7 @@ - DTRACE_INVOKE_SETUP(FILE_CLOSE); - d->again = 0; - do_close(d->flags, d->fd); -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_CLOSE); - } - -@@ -814,9 +840,20 @@ - TRACE_C('p'); - - if (desc->fd != FILE_FD_INVALID) { -+ if (desc->comp_op_in_progress) { -+ erts_mtx_lock(&desc->comp_op_mtx); -+ while (!desc->comp_op_done) { -+ erts_cnd_wait(&desc->comp_op_cnd, &desc->comp_op_mtx); -+ } -+ erts_mtx_unlock(&desc->comp_op_mtx); -+ } - do_close(desc->flags, desc->fd); - desc->fd = FILE_FD_INVALID; - desc->flags = 0; -+ if (sys_info.async_threads > 0 && (desc->flags & EFILE_COMPRESSED)) { -+ erts_cnd_destroy(&desc->comp_op_cnd); -+ erts_mtx_destroy(&desc->comp_op_mtx); -+ } - } - if (desc->read_binp) { - driver_free_binary(desc->read_binp); -@@ -1032,6 +1069,7 @@ - { - DTRACE_INVOKE_SETUP_BY_NAME(FILE_MKDIR); - invoke_name(data, efile_mkdir); -+ signal_comp_op_done((struct t_data *) data); - DTRACE_INVOKE_RETURN(FILE_MKDIR); - } - -@@ -1039,6 +1077,7 @@ - { - DTRACE_INVOKE_SETUP_BY_NAME(FILE_RMDIR); - invoke_name(data, efile_rmdir); -+ signal_comp_op_done((struct t_data *) data); - DTRACE_INVOKE_RETURN(FILE_RMDIR); - } - -@@ -1046,6 +1085,7 @@ - { - DTRACE_INVOKE_SETUP_BY_NAME(FILE_DELETE); - invoke_name(data, efile_delete_file); -+ signal_comp_op_done((struct t_data *) data); - DTRACE_INVOKE_RETURN(FILE_DELETE); - } - -@@ -1053,6 +1093,7 @@ - { - DTRACE_INVOKE_SETUP_BY_NAME(FILE_CHDIR); - invoke_name(data, efile_chdir); -+ signal_comp_op_done((struct t_data *) data); - DTRACE_INVOKE_RETURN(FILE_CHDIR); - } - -@@ -1064,6 +1105,7 @@ - - d->again = 0; - d->result_ok = efile_fdatasync(&d->errInfo, fd); -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_FDATASYNC); - } - -@@ -1075,6 +1117,7 @@ - - d->again = 0; - d->result_ok = efile_fsync(&d->errInfo, fd); -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_FSYNC); - } - -@@ -1086,6 +1129,7 @@ - - d->again = 0; - d->result_ok = efile_truncate_file(&d->errInfo, &fd, d->flags); -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_TRUNCATE); - } - -@@ -1129,6 +1173,7 @@ - } else { - d->again = 0; - } -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_READ); - } - -@@ -1238,6 +1283,7 @@ - break; - } - } while (local_loop); -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_READ_LINE); - } - -@@ -1298,6 +1344,7 @@ - done: - d->again = 0; - chop_done: -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_READ_FILE); - } - -@@ -1363,6 +1410,7 @@ - } - d->again = 0; - done: -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_PREADV); - } - -@@ -1434,6 +1482,7 @@ - done: - d->result_ok = !0; - d->again = 0; -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_IPREAD); - } - -@@ -1531,6 +1580,7 @@ - TRACE_F(("w%lu", (unsigned long)size)); - - } -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_WRITE); - } - -@@ -1550,6 +1600,7 @@ - d->again = 0; - d->result_ok = efile_getdcwd(&d->errInfo,d->drive, d->b+1, - RESBUFSIZE-1); -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_PWD); - } - -@@ -1564,6 +1615,7 @@ - RESBUFSIZE-1); - if (d->result_ok != 0) - FILENAME_COPY((char *) d->b + 1, resbuf+1); -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_READLINK); - } - -@@ -1578,6 +1630,7 @@ - RESBUFSIZE-1); - if (d->result_ok != 0) - FILENAME_COPY((char *) d->b + 1, resbuf+1); -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_ALTNAME); - } - -@@ -1670,6 +1723,7 @@ - } - } - done: -+ signal_comp_op_done(d); - EF_FREE(iov); /* Free our copy of the vector, nothing to restore */ - DTRACE_INVOKE_RETURN(FILE_PWRITEV); - } -@@ -1695,6 +1749,7 @@ - DTRACE3(efile_drv_int_entry, d->sched_i1, d->sched_i2, - d->command == FILE_LSTAT ? FILE_LSTAT : FILE_FSTAT); - gcc_optimizer_hack++; -+ signal_comp_op_done(d); - } - - static void invoke_link(void *data) -@@ -1707,6 +1762,7 @@ - d->again = 0; - new_name = name+FILENAME_BYTELEN(name)+FILENAME_CHARSIZE; - d->result_ok = efile_link(&d->errInfo, name, new_name); -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_LINK); - } - -@@ -1720,6 +1776,7 @@ - d->again = 0; - new_name = name+FILENAME_BYTELEN(name)+FILENAME_CHARSIZE; - d->result_ok = efile_symlink(&d->errInfo, name, new_name); -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_SYMLINK); - } - -@@ -1733,6 +1790,7 @@ - d->again = 0; - new_name = name+FILENAME_BYTELEN(name)+FILENAME_CHARSIZE; - d->result_ok = efile_rename(&d->errInfo, name, new_name); -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_RENAME); - } - -@@ -1743,6 +1801,7 @@ - - d->again = 0; - d->result_ok = efile_write_info(&d->errInfo, &d->info, d->b); -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_WRITE_INFO); - } - -@@ -1775,6 +1834,7 @@ - &d->c.lseek.location); - } - d->result_ok = status; -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_LSEEK); - } - -@@ -1822,6 +1882,7 @@ - } while(res); - - d->result_ok = (d->errInfo.posix_errno == 0); -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_READDIR); - } - -@@ -1876,6 +1937,7 @@ - - d->again = 0; - d->result_ok = efile_fadvise(&d->errInfo, fd, offset, length, advise); -+ signal_comp_op_done(d); - DTRACE_INVOKE_RETURN(FILE_FADVISE); - } - -@@ -1901,11 +1963,14 @@ - d->result_ok = 1; - if (d->c.sendfile.nbytes != 0) - d->c.sendfile.nbytes -= nbytes; -+ } else if (nbytes == 0 && d->c.sendfile.nbytes == 0) { -+ d->result_ok = 1; - } else - d->result_ok = 0; - } else { - d->result_ok = -1; - } -+ signal_comp_op_done(d); - } - - static void free_sendfile(void *data) { -@@ -2023,6 +2088,21 @@ - return; - TRACE_F(("x%i", (int) d->command)); - d->again = sys_info.async_threads == 0; -+ -+ if ((desc->flags & EFILE_COMPRESSED) && (sys_info.async_threads > 0) && -+ (desc->fd != FILE_FD_INVALID)) { -+ -+ desc->comp_op_in_progress = 1; -+ desc->comp_op_done = 0; -+ d->comp_op_done = &desc->comp_op_done; -+ d->comp_op_mtx = &desc->comp_op_mtx; -+ d->comp_op_cnd = &desc->comp_op_cnd; -+ } else { -+ d->comp_op_done = NULL; -+ d->comp_op_mtx = NULL; -+ d->comp_op_cnd = NULL; -+ } -+ - DRIVER_ASYNC(d->level, desc, d->invoke, void_ptr=d, d->free); - } - -@@ -2247,6 +2327,8 @@ - return; - } - -+ desc->comp_op_in_progress = 0; -+ - switch (d->command) - { - case FILE_READ: -@@ -2375,6 +2457,10 @@ - } else { - desc->fd = d->fd; - desc->flags = d->flags; -+ if (sys_info.async_threads > 0 && (desc->flags & EFILE_COMPRESSED)) { -+ erts_mtx_init(&desc->comp_op_mtx, "efile_drv comp op mutex"); -+ erts_cnd_init(&desc->comp_op_cnd); -+ } - reply_Uint(desc, d->fd); - } - free_data(data); diff --git lang/erlang-runtime15/files/patch-erts_emulator_utils_beam__makeops lang/erlang-runtime15/files/patch-erts_emulator_utils_beam__makeops deleted file mode 100644 index beacdf34f0b1..000000000000 --- lang/erlang-runtime15/files/patch-erts_emulator_utils_beam__makeops +++ /dev/null @@ -1,11 +0,0 @@ ---- erts/emulator/utils/beam_makeops.orig 2015-04-12 21:52:03 UTC -+++ erts/emulator/utils/beam_makeops -@@ -1711,7 +1711,7 @@ sub tr_gen_to { - - my $prev_last; - $prev_last = pop(@{$gen_transform{$key}}) -- if defined @{$gen_transform{$key}}; # Fail -+ if defined($gen_transform{$key}) && @{$gen_transform{$key}}; # Fail - - if ($prev_last && !is_instr($prev_last, 'fail')) { - error("Line $line: A previous transformation shadows '$orig_transform'"); diff --git lang/erlang-runtime15/files/patch-erts_etc_unix_run__erl.c lang/erlang-runtime15/files/patch-erts_etc_unix_run__erl.c deleted file mode 100644 index 1a1306e79a21..000000000000 --- lang/erlang-runtime15/files/patch-erts_etc_unix_run__erl.c +++ /dev/null @@ -1,12 +0,0 @@ ---- erts/etc/unix/run_erl.c.orig -+++ erts/etc/unix/run_erl.c -@@ -69,9 +69,6 @@ - #ifdef HAVE_UTMP_H - # include - #endif --#ifdef HAVE_UTIL_H --# include --#endif - #ifdef HAVE_SYS_IOCTL_H - # include - #endif diff --git lang/erlang-runtime15/files/patch-lib_erl__interface_src_connect_ei__resolve.c lang/erlang-runtime15/files/patch-lib_erl__interface_src_connect_ei__resolve.c deleted file mode 100644 index a39b391e06f0..000000000000 --- lang/erlang-runtime15/files/patch-lib_erl__interface_src_connect_ei__resolve.c +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/erl_interface/src/connect/ei_resolve.c.orig -+++ lib/erl_interface/src/connect/ei_resolve.c -@@ -621,7 +621,8 @@ - - return result; - #else -- return gethostbyname_r(name,hostp,buffer,buflen,h_errnop); -+ struct hostent *dummy; -+ return gethostbyname_r(name,hostp,buffer,buflen,&dummy,h_errnop); - #endif - #endif - #endif diff --git lang/erlang-runtime15/files/patch-lib_et_src_et__gs__contents__viewer.erl lang/erlang-runtime15/files/patch-lib_et_src_et__gs__contents__viewer.erl deleted file mode 100644 index 6497db89363c..000000000000 --- lang/erlang-runtime15/files/patch-lib_et_src_et__gs__contents__viewer.erl +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/et/src/et_gs_contents_viewer.erl.orig 2010-03-11 16:24:41.000000000 +0800 -+++ lib/et/src/et_gs_contents_viewer.erl 2010-03-11 16:24:53.000000000 +0800 -@@ -347,7 +347,6 @@ handle_info({gs, _Obj, keypress, _, [Key - 'Caps_Lock' -> - {noreply, S}; - _ -> -- io:format("~p: ignored: ~p~n", [?MODULE, KeySym]), - {noreply, S} - end; - handle_info({gs, _Obj, configure, [], [W, H | _]}, S) -> diff --git lang/erlang-runtime15/files/patch-lib_et_src_et__gs__viewer.erl lang/erlang-runtime15/files/patch-lib_et_src_et__gs__viewer.erl deleted file mode 100644 index ee98410a1675..000000000000 --- lang/erlang-runtime15/files/patch-lib_et_src_et__gs__viewer.erl +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/et/src/et_gs_viewer.erl.orig 2010-03-11 16:26:59.000000000 +0800 -+++ lib/et/src/et_gs_viewer.erl 2010-03-11 16:27:16.000000000 +0800 -@@ -855,8 +855,7 @@ close_all_others(S) -> - noreply(S). - - click_error(Click, S) -> -- gs:config(S#state.canvas, beep), -- io:format("~p: ignored: ~p~n", [?MODULE, Click]). -+ gs:config(S#state.canvas, beep). - - %%%---------------------------------------------------------------------- - %%% Clone viewer diff --git lang/erlang-runtime15/files/patch-lib_gs_src_tool__utils.erl lang/erlang-runtime15/files/patch-lib_gs_src_tool__utils.erl deleted file mode 100644 index 94d64aaf2a94..000000000000 --- lang/erlang-runtime15/files/patch-lib_gs_src_tool__utils.erl +++ /dev/null @@ -1,84 +0,0 @@ ---- lib/gs/src/tool_utils.erl.orig -+++ lib/gs/src/tool_utils.erl -@@ -27,6 +27,9 @@ - -export([file_dialog/1]). - -export([notify/2, confirm/2, confirm_yesno/2, request/2]). - -+%% Browser executable list (openURL command line protocol required) -+-define(BROWSERS, ["netscape", "mozilla", "MozillaFirebird", "opera", "firefox", "seamonkey"]). -+ - %%---------------------------------------------------------------------- - %% open_help(GS, File) - %% GS = gsobj() (GS root object returned by gs:start/0,1) -@@ -67,7 +70,7 @@ - {unix,Type} -> - case Type of - darwin -> "open " ++ File; -- _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" -+ _Else -> unix_url_command("file:" ++ File) - end; - {win32,_AnyType} -> - "start " ++ filename:nativename(File); -@@ -82,7 +85,7 @@ - {unix,Type} -> - case Type of - darwin -> "open " ++ File; -- _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" -+ _Else -> unix_url_command("file:" ++ File) - end; - {win32,_AnyType} -> - "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/"); -@@ -342,3 +345,53 @@ - [Last]; - insert_newlines(Other) -> - Other. -+ -+%% find_browser(BrowserList) => string() | false -+%% BrowserList - [string()] -+%% Given a list of basenames, find the first available executable. -+ -+find_browser([]) -> -+ false; -+ -+find_browser([H | T]) -> -+ case os:find_executable(H) of -+ false -> -+ find_browser(T); -+ Browser -> -+ Browser -+ end. -+ -+%% unix_url_command(URL) => string() -+%% URL - string() -+%% Open an URL, using a browser which supports the openURL command -+%% line protocol. If no browser is found, the empty string will be -+%% returned. -+ -+unix_url_command(URL) -> -+ Template = "BROWSER -remote \"openURL(" ++ URL ++ ")\" || BROWSER " ++ URL ++ "&", -+ -+ case os:getenv("BROWSER") of -+ false -> -+ %% look for a compatible browser -+ case find_browser(?BROWSERS) of -+ false -> -+ ""; -+ Browser -> -+ case regexp:gsub(Template, "BROWSER", Browser) of -+ {ok, Command, 0} -> -+ %% Template does not contain "BROWSER" placeholder -+ ""; -+ {ok, Command, _} -> -+ Command -+ end -+ end; -+ -+ Value -> -+ case regexp:gsub(Template, "BROWSER", Value) of -+ {ok, Command2, 0} -> -+ %% no placeholder -+ ""; -+ {ok, Command2, _} -> -+ Command2 -+ end -+ end. diff --git lang/erlang-runtime15/files/patch-lib_kernel_test_file__SUITE.erl lang/erlang-runtime15/files/patch-lib_kernel_test_file__SUITE.erl deleted file mode 100644 index 5aec4b58b685..000000000000 --- lang/erlang-runtime15/files/patch-lib_kernel_test_file__SUITE.erl +++ /dev/null @@ -1,80 +0,0 @@ ---- lib/kernel/test/file_SUITE.erl.orig -+++ lib/kernel/test/file_SUITE.erl -@@ -60,7 +60,8 @@ - -export([ read_not_really_compressed/1, - read_compressed_cooked/1, read_compressed_cooked_binary/1, - read_cooked_tar_problem/1, -- write_compressed/1, compress_errors/1, catenated_gzips/1]). -+ write_compressed/1, compress_errors/1, catenated_gzips/1, -+ compress_async_crash/1]). - - -export([ make_link/1, read_link_info_for_non_link/1, symlinks/1]). - -@@ -133,7 +134,8 @@ - {compression, [], - [read_compressed_cooked, read_compressed_cooked_binary, - read_cooked_tar_problem, read_not_really_compressed, -- write_compressed, compress_errors, catenated_gzips]}, -+ write_compressed, compress_errors, catenated_gzips, -+ compress_async_crash]}, - {links, [], - [make_link, read_link_info_for_non_link, symlinks]}]. - -@@ -2271,6 +2273,57 @@ - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -+compress_async_crash(suite) -> []; -+compress_async_crash(doc) -> []; -+compress_async_crash(Config) when is_list(Config) -> -+ ?line DataDir = ?config(data_dir, Config), -+ ?line Path = filename:join(DataDir, "test.gz"), -+ ExpectedData = <<"qwerty">>, -+ -+ ?line _ = ?FILE_MODULE:delete(Path), -+ ?line {ok, Fd} = ?FILE_MODULE:open(Path, [write, binary, compressed]), -+ ?line ok = ?FILE_MODULE:write(Fd, ExpectedData), -+ ?line ok = ?FILE_MODULE:close(Fd), -+ -+ % Test that when using async thread pool, the emulator doesn't crash -+ % when the efile port driver is stopped while a compressed file operation -+ % is in progress (being carried by an async thread). -+ ?line ok = compress_async_crash_loop(10000, Path, ExpectedData), -+ ?line ok = ?FILE_MODULE:delete(Path), -+ ok. -+ -+compress_async_crash_loop(0, _Path, _ExpectedData) -> -+ ok; -+compress_async_crash_loop(N, Path, ExpectedData) -> -+ Parent = self(), -+ {Pid, Ref} = spawn_monitor( -+ fun() -> -+ ?line {ok, Fd} = ?FILE_MODULE:open( -+ Path, [read, compressed, raw, binary]), -+ Len = byte_size(ExpectedData), -+ Parent ! {self(), continue}, -+ ?line {ok, ExpectedData} = ?FILE_MODULE:read(Fd, Len), -+ ?line ok = ?FILE_MODULE:close(Fd), -+ receive foobar -> ok end -+ end), -+ receive -+ {Pid, continue} -> -+ exit(Pid, shutdown), -+ receive -+ {'DOWN', Ref, _, _, Reason} -> -+ ?line shutdown = Reason -+ end; -+ {'DOWN', Ref, _, _, Reason2} -> -+ test_server:fail({worker_exited, Reason2}) -+ after 60000 -> -+ exit(Pid, shutdown), -+ erlang:demonitor(Ref, [flush]), -+ test_server:fail(worker_timeout) -+ end, -+ compress_async_crash_loop(N - 1, Path, ExpectedData). -+ -+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -+ - altname(doc) -> - "Test the file:altname/1 function"; - altname(suite) -> diff --git lang/erlang-runtime15/files/patch-lib_odbc_c__src_odbcserver.c lang/erlang-runtime15/files/patch-lib_odbc_c__src_odbcserver.c deleted file mode 100644 index 596c5a6c2216..000000000000 --- lang/erlang-runtime15/files/patch-lib_odbc_c__src_odbcserver.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/odbc/c_src/odbcserver.c.orig -+++ lib/odbc/c_src/odbcserver.c -@@ -1150,7 +1150,7 @@ - (column.type.strlen_or_indptr_array[j])); - break; - case SQL_C_SLONG: -- ei_x_encode_long(&dynamic_buffer(state), ((long*)values)[j]); -+ ei_x_encode_long(&dynamic_buffer(state), ((SQLINTEGER*)values)[j]); - break; - case SQL_C_DOUBLE: - ei_x_encode_double(&dynamic_buffer(state), diff --git lang/erlang-runtime15/files/patch-lib_runtime__tools_src_observer__backend.erl lang/erlang-runtime15/files/patch-lib_runtime__tools_src_observer__backend.erl deleted file mode 100644 index c2dd3a638247..000000000000 --- lang/erlang-runtime15/files/patch-lib_runtime__tools_src_observer__backend.erl +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/runtime_tools/src/observer_backend.erl.orig -+++ lib/runtime_tools/src/observer_backend.erl -@@ -83,7 +83,7 @@ - ets -> ets:info(Table, size); - mnesia -> mnesia:table_info(Table, size) - end, -- case Size > 0 of -+ case Size =/= undefined andalso Size > 0 of - false -> - Parent ! {self(), '$end_of_table'}, - normal; diff --git lang/erlang-runtime15/files/patch-lib_ssl_src_ssl__manager.erl lang/erlang-runtime15/files/patch-lib_ssl_src_ssl__manager.erl deleted file mode 100644 index 9cc0997805ed..000000000000 --- lang/erlang-runtime15/files/patch-lib_ssl_src_ssl__manager.erl +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/ssl/src/ssl_manager.erl.orig -+++ lib/ssl/src/ssl_manager.erl -@@ -145,7 +145,7 @@ - call({new_session_id, Port}). - - clean_cert_db(Ref, File) -> -- erlang:send_after(?CLEAN_CERT_DB, self(), {clean_cert_db, Ref, File}). -+ erlang:send_after(?CLEAN_CERT_DB, get(ssl_manager), {clean_cert_db, Ref, File}). - - %%-------------------------------------------------------------------- - -spec register_session(inet:port_number(), #session{}) -> ok. diff --git lang/erlang-runtime15/files/patch-lib_stdlib_src_calendar.erl lang/erlang-runtime15/files/patch-lib_stdlib_src_calendar.erl deleted file mode 100644 index 0af0683acb27..000000000000 --- lang/erlang-runtime15/files/patch-lib_stdlib_src_calendar.erl +++ /dev/null @@ -1,26 +0,0 @@ ---- lib/stdlib/src/calendar.erl.orig -+++ lib/stdlib/src/calendar.erl -@@ -215,11 +215,19 @@ - - -spec local_time_to_universal_time_dst(t_datetime1970()) -> [t_datetime1970()]. - local_time_to_universal_time_dst(DateTime) -> -- UtDst = erlang:localtime_to_universaltime(DateTime, true), -- Ut = erlang:localtime_to_universaltime(DateTime, false), - %% Reverse check the universal times -- LtDst = erlang:universaltime_to_localtime(UtDst), -- Lt = erlang:universaltime_to_localtime(Ut), -+ {UtDst, LtDst} = -+ try -+ UtDst0 = erlang:localtime_to_universaltime(DateTime, true), -+ {UtDst0, erlang:universaltime_to_localtime(UtDst0)} -+ catch error:badarg -> {error, error} -+ end, -+ {Ut, Lt} = -+ try -+ Ut0 = erlang:localtime_to_universaltime(DateTime, false), -+ {Ut0, erlang:universaltime_to_localtime(Ut0)} -+ catch error:badarg -> {error, error} -+ end, - %% Return the valid universal times - case {LtDst,Lt} of - {DateTime,DateTime} when UtDst =/= Ut -> diff --git lang/erlang-runtime15/files/pkg-message.in lang/erlang-runtime15/files/pkg-message.in deleted file mode 100644 index fe91d05701d4..000000000000 --- lang/erlang-runtime15/files/pkg-message.in +++ /dev/null @@ -1,6 +0,0 @@ -=========================================================================== - -To use this runtime port for development or testing, just prepend -its binary path ("%%LOCALBASE%%/lib/%%ERLANG_LIB%%/bin") to your PATH variable. - -=========================================================================== diff --git lang/erlang-runtime15/pkg-descr lang/erlang-runtime15/pkg-descr deleted file mode 100644 index 7bd5f8499016..000000000000 --- lang/erlang-runtime15/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Erlang is a programming language used to build massively scalable soft -real-time systems with requirements on high availability. Some of its -uses are in telecoms, banking, e-commerce, computer telephony and -instant messaging. Erlang's runtime system has built-in support for -concurrency, distribution and fault tolerance. - -This port contains a standalone runtime environment of Erlang R15 -to be used during the development of OTP applications. - -WWW: http://www.erlang.org/ diff --git lang/erlang-runtime16/Makefile lang/erlang-runtime16/Makefile deleted file mode 100644 index 8c4dc9d0811d..000000000000 --- lang/erlang-runtime16/Makefile +++ /dev/null @@ -1,128 +0,0 @@ -# Created by: ruslan@shevchenko.kiev.ua -# $FreeBSD$ - -PORTNAME= erlang -PORTVERSION= 16.b.03.1 -PORTREVISION= 13 -CATEGORIES= lang parallel java -MASTER_SITES= http://www.erlang.org/download/:erlangorg \ - http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ - http://olgeni.olgeni.com/~olgeni/distfiles/:local \ - LOCAL/olgeni:local -PKGNAMESUFFIX= -runtime16 -DISTNAME= otp_src_${ERLANG_REL} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg -DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= erlang@FreeBSD.org -COMMENT= Functional programming language from Ericsson - -WRKSRC= ${WRKDIR}/otp_src_${ERLANG_REL} - -ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} -ERLANG_REL= R${PORTVERSION:S/.//g:tu:S/1$/-1/} - -SUB_FILES= pkg-message -SUB_LIST= ERLANG_LIB=${ERLANG_LIB} - -MAKE_JOBS_UNSAFE=yes - -OPTIONS_DEFINE= DTRACE GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX -OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS - -GS_DESC= Enable GS application (deprecated) -HIPE_DESC= Build native HiPE compiler -KQUEUE_DESC= Enable Kernel Poll (kqueue) support -SCTP_DESC= Enable SCTP support -SMP_DESC= Enable SMP support -WX_DESC= Enable WX application - -.if !exists(/usr/sbin/dtrace) -OPTIONS_EXCLUDE+= DTRACE -.endif - -OPTIONS_EXCLUDE_DragonFly= HIPE SCTP - -OPENSSL_VARS= BROKEN_SSL=openssl111 - -GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake ncurses perl5 -USE_PERL5= build - -# If you run Erlang and get a message resembling "WARNING: number of -# probes fixed does not match the number of defined probes (54 != 132, -# respectively)" you probably misconfigured DTrace in some way. - -DTRACE_CFLAGS= -fno-omit-frame-pointer -DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace -DTRACE_VARS= STRIP="" -GS_USES= tk:run -HIPE_CONFIGURE_ENABLE= hipe -JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" -JAVA_CONFIGURE_WITH= javac -JAVA_VARS= USE_JAVA=yes -KQUEUE_CONFIGURE_ENABLE=kernel-poll -ODBC_CONFIGURE_WITH= odbc -ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC -OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} -OPENSSL_USES= ssl -SCTP_CONFIGURE_ENABLE= sctp -SMP_CONFIGURE_ENABLE= smp-support -THREADS_CONFIGURE_ENABLE= threads -WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} -WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" - -.include - -.include - -.if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base -BROKEN= Does not support OpenSSL 1.1, use Erlang 19+ -. endif -.endif - -.if ${OPSYS} == FreeBSD -CFLAGS+= -DMAP_NORESERVE=0 -.endif - -.if ${ARCH} == i386 -MAKE_ARGS+= ARCH=x86 -.endif - -.if ${ARCH} == armv6 || ${ARCH} == armv7 -MAKE_ARGS+= ARCH=arm -.endif - -pre-configure-MX-off: - echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP - -post-configure-ODBC-on: - ${RM} ${WRKSRC}/lib/odbc/SKIP - -post-install-GS-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-* - -post-install-JAVA-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-* - -post-install-ODBC-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-* - -post-install-OPENSSL-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-* - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-* - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-* - -post-install-WX-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* - -post-stage: - ${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete - @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \ - | ${SORT} >> ${TMPPLIST} - -.include diff --git lang/erlang-runtime16/distinfo lang/erlang-runtime16/distinfo deleted file mode 100644 index f5e76a09920d..000000000000 --- lang/erlang-runtime16/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1523227942 -SHA256 (erlang/otp_src_R16B03-1.tar.gz) = 17ce53459bc5ceb34fc2da412e15ac8c23835a15fbd84e62c8d1852704747ee7 -SIZE (erlang/otp_src_R16B03-1.tar.gz) = 66253556 diff --git lang/erlang-runtime16/files/patch-Makefile.in lang/erlang-runtime16/files/patch-Makefile.in deleted file mode 100644 index 8ebb6063d76d..000000000000 --- lang/erlang-runtime16/files/patch-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig -+++ Makefile.in -@@ -56,7 +56,7 @@ - libdir = @libdir@ - - # Where Erlang/OTP is located --libdir_suffix = /erlang -+libdir_suffix = /erlang16 - erlang_libdir = $(libdir)$(libdir_suffix) - erlang_bindir = $(erlang_libdir)/bin - -@@ -913,7 +913,7 @@ - # - # Order is important here, don't change it! - # --INST_DEP += install.dirs install.emulator install.libs install.Install install.bin -+INST_DEP += install.dirs install.emulator install.libs install.Install - - install: $(INST_DEP) - diff --git lang/erlang-runtime16/files/patch-erts_emulator_drivers_common_efile__drv.c lang/erlang-runtime16/files/patch-erts_emulator_drivers_common_efile__drv.c deleted file mode 100644 index bc3c37541f66..000000000000 --- lang/erlang-runtime16/files/patch-erts_emulator_drivers_common_efile__drv.c +++ /dev/null @@ -1,11 +0,0 @@ ---- erts/emulator/drivers/common/efile_drv.c.orig -+++ erts/emulator/drivers/common/efile_drv.c -@@ -1938,6 +1938,8 @@ - d->result_ok = 1; - if (d->c.sendfile.nbytes != 0) - d->c.sendfile.nbytes -= nbytes; -+ } else if (nbytes == 0 && d->c.sendfile.nbytes == 0) { -+ d->result_ok = 1; - } else - d->result_ok = 0; - } else { diff --git lang/erlang-runtime16/files/patch-erts_etc_unix_run__erl.c lang/erlang-runtime16/files/patch-erts_etc_unix_run__erl.c deleted file mode 100644 index 1a1306e79a21..000000000000 --- lang/erlang-runtime16/files/patch-erts_etc_unix_run__erl.c +++ /dev/null @@ -1,12 +0,0 @@ ---- erts/etc/unix/run_erl.c.orig -+++ erts/etc/unix/run_erl.c -@@ -69,9 +69,6 @@ - #ifdef HAVE_UTMP_H - # include - #endif --#ifdef HAVE_UTIL_H --# include --#endif - #ifdef HAVE_SYS_IOCTL_H - # include - #endif diff --git lang/erlang-runtime16/files/patch-lib_crypto_c__src_Makefile.in lang/erlang-runtime16/files/patch-lib_crypto_c__src_Makefile.in deleted file mode 100644 index 65e1b759ad66..000000000000 --- lang/erlang-runtime16/files/patch-lib_crypto_c__src_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/crypto/c_src/Makefile.in.orig 2016-03-14 20:11:15 UTC -+++ lib/crypto/c_src/Makefile.in -@@ -90,7 +90,7 @@ endif - DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ - - ifeq ($(DYNAMIC_CRYPTO_LIB),yes) --SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@ -+SSL_DED_LD_RUNTIME_LIBRARY_PATH = - CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) - EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB - else diff --git lang/erlang-runtime16/files/patch-lib_crypto_priv_Makefile lang/erlang-runtime16/files/patch-lib_crypto_priv_Makefile deleted file mode 100644 index 26f2c38e360d..000000000000 --- lang/erlang-runtime16/files/patch-lib_crypto_priv_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/crypto/priv/Makefile.orig 2016-03-14 20:11:15 UTC -+++ lib/crypto/priv/Makefile -@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o - # ---------------------------------------------------- - - $(SO_NIFLIB): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_NIFLIB): $(OBJS) diff --git lang/erlang-runtime16/files/patch-lib_erl__interface_src_connect_ei__resolve.c lang/erlang-runtime16/files/patch-lib_erl__interface_src_connect_ei__resolve.c deleted file mode 100644 index a39b391e06f0..000000000000 --- lang/erlang-runtime16/files/patch-lib_erl__interface_src_connect_ei__resolve.c +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/erl_interface/src/connect/ei_resolve.c.orig -+++ lib/erl_interface/src/connect/ei_resolve.c -@@ -621,7 +621,8 @@ - - return result; - #else -- return gethostbyname_r(name,hostp,buffer,buflen,h_errnop); -+ struct hostent *dummy; -+ return gethostbyname_r(name,hostp,buffer,buflen,&dummy,h_errnop); - #endif - #endif - #endif diff --git lang/erlang-runtime16/files/patch-lib_et_src_et__gs__contents__viewer.erl lang/erlang-runtime16/files/patch-lib_et_src_et__gs__contents__viewer.erl deleted file mode 100644 index 6497db89363c..000000000000 --- lang/erlang-runtime16/files/patch-lib_et_src_et__gs__contents__viewer.erl +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/et/src/et_gs_contents_viewer.erl.orig 2010-03-11 16:24:41.000000000 +0800 -+++ lib/et/src/et_gs_contents_viewer.erl 2010-03-11 16:24:53.000000000 +0800 -@@ -347,7 +347,6 @@ handle_info({gs, _Obj, keypress, _, [Key - 'Caps_Lock' -> - {noreply, S}; - _ -> -- io:format("~p: ignored: ~p~n", [?MODULE, KeySym]), - {noreply, S} - end; - handle_info({gs, _Obj, configure, [], [W, H | _]}, S) -> diff --git lang/erlang-runtime16/files/patch-lib_et_src_et__gs__viewer.erl lang/erlang-runtime16/files/patch-lib_et_src_et__gs__viewer.erl deleted file mode 100644 index ee98410a1675..000000000000 --- lang/erlang-runtime16/files/patch-lib_et_src_et__gs__viewer.erl +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/et/src/et_gs_viewer.erl.orig 2010-03-11 16:26:59.000000000 +0800 -+++ lib/et/src/et_gs_viewer.erl 2010-03-11 16:27:16.000000000 +0800 -@@ -855,8 +855,7 @@ close_all_others(S) -> - noreply(S). - - click_error(Click, S) -> -- gs:config(S#state.canvas, beep), -- io:format("~p: ignored: ~p~n", [?MODULE, Click]). -+ gs:config(S#state.canvas, beep). - - %%%---------------------------------------------------------------------- - %%% Clone viewer diff --git lang/erlang-runtime16/files/patch-lib_gs_src_tool__utils.erl lang/erlang-runtime16/files/patch-lib_gs_src_tool__utils.erl deleted file mode 100644 index 94d64aaf2a94..000000000000 --- lang/erlang-runtime16/files/patch-lib_gs_src_tool__utils.erl +++ /dev/null @@ -1,84 +0,0 @@ ---- lib/gs/src/tool_utils.erl.orig -+++ lib/gs/src/tool_utils.erl -@@ -27,6 +27,9 @@ - -export([file_dialog/1]). - -export([notify/2, confirm/2, confirm_yesno/2, request/2]). - -+%% Browser executable list (openURL command line protocol required) -+-define(BROWSERS, ["netscape", "mozilla", "MozillaFirebird", "opera", "firefox", "seamonkey"]). -+ - %%---------------------------------------------------------------------- - %% open_help(GS, File) - %% GS = gsobj() (GS root object returned by gs:start/0,1) -@@ -67,7 +70,7 @@ - {unix,Type} -> - case Type of - darwin -> "open " ++ File; -- _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" -+ _Else -> unix_url_command("file:" ++ File) - end; - {win32,_AnyType} -> - "start " ++ filename:nativename(File); -@@ -82,7 +85,7 @@ - {unix,Type} -> - case Type of - darwin -> "open " ++ File; -- _Else -> "netscape -remote \"openURL(file:" ++ File ++ ")\"" -+ _Else -> unix_url_command("file:" ++ File) - end; - {win32,_AnyType} -> - "netscape.exe -h " ++ regexp:gsub(File,"\\\\","/"); -@@ -342,3 +345,53 @@ - [Last]; - insert_newlines(Other) -> - Other. -+ -+%% find_browser(BrowserList) => string() | false -+%% BrowserList - [string()] -+%% Given a list of basenames, find the first available executable. -+ -+find_browser([]) -> -+ false; -+ -+find_browser([H | T]) -> -+ case os:find_executable(H) of -+ false -> -+ find_browser(T); -+ Browser -> -+ Browser -+ end. -+ -+%% unix_url_command(URL) => string() -+%% URL - string() -+%% Open an URL, using a browser which supports the openURL command -+%% line protocol. If no browser is found, the empty string will be -+%% returned. -+ -+unix_url_command(URL) -> -+ Template = "BROWSER -remote \"openURL(" ++ URL ++ ")\" || BROWSER " ++ URL ++ "&", -+ -+ case os:getenv("BROWSER") of -+ false -> -+ %% look for a compatible browser -+ case find_browser(?BROWSERS) of -+ false -> -+ ""; -+ Browser -> -+ case regexp:gsub(Template, "BROWSER", Browser) of -+ {ok, Command, 0} -> -+ %% Template does not contain "BROWSER" placeholder -+ ""; -+ {ok, Command, _} -> -+ Command -+ end -+ end; -+ -+ Value -> -+ case regexp:gsub(Template, "BROWSER", Value) of -+ {ok, Command2, 0} -> -+ %% no placeholder -+ ""; -+ {ok, Command2, _} -> -+ Command2 -+ end -+ end. diff --git lang/erlang-runtime16/files/patch-lib_stdlib_src_calendar.erl lang/erlang-runtime16/files/patch-lib_stdlib_src_calendar.erl deleted file mode 100644 index 0af0683acb27..000000000000 --- lang/erlang-runtime16/files/patch-lib_stdlib_src_calendar.erl +++ /dev/null @@ -1,26 +0,0 @@ ---- lib/stdlib/src/calendar.erl.orig -+++ lib/stdlib/src/calendar.erl -@@ -215,11 +215,19 @@ - - -spec local_time_to_universal_time_dst(t_datetime1970()) -> [t_datetime1970()]. - local_time_to_universal_time_dst(DateTime) -> -- UtDst = erlang:localtime_to_universaltime(DateTime, true), -- Ut = erlang:localtime_to_universaltime(DateTime, false), - %% Reverse check the universal times -- LtDst = erlang:universaltime_to_localtime(UtDst), -- Lt = erlang:universaltime_to_localtime(Ut), -+ {UtDst, LtDst} = -+ try -+ UtDst0 = erlang:localtime_to_universaltime(DateTime, true), -+ {UtDst0, erlang:universaltime_to_localtime(UtDst0)} -+ catch error:badarg -> {error, error} -+ end, -+ {Ut, Lt} = -+ try -+ Ut0 = erlang:localtime_to_universaltime(DateTime, false), -+ {Ut0, erlang:universaltime_to_localtime(Ut0)} -+ catch error:badarg -> {error, error} -+ end, - %% Return the valid universal times - case {LtDst,Lt} of - {DateTime,DateTime} when UtDst =/= Ut -> diff --git lang/erlang-runtime16/files/patch-lib_wx_c__src_wxe__impl.cpp lang/erlang-runtime16/files/patch-lib_wx_c__src_wxe__impl.cpp deleted file mode 100644 index 5b1e66586f2f..000000000000 --- lang/erlang-runtime16/files/patch-lib_wx_c__src_wxe__impl.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 lang/erlang-runtime16/files/pkg-message.in lang/erlang-runtime16/files/pkg-message.in deleted file mode 100644 index fe91d05701d4..000000000000 --- lang/erlang-runtime16/files/pkg-message.in +++ /dev/null @@ -1,6 +0,0 @@ -=========================================================================== - -To use this runtime port for development or testing, just prepend -its binary path ("%%LOCALBASE%%/lib/%%ERLANG_LIB%%/bin") to your PATH variable. - -=========================================================================== diff --git lang/erlang-runtime16/pkg-descr lang/erlang-runtime16/pkg-descr deleted file mode 100644 index abcc9d8753b1..000000000000 --- lang/erlang-runtime16/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Erlang is a programming language used to build massively scalable soft -real-time systems with requirements on high availability. Some of its -uses are in telecoms, banking, e-commerce, computer telephony and -instant messaging. Erlang's runtime system has built-in support for -concurrency, distribution and fault tolerance. - -This port contains a standalone runtime environment of Erlang R16 -to be used during the development of OTP applications. - -WWW: http://www.erlang.org/ diff --git lang/erlang-runtime17/Makefile lang/erlang-runtime17/Makefile deleted file mode 100644 index 773e02e1d397..000000000000 --- lang/erlang-runtime17/Makefile +++ /dev/null @@ -1,155 +0,0 @@ -# Created by: ruslan@shevchenko.kiev.ua -# $FreeBSD$ - -PORTNAME= erlang -PORTVERSION= 17.5.6.10 -CATEGORIES= lang parallel java -MASTER_SITES= http://www.erlang.org/download/:erlangorg \ - http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ - http://olgeni.olgeni.com/~olgeni/distfiles/:local \ - LOCAL/olgeni:local -PKGNAMESUFFIX= -runtime17 -DISTNAME= otp_src_${ERLANG_REL} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg \ - preloaded-${PORTVERSION}${EXTRACT_SUFX}:local -DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ - LOCAL/olgeni -PATCHFILES= patch-otp-17.5.1 patch-otp-17.5.2 patch-otp-17.5.3 \ - patch-otp-17.5.4 patch-otp-17.5.5 patch-otp-17.5.6 \ - patch-otp-17.5.6.1 patch-otp-17.5.6.2 patch-otp-17.5.6.3 \ - patch-otp-17.5.6.4 patch-otp-17.5.6.5 patch-otp-17.5.6.6 \ - patch-otp-17.5.6.7 patch-otp-17.5.6.8 patch-otp-17.5.6.9 \ - patch-otp-17.5.6.10 - -MAINTAINER= erlang@FreeBSD.org -COMMENT= Functional programming language from Ericsson - -WRKSRC= ${WRKDIR}/otp_src_${ERLANG_REL} - -ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} -ERLANG_REL= 17.5 - -OPTIONS_SUB= yes -SUB_FILES= pkg-message -SUB_LIST= ERLANG_LIB=${ERLANG_LIB} - -MAKE_JOBS_UNSAFE=yes - -OPTIONS_DEFINE= DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX -OPTIONS_DEFAULT=DTRACE HIPE KQUEUE OPENSSL SCTP SMP THREADS - -DIRTY_DESC= Enable Dirty schedulers (experimental) -GS_DESC= Enable GS application (deprecated) -HIPE_DESC= Build native HiPE compiler -KQUEUE_DESC= Enable Kernel Poll (kqueue) support -NATIVE_DESC= Enable native libraries -SCTP_DESC= Enable SCTP support -SMP_DESC= Enable SMP support -WX_DESC= Enable WX application - -NATIVE_IMPLIES= HIPE - -.if !exists(/usr/sbin/dtrace) -OPTIONS_EXCLUDE+= DTRACE -.endif - -OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP -# ld(1) fails to link probes: missing __dtrace_erlang___* symbols -OPTIONS_EXCLUDE_aarch64= DTRACE -OPTIONS_EXCLUDE_armv6= DTRACE -OPTIONS_EXCLUDE_armv7= DTRACE -OPTIONS_EXCLUDE_i386= DTRACE - -OPENSSL_VARS= BROKEN_SSL=openssl111 - -GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake ncurses perl5 -USE_PERL5= build - -# If you run Erlang and get a message resembling "WARNING: number of -# probes fixed does not match the number of defined probes (54 != 132, -# respectively)" you probably misconfigured DTrace in some way. - -DIRTY_CONFIGURE_ENABLE= dirty-schedulers -DTRACE_CFLAGS= -fno-omit-frame-pointer -DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace -DTRACE_VARS= STRIP="" -GS_USES= tk:run -HIPE_CONFIGURE_ENABLE= hipe -JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" -JAVA_CONFIGURE_WITH= javac -JAVA_VARS= USE_JAVA=yes -KQUEUE_CONFIGURE_ENABLE=kernel-poll -NATIVE_CONFIGURE_ENABLE=native-libs -ODBC_CONFIGURE_WITH= odbc -ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC -OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} -OPENSSL_USES= ssl -SCTP_CONFIGURE_ENABLE= sctp -SMP_CONFIGURE_ENABLE= smp-support -THREADS_CONFIGURE_ENABLE= threads -WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} -WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" - -.include - -.include - -.if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base -BROKEN= Does not support OpenSSL 1.1, use Erlang 19+ -. endif -.endif - -.if ${OPSYS} == FreeBSD -CFLAGS+= -DMAP_NORESERVE=0 -.endif - -.if ${ARCH} == i386 -MAKE_ARGS+= ARCH=x86 -.endif - -.if ${ARCH} == armv6 || ${ARCH} == armv7 -MAKE_ARGS+= ARCH=arm -.endif - -pre-configure: - cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX} - -pre-configure-MX-off: - echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP - -post-configure-ODBC-on: - ${RM} ${WRKSRC}/lib/odbc/SKIP - -pre-build-NATIVE-on: - @cd ${WRKSRC} && ${MAKE_CMD} clean - -post-install-GS-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-* - -post-install-JAVA-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-* - -post-install-ODBC-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-* - -post-install-OPENSSL-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-* - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-* - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-* - -post-install-WX-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* - -post-stage: - ${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete - @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \ - | ${SORT} >> ${TMPPLIST} - -.include diff --git lang/erlang-runtime17/distinfo lang/erlang-runtime17/distinfo deleted file mode 100644 index a62763c47b54..000000000000 --- lang/erlang-runtime17/distinfo +++ /dev/null @@ -1,37 +0,0 @@ -TIMESTAMP = 1540245123 -SHA256 (erlang/otp_src_17.5.tar.gz) = 3c28820c981b30c50df8ac2a4a238e5813454fa3ed2ad530bc7948a282846474 -SIZE (erlang/otp_src_17.5.tar.gz) = 67242289 -SHA256 (erlang/preloaded-17.5.6.10.tar.gz) = 4a44e5a76fdd5b448f35455babc1f74639f5c7f2dcc509bfd6d3237b517d8ff6 -SIZE (erlang/preloaded-17.5.6.10.tar.gz) = 297377 -SHA256 (erlang/patch-otp-17.5.1) = e95b17b539b84b2408cbdd8af68ea96ad239a1b38117243d21ebb809ab3ca1c3 -SIZE (erlang/patch-otp-17.5.1) = 36012 -SHA256 (erlang/patch-otp-17.5.2) = 9c70e90c3b040ab1e136738f355f0925f64afd5a4b28f1c9a6f4035f2bf03b1b -SIZE (erlang/patch-otp-17.5.2) = 17821 -SHA256 (erlang/patch-otp-17.5.3) = fd2879176733c34c002123da9d9b96ac3cf1857c7422a061711be818aecc9e13 -SIZE (erlang/patch-otp-17.5.3) = 135959 -SHA256 (erlang/patch-otp-17.5.4) = dce1130adfabe4fdecd1e5e700bea70a5e9ba7886b51c81a7a2371e204d725ca -SIZE (erlang/patch-otp-17.5.4) = 14618 -SHA256 (erlang/patch-otp-17.5.5) = 78f81dc17c52b73d45819de50fc11df3a19ff0593a6d5c6d105b5875c1e654f6 -SIZE (erlang/patch-otp-17.5.5) = 44523 -SHA256 (erlang/patch-otp-17.5.6) = 25461538cf79af56ee64019cfb76764bc5c2ac7cc9d3f9061ef01dd93d46ef36 -SIZE (erlang/patch-otp-17.5.6) = 57264 -SHA256 (erlang/patch-otp-17.5.6.1) = 695bea19a372d58fc94ca79e84054524e7895516aab3a1d03905dd5971779ed7 -SIZE (erlang/patch-otp-17.5.6.1) = 9062 -SHA256 (erlang/patch-otp-17.5.6.2) = 47fc4468fdc75249f30a4ba120ed39db03dfb5ebc5c2b1c7e94eb43d8c221002 -SIZE (erlang/patch-otp-17.5.6.2) = 14293 -SHA256 (erlang/patch-otp-17.5.6.3) = 75e91ad34a910353452cc1cf26ffb6936e9df3f0d1144793eb83ac7ab3074486 -SIZE (erlang/patch-otp-17.5.6.3) = 63652 -SHA256 (erlang/patch-otp-17.5.6.4) = 9156ea7d173b8fef62ee1eb2483b943cfdbeca80b74177f51aa131a688db8ed5 -SIZE (erlang/patch-otp-17.5.6.4) = 11945 -SHA256 (erlang/patch-otp-17.5.6.5) = 270501a8ab836456aeddf2601996601b3b7f040dc360a438319434b21c26e1b0 -SIZE (erlang/patch-otp-17.5.6.5) = 16967 -SHA256 (erlang/patch-otp-17.5.6.6) = 53125e68a9a8530e1eaa6451a0849b8b458d40b6611ded9c1cae2936166f65bf -SIZE (erlang/patch-otp-17.5.6.6) = 5252 -SHA256 (erlang/patch-otp-17.5.6.7) = cd40675b3d75b0a92617c4ebdc361af420a3eb9af00b851a47bd36a223af0f0a -SIZE (erlang/patch-otp-17.5.6.7) = 25609 -SHA256 (erlang/patch-otp-17.5.6.8) = a5f4b28ecea04a6ba9c5c042963a7d2258f2bc50dc0a4c4d8e42198c7f225c89 -SIZE (erlang/patch-otp-17.5.6.8) = 39537 -SHA256 (erlang/patch-otp-17.5.6.9) = 4380bea95d906eea5c2caaeac4ae830347bd502332c3656d85e0f7642fc52397 -SIZE (erlang/patch-otp-17.5.6.9) = 16067 -SHA256 (erlang/patch-otp-17.5.6.10) = 856461e3efe69629c65c38651c2b46addc7e8f0aaa3ab88221ad27f928a29508 -SIZE (erlang/patch-otp-17.5.6.10) = 19618 diff --git lang/erlang-runtime17/files/patch-Makefile.in lang/erlang-runtime17/files/patch-Makefile.in deleted file mode 100644 index b47a0e774e0a..000000000000 --- lang/erlang-runtime17/files/patch-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig -+++ Makefile.in -@@ -59,7 +59,7 @@ - libdir = @libdir@ - - # Where Erlang/OTP is located --libdir_suffix = /erlang -+libdir_suffix = /erlang17 - erlang_libdir = $(libdir)$(libdir_suffix) - erlang_bindir = $(erlang_libdir)/bin - -@@ -1007,7 +1007,7 @@ - # - # Order is important here, don't change it! - # --INST_DEP += install.dirs install.emulator install.libs install.Install install.otp_version install.bin -+INST_DEP += install.dirs install.emulator install.libs install.Install install.otp_version - - install: $(INST_DEP) - diff --git lang/erlang-runtime17/files/patch-erts_emulator_drivers_common_efile__drv.c lang/erlang-runtime17/files/patch-erts_emulator_drivers_common_efile__drv.c deleted file mode 100644 index a6447f81c7d2..000000000000 --- lang/erlang-runtime17/files/patch-erts_emulator_drivers_common_efile__drv.c +++ /dev/null @@ -1,11 +0,0 @@ ---- erts/emulator/drivers/common/efile_drv.c.orig 2015-03-31 12:32:52 UTC -+++ erts/emulator/drivers/common/efile_drv.c -@@ -1938,6 +1938,8 @@ static void invoke_sendfile(void *data) - d->result_ok = 1; - if (d->c.sendfile.nbytes != 0) - d->c.sendfile.nbytes -= nbytes; -+ } else if (nbytes == 0 && d->c.sendfile.nbytes == 0) { -+ d->result_ok = 1; - } else - d->result_ok = 0; - } else { diff --git lang/erlang-runtime17/files/patch-erts_etc_unix_run__erl.c lang/erlang-runtime17/files/patch-erts_etc_unix_run__erl.c deleted file mode 100644 index b76c5127d2a8..000000000000 --- lang/erlang-runtime17/files/patch-erts_etc_unix_run__erl.c +++ /dev/null @@ -1,12 +0,0 @@ ---- erts/etc/unix/run_erl.c.orig 2015-03-31 12:32:52 UTC -+++ erts/etc/unix/run_erl.c -@@ -73,9 +73,6 @@ - #ifdef HAVE_UTMP_H - # include - #endif --#ifdef HAVE_UTIL_H --# include --#endif - #ifdef HAVE_SYS_IOCTL_H - # include - #endif diff --git lang/erlang-runtime17/files/patch-lib_crypto_c__src_Makefile.in lang/erlang-runtime17/files/patch-lib_crypto_c__src_Makefile.in deleted file mode 100644 index 65e1b759ad66..000000000000 --- lang/erlang-runtime17/files/patch-lib_crypto_c__src_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/crypto/c_src/Makefile.in.orig 2016-03-14 20:11:15 UTC -+++ lib/crypto/c_src/Makefile.in -@@ -90,7 +90,7 @@ endif - DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ - - ifeq ($(DYNAMIC_CRYPTO_LIB),yes) --SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@ -+SSL_DED_LD_RUNTIME_LIBRARY_PATH = - CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) - EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB - else diff --git lang/erlang-runtime17/files/patch-lib_crypto_priv_Makefile lang/erlang-runtime17/files/patch-lib_crypto_priv_Makefile deleted file mode 100644 index 26f2c38e360d..000000000000 --- lang/erlang-runtime17/files/patch-lib_crypto_priv_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/crypto/priv/Makefile.orig 2016-03-14 20:11:15 UTC -+++ lib/crypto/priv/Makefile -@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o - # ---------------------------------------------------- - - $(SO_NIFLIB): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_NIFLIB): $(OBJS) diff --git lang/erlang-runtime17/files/patch-lib_erl__interface_src_connect_ei__resolve.c lang/erlang-runtime17/files/patch-lib_erl__interface_src_connect_ei__resolve.c deleted file mode 100644 index 16046e8e4934..000000000000 --- lang/erlang-runtime17/files/patch-lib_erl__interface_src_connect_ei__resolve.c +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/erl_interface/src/connect/ei_resolve.c.orig 2015-03-31 12:32:52 UTC -+++ lib/erl_interface/src/connect/ei_resolve.c -@@ -649,7 +649,8 @@ struct hostent *ei_gethostbyname_r(const - - return result; - #else -- return gethostbyname_r(name,hostp,buffer,buflen,h_errnop); -+ struct hostent *dummy; -+ return gethostbyname_r(name,hostp,buffer,buflen,&dummy,h_errnop); - #endif - #endif - #endif diff --git lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__connection.erl lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__connection.erl deleted file mode 100644 index 8a8d93487cf5..000000000000 --- lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__connection.erl +++ /dev/null @@ -1,30 +0,0 @@ ---- lib/ssl/src/ssl_connection.erl.orig 2015-03-31 12:32:52.000000000 +0000 -+++ lib/ssl/src/ssl_connection.erl 2017-12-14 13:13:46.570861000 +0000 -@@ -1135,8 +1135,25 @@ - request_client_cert(State2, Connection). - - certify_client_key_exchange(#encrypted_premaster_secret{premaster_secret= EncPMS}, -- #state{private_key = Key} = State, Connection) -> -- PremasterSecret = ssl_handshake:premaster_secret(EncPMS, Key), -+ #state{private_key = Key, client_hello_version = {Major, Minor} = Version } = State, Connection) -> -+ -+ %% Countermeasure for Bleichenbacher attack always provide some kind of premaster secret -+ %% and fail handshake later.RFC 5246 section 7.4.7.1. -+ PremasterSecret = -+ try ssl_handshake:premaster_secret(EncPMS, Key) of -+ Secret when erlang:byte_size(Secret) == ?NUM_OF_PREMASTERSECRET_BYTES -> -+ case Secret of -+ <> -> %% Correct -+ Secret; -+ <> -> %% Version mismatch -+ <> -+ end; -+ _ -> %% erlang:byte_size(Secret) =/= ?NUM_OF_PREMASTERSECRET_BYTES -+ make_premaster_secret(Version, rsa) -+ catch -+ #alert{description = ?DECRYPT_ERROR} -> -+ make_premaster_secret(Version, rsa) -+ end, - calculate_master_secret(PremasterSecret, State, Connection, certify, cipher); - - certify_client_key_exchange(#client_diffie_hellman_public{dh_public = ClientPublicDhKey}, diff --git lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__connection.hrl lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__connection.hrl deleted file mode 100644 index cb4b91907b7c..000000000000 --- lang/erlang-runtime17/files/patch-lib_ssl_src_ssl__connection.hrl +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/ssl/src/ssl_connection.hrl.orig 2015-03-31 12:32:52.000000000 +0000 -+++ lib/ssl/src/ssl_connection.hrl 2017-12-14 13:18:02.736638000 +0000 -@@ -53,7 +53,8 @@ - session :: #session{} | secret_printout(), - session_cache :: db_handle(), - session_cache_cb :: atom(), -- negotiated_version :: ssl_record:ssl_version(), -+ negotiated_version :: ssl_record:ssl_version() | 'undefined', -+ client_hello_version :: ssl_record:ssl_version() | 'undefined', - client_certificate_requested = false :: boolean(), - key_algorithm :: ssl_cipher:key_algo(), - hashsign_algorithm = {undefined, undefined}, diff --git lang/erlang-runtime17/files/patch-lib_ssl_src_tls__connection.erl lang/erlang-runtime17/files/patch-lib_ssl_src_tls__connection.erl deleted file mode 100644 index fd4eac923732..000000000000 --- lang/erlang-runtime17/files/patch-lib_ssl_src_tls__connection.erl +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/ssl/src/tls_connection.erl.orig 2015-03-31 12:32:52.000000000 +0000 -+++ lib/ssl/src/tls_connection.erl 2017-12-14 13:22:41.792681000 +0000 -@@ -197,6 +197,7 @@ - ssl_connection:hello({common_client_hello, Type, ServerHelloExt, HashSign}, - State#state{connection_states = ConnectionStates, - negotiated_version = Version, -+ client_hello_version = ClientVersion, - session = Session, - client_ecc = {EllipticCurves, EcPointFormats}}, ?MODULE); - #alert{} = Alert -> diff --git lang/erlang-runtime17/files/patch-lib_stdlib_src_calendar.erl lang/erlang-runtime17/files/patch-lib_stdlib_src_calendar.erl deleted file mode 100644 index 34b753d85b27..000000000000 --- lang/erlang-runtime17/files/patch-lib_stdlib_src_calendar.erl +++ /dev/null @@ -1,26 +0,0 @@ ---- lib/stdlib/src/calendar.erl.orig 2015-03-31 12:32:52 UTC -+++ lib/stdlib/src/calendar.erl -@@ -279,11 +279,19 @@ local_time_to_universal_time(DateTime, I - DateTime1 :: datetime1970(), - DateTime :: datetime1970(). - local_time_to_universal_time_dst(DateTime) -> -- UtDst = erlang:localtime_to_universaltime(DateTime, true), -- Ut = erlang:localtime_to_universaltime(DateTime, false), - %% Reverse check the universal times -- LtDst = erlang:universaltime_to_localtime(UtDst), -- Lt = erlang:universaltime_to_localtime(Ut), -+ {UtDst, LtDst} = -+ try -+ UtDst0 = erlang:localtime_to_universaltime(DateTime, true), -+ {UtDst0, erlang:universaltime_to_localtime(UtDst0)} -+ catch error:badarg -> {error, error} -+ end, -+ {Ut, Lt} = -+ try -+ Ut0 = erlang:localtime_to_universaltime(DateTime, false), -+ {Ut0, erlang:universaltime_to_localtime(Ut0)} -+ catch error:badarg -> {error, error} -+ end, - %% Return the valid universal times - case {LtDst,Lt} of - {DateTime,DateTime} when UtDst =/= Ut -> diff --git lang/erlang-runtime17/files/patch-lib_wx_c__src_wxe__impl.cpp lang/erlang-runtime17/files/patch-lib_wx_c__src_wxe__impl.cpp deleted file mode 100644 index 5b1e66586f2f..000000000000 --- lang/erlang-runtime17/files/patch-lib_wx_c__src_wxe__impl.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 lang/erlang-runtime17/files/pkg-message.in lang/erlang-runtime17/files/pkg-message.in deleted file mode 100644 index fe91d05701d4..000000000000 --- lang/erlang-runtime17/files/pkg-message.in +++ /dev/null @@ -1,6 +0,0 @@ -=========================================================================== - -To use this runtime port for development or testing, just prepend -its binary path ("%%LOCALBASE%%/lib/%%ERLANG_LIB%%/bin") to your PATH variable. - -=========================================================================== diff --git lang/erlang-runtime17/pkg-descr lang/erlang-runtime17/pkg-descr deleted file mode 100644 index d52fca1eaba9..000000000000 --- lang/erlang-runtime17/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Erlang is a programming language used to build massively scalable soft -real-time systems with requirements on high availability. Some of its -uses are in telecoms, banking, e-commerce, computer telephony and -instant messaging. Erlang's runtime system has built-in support for -concurrency, distribution and fault tolerance. - -This port contains a standalone runtime environment of Erlang 17 -to be used during the development of OTP applications. - -WWW: http://www.erlang.org/ diff --git lang/erlang-runtime18/Makefile lang/erlang-runtime18/Makefile deleted file mode 100644 index d5552410ac8f..000000000000 --- lang/erlang-runtime18/Makefile +++ /dev/null @@ -1,156 +0,0 @@ -# Created by: ruslan@shevchenko.kiev.ua -# $FreeBSD$ - -PORTNAME= erlang -PORTVERSION= 18.3.4.11 -CATEGORIES= lang parallel java -MASTER_SITES= http://www.erlang.org/download/:erlangorg \ - http://erlang.stacken.kth.se/download/:erlangorg \ - http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \ - http://olgeni.olgeni.com/~olgeni/distfiles/:local \ - LOCAL/olgeni:local -PKGNAMESUFFIX= -runtime18 -DISTNAME= otp_src_${ERLANG_REL} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:erlangorg \ - preloaded-${PORTVERSION}${EXTRACT_SUFX}:local -DIST_SUBDIR= erlang -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -PATCH_SITES= http://olgeni.olgeni.com/~olgeni/distfiles/ \ - LOCAL/olgeni -PATCHFILES= patch-otp-18.3.1 patch-otp-18.3.2 patch-otp-18.3.3 \ - patch-otp-18.3.4 patch-otp-18.3.4.1 patch-otp-18.3.4.2 \ - patch-otp-18.3.4.3 patch-otp-18.3.4.4 patch-otp-18.3.4.5 \ - patch-otp-18.3.4.6 patch-otp-18.3.4.7 patch-otp-18.3.4.8 \ - patch-otp-18.3.4.9 patch-otp-18.3.4.10 patch-otp-18.3.4.11 - -MAINTAINER= erlang@FreeBSD.org -COMMENT= Functional programming language from Ericsson - -LICENSE= APACHE20 - -WRKSRC= ${WRKDIR}/otp_src_${ERLANG_REL} - -ERLANG_LIB= ${PORTNAME}${PORTVERSION:C/\..*//} -ERLANG_REL= 18.3 - -OPTIONS_SUB= yes -SUB_FILES= pkg-message -SUB_LIST= ERLANG_LIB=${ERLANG_LIB} - -MAKE_JOBS_UNSAFE=yes - -OPTIONS_DEFINE= DIRTY DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX -OPTIONS_DEFAULT=DTRACE HIPE KQUEUE OPENSSL SCTP SMP THREADS - -DIRTY_DESC= Enable Dirty schedulers (experimental) -GS_DESC= Enable GS application (deprecated) -HIPE_DESC= Build native HiPE compiler -KQUEUE_DESC= Enable Kernel Poll (kqueue) support -NATIVE_DESC= Enable native libraries -SCTP_DESC= Enable SCTP support -SMP_DESC= Enable SMP support -WX_DESC= Enable WX application - -NATIVE_IMPLIES= HIPE - -.if !exists(/usr/sbin/dtrace) -OPTIONS_EXCLUDE+= DTRACE -.endif - -OPTIONS_EXCLUDE_DragonFly= HIPE NATIVE SCTP -# ld(1) fails to link probes: missing __dtrace_erlang___* symbols -OPTIONS_EXCLUDE_aarch64= DTRACE -OPTIONS_EXCLUDE_armv6= DTRACE -OPTIONS_EXCLUDE_armv7= DTRACE -OPTIONS_EXCLUDE_i386= DTRACE - -OPENSSL_VARS= BROKEN_SSL=openssl111 - -GNU_CONFIGURE= yes -LDFLAGS+= -L${LOCALBASE}/lib -USES= gmake ncurses perl5 -USE_PERL5= build - -# If you run Erlang and get a message resembling "WARNING: number of -# probes fixed does not match the number of defined probes (54 != 132, -# respectively)" you probably misconfigured DTrace in some way. - -DIRTY_CONFIGURE_ENABLE= dirty-schedulers -DTRACE_CFLAGS= -fno-omit-frame-pointer -DTRACE_CONFIGURE_WITH= dynamic-trace=dtrace -DTRACE_VARS= STRIP="" -GS_USES= tk:run -HIPE_CONFIGURE_ENABLE= hipe -JAVA_CONFIGURE_ENV= ac_cv_prog_JAVAC="${JAVAC}" -JAVA_CONFIGURE_WITH= javac -JAVA_VARS= USE_JAVA=yes -KQUEUE_CONFIGURE_ENABLE=kernel-poll -NATIVE_CONFIGURE_ENABLE=native-libs -ODBC_CONFIGURE_WITH= odbc -ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC -OPENSSL_CONFIGURE_WITH= ssl=${OPENSSLBASE} -OPENSSL_USES= ssl -SCTP_CONFIGURE_ENABLE= sctp -SMP_CONFIGURE_ENABLE= smp-support -THREADS_CONFIGURE_ENABLE= threads -WX_CONFIGURE_WITH= wx-config=${WX_CONFIG} -WX_VARS= USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu" - -.include - -.include - -.if ${OPSYS} == FreeBSD -. if ${OSVERSION} >= 1200085 && ${SSL_DEFAULT} == base -BROKEN= Does not support OpenSSL 1.1, use Erlang 19+ -. endif -.endif - -.if ${OPSYS} == FreeBSD -CFLAGS+= -DMAP_NORESERVE=0 -.endif - -.if ${ARCH} == i386 -MAKE_ARGS+= ARCH=x86 -.endif - -.if ${ARCH} == armv6 || ${ARCH} == armv7 -MAKE_ARGS+= ARCH=arm -.endif - -pre-configure: - cd ${WRKSRC} && ${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/preloaded-${PORTVERSION}${EXTRACT_SUFX} - -pre-configure-MX-off: - echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP - -post-configure-ODBC-on: - ${RM} ${WRKSRC}/lib/odbc/SKIP - -pre-build-NATIVE-on: - @cd ${WRKSRC} && ${MAKE_CMD} clean - -post-install-GS-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-* - -post-install-JAVA-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-* - -post-install-ODBC-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-* - -post-install-OPENSSL-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-* - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-* - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-* - -post-install-WX-off: - ${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-* - -post-stage: - ${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete - @cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \ - | ${SORT} >> ${TMPPLIST} - -.include diff --git lang/erlang-runtime18/distinfo lang/erlang-runtime18/distinfo deleted file mode 100644 index 40fb25da07f5..000000000000 --- lang/erlang-runtime18/distinfo +++ /dev/null @@ -1,35 +0,0 @@ -TIMESTAMP = 1542300070 -SHA256 (erlang/otp_src_18.3.tar.gz) = fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 -SIZE (erlang/otp_src_18.3.tar.gz) = 68292101 -SHA256 (erlang/preloaded-18.3.4.11.tar.gz) = 70bb83686445e4960ff178dfc9df7ad6e9bf018ec9cf45526fe5300cfb0c1b92 -SIZE (erlang/preloaded-18.3.4.11.tar.gz) = 305266 -SHA256 (erlang/patch-otp-18.3.1) = 19a45ed599f4348dd83540c4c3a60bfe20dac5f83643cff1dd71d1b5af1e9bae -SIZE (erlang/patch-otp-18.3.1) = 20435 -SHA256 (erlang/patch-otp-18.3.2) = 064065ebeadc26a76fcd1b291bc884039117ee8699fe5015809a025dc63a0f35 -SIZE (erlang/patch-otp-18.3.2) = 70255 -SHA256 (erlang/patch-otp-18.3.3) = 5a55b18ee8ec15c8cfe9ffd4687588c0a6f71216538575ae3bbbf67eb5a0485a -SIZE (erlang/patch-otp-18.3.3) = 87238 -SHA256 (erlang/patch-otp-18.3.4) = 33ceea8b53d7d2a67b78085d7bc80c8b04f5cac792aee49410c86ac45895151a -SIZE (erlang/patch-otp-18.3.4) = 31596 -SHA256 (erlang/patch-otp-18.3.4.1) = 5998c9578b92cbc4e12d47ae7001f52150d3a065e8101569977e2caa62674456 -SIZE (erlang/patch-otp-18.3.4.1) = 23095 -SHA256 (erlang/patch-otp-18.3.4.2) = 4bce5c1965d4924463c6a243e014cdf5120cd8e75b903e0d00b8557fc00b7bad -SIZE (erlang/patch-otp-18.3.4.2) = 23520 -SHA256 (erlang/patch-otp-18.3.4.3) = 594be3196ea5a87bebcbc414b189efced68a6de0ddee12bcab7089d5de51f85f -SIZE (erlang/patch-otp-18.3.4.3) = 5893 -SHA256 (erlang/patch-otp-18.3.4.4) = a2cfac97e2ecb09ec53ebe7fcba953382e4b01b567219ad4abdd63652da9dc91 -SIZE (erlang/patch-otp-18.3.4.4) = 6547 -SHA256 (erlang/patch-otp-18.3.4.5) = d539ac9b72adbda634adfc0fe391e32c0a82c7b4a8807dc606f98bf816397821 -SIZE (erlang/patch-otp-18.3.4.5) = 34006 -SHA256 (erlang/patch-otp-18.3.4.6) = dc3682fb9c2f456cd9b4eb9ab8d00c09f6012a2123e416e2fee8e17ce69ac4ef -SIZE (erlang/patch-otp-18.3.4.6) = 37943 -SHA256 (erlang/patch-otp-18.3.4.7) = 8b79ab844e465e790eb4ef016d49b917444371190fead05cee2675b435d8a029 -SIZE (erlang/patch-otp-18.3.4.7) = 10475 -SHA256 (erlang/patch-otp-18.3.4.8) = bcac3fe782e7a4b78f36d9d5c928b1d7a2e67aff20ac7bf8f82e5eaab33a60a1 -SIZE (erlang/patch-otp-18.3.4.8) = 19206 -SHA256 (erlang/patch-otp-18.3.4.9) = 3d031267f0111c9bd9a55d44a4f8cb67ad4cfda44f25d5a01e459640b7905d89 -SIZE (erlang/patch-otp-18.3.4.9) = 5284 -SHA256 (erlang/patch-otp-18.3.4.10) = 51f1840f3969fe28a042507a803871a132a483008e58a80e15877c8938bc0175 -SIZE (erlang/patch-otp-18.3.4.10) = 5159 -SHA256 (erlang/patch-otp-18.3.4.11) = ff2402592d1d6ba44043b8cdb28b7f569c48e1920691e2709dad2e8f9bd2b850 -SIZE (erlang/patch-otp-18.3.4.11) = 34336 diff --git lang/erlang-runtime18/files/patch-Makefile.in lang/erlang-runtime18/files/patch-Makefile.in deleted file mode 100644 index e5cd983b6a7e..000000000000 --- lang/erlang-runtime18/files/patch-Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig 2015-06-23 18:56:21 UTC -+++ Makefile.in -@@ -60,7 +60,7 @@ bindir = @bindir@ - libdir = @libdir@ - - # Where Erlang/OTP is located --libdir_suffix = /erlang -+libdir_suffix = /erlang18 - erlang_libdir = $(libdir)$(libdir_suffix) - erlang_bindir = $(erlang_libdir)/bin - -@@ -1013,7 +1013,7 @@ $(TEST_DIRS): - # - # Order is important here, don't change it! - # --INST_DEP += install.dirs install.emulator install.libs install.Install install.otp_version install.bin -+INST_DEP += install.dirs install.emulator install.libs install.Install install.otp_version - - install: $(INST_DEP) - diff --git lang/erlang-runtime18/files/patch-erts_etc_unix_run__erl.c lang/erlang-runtime18/files/patch-erts_etc_unix_run__erl.c deleted file mode 100644 index b76c5127d2a8..000000000000 --- lang/erlang-runtime18/files/patch-erts_etc_unix_run__erl.c +++ /dev/null @@ -1,12 +0,0 @@ ---- erts/etc/unix/run_erl.c.orig 2015-03-31 12:32:52 UTC -+++ erts/etc/unix/run_erl.c -@@ -73,9 +73,6 @@ - #ifdef HAVE_UTMP_H - # include - #endif --#ifdef HAVE_UTIL_H --# include --#endif - #ifdef HAVE_SYS_IOCTL_H - # include - #endif diff --git lang/erlang-runtime18/files/patch-lib_crypto_c__src_Makefile.in lang/erlang-runtime18/files/patch-lib_crypto_c__src_Makefile.in deleted file mode 100644 index 65e1b759ad66..000000000000 --- lang/erlang-runtime18/files/patch-lib_crypto_c__src_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/crypto/c_src/Makefile.in.orig 2016-03-14 20:11:15 UTC -+++ lib/crypto/c_src/Makefile.in -@@ -90,7 +90,7 @@ endif - DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ - - ifeq ($(DYNAMIC_CRYPTO_LIB),yes) --SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@ -+SSL_DED_LD_RUNTIME_LIBRARY_PATH = - CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) - EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB - else diff --git lang/erlang-runtime18/files/patch-lib_crypto_priv_Makefile lang/erlang-runtime18/files/patch-lib_crypto_priv_Makefile deleted file mode 100644 index 26f2c38e360d..000000000000 --- lang/erlang-runtime18/files/patch-lib_crypto_priv_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/crypto/priv/Makefile.orig 2016-03-14 20:11:15 UTC -+++ lib/crypto/priv/Makefile -@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o - # ---------------------------------------------------- - - $(SO_NIFLIB): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_NIFLIB): $(OBJS) diff --git lang/erlang-runtime18/files/patch-lib_erl__interface_src_connect_ei__resolve.c lang/erlang-runtime18/files/patch-lib_erl__interface_src_connect_ei__resolve.c deleted file mode 100644 index 16046e8e4934..000000000000 --- lang/erlang-runtime18/files/patch-lib_erl__interface_src_connect_ei__resolve.c +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/erl_interface/src/connect/ei_resolve.c.orig 2015-03-31 12:32:52 UTC -+++ lib/erl_interface/src/connect/ei_resolve.c -@@ -649,7 +649,8 @@ struct hostent *ei_gethostbyname_r(const - - return result; - #else -- return gethostbyname_r(name,hostp,buffer,buflen,h_errnop); -+ struct hostent *dummy; -+ return gethostbyname_r(name,hostp,buffer,buflen,&dummy,h_errnop); - #endif - #endif - #endif diff --git lang/erlang-runtime18/files/patch-lib_stdlib_src_calendar.erl lang/erlang-runtime18/files/patch-lib_stdlib_src_calendar.erl deleted file mode 100644 index 34b753d85b27..000000000000 --- lang/erlang-runtime18/files/patch-lib_stdlib_src_calendar.erl +++ /dev/null @@ -1,26 +0,0 @@ ---- lib/stdlib/src/calendar.erl.orig 2015-03-31 12:32:52 UTC -+++ lib/stdlib/src/calendar.erl -@@ -279,11 +279,19 @@ local_time_to_universal_time(DateTime, I - DateTime1 :: datetime1970(), - DateTime :: datetime1970(). - local_time_to_universal_time_dst(DateTime) -> -- UtDst = erlang:localtime_to_universaltime(DateTime, true), -- Ut = erlang:localtime_to_universaltime(DateTime, false), - %% Reverse check the universal times -- LtDst = erlang:universaltime_to_localtime(UtDst), -- Lt = erlang:universaltime_to_localtime(Ut), -+ {UtDst, LtDst} = -+ try -+ UtDst0 = erlang:localtime_to_universaltime(DateTime, true), -+ {UtDst0, erlang:universaltime_to_localtime(UtDst0)} -+ catch error:badarg -> {error, error} -+ end, -+ {Ut, Lt} = -+ try -+ Ut0 = erlang:localtime_to_universaltime(DateTime, false), -+ {Ut0, erlang:universaltime_to_localtime(Ut0)} -+ catch error:badarg -> {error, error} -+ end, - %% Return the valid universal times - case {LtDst,Lt} of - {DateTime,DateTime} when UtDst =/= Ut -> diff --git lang/erlang-runtime18/files/patch-lib_wx_c__src_wxe__impl.cpp lang/erlang-runtime18/files/patch-lib_wx_c__src_wxe__impl.cpp deleted file mode 100644 index 5b1e66586f2f..000000000000 --- lang/erlang-runtime18/files/patch-lib_wx_c__src_wxe__impl.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 lang/erlang-runtime18/files/pkg-message.in lang/erlang-runtime18/files/pkg-message.in deleted file mode 100644 index fe91d05701d4..000000000000 --- lang/erlang-runtime18/files/pkg-message.in +++ /dev/null @@ -1,6 +0,0 @@ -=========================================================================== - -To use this runtime port for development or testing, just prepend -its binary path ("%%LOCALBASE%%/lib/%%ERLANG_LIB%%/bin") to your PATH variable. - -=========================================================================== diff --git lang/erlang-runtime18/pkg-descr lang/erlang-runtime18/pkg-descr deleted file mode 100644 index 0f93b84a25ac..000000000000 --- lang/erlang-runtime18/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Erlang is a programming language used to build massively scalable soft -real-time systems with requirements on high availability. Some of its -uses are in telecoms, banking, e-commerce, computer telephony and -instant messaging. Erlang's runtime system has built-in support for -concurrency, distribution and fault tolerance. - -This port contains a standalone runtime environment of Erlang 18 -to be used during the development of OTP applications. - -WWW: http://www.erlang.org/