diff options
8 files changed, 52 insertions, 15 deletions
diff --git a/lang/erlang-runtime15/Makefile b/lang/erlang-runtime15/Makefile index 92ed10e97651..20be86e8fd6e 100644 --- a/lang/erlang-runtime15/Makefile +++ b/lang/erlang-runtime15/Makefile @@ -3,7 +3,7 @@ PORTNAME= erlang PORTVERSION= 15.b.03.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ @@ -43,8 +43,7 @@ OPTIONS_EXCLUDE_DragonFly= SCTP ERL_RELEASE= R${PORTVERSION:S/.//g:tu:S/1$/-1/} -USES= gmake perl5 -USE_AUTOTOOLS= autoconf:env +USES= autoreconf gmake perl5 USE_PERL5= build GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib diff --git a/lang/erlang-runtime15/files/patch-erts_emulator_drivers_common_efile__drv.c b/lang/erlang-runtime15/files/patch-erts_emulator_drivers_common_efile__drv.c index dedf69150029..49b55a31d613 100644 --- a/lang/erlang-runtime15/files/patch-erts_emulator_drivers_common_efile__drv.c +++ b/lang/erlang-runtime15/files/patch-erts_emulator_drivers_common_efile__drv.c @@ -285,7 +285,14 @@ $FreeBSD$ DTRACE_INVOKE_RETURN(FILE_FADVISE); } -@@ -1906,6 +1968,7 @@ +@@ -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; } @@ -293,7 +300,7 @@ $FreeBSD$ } static void free_sendfile(void *data) { -@@ -2023,6 +2086,21 @@ +@@ -2023,6 +2088,21 @@ return; TRACE_F(("x%i", (int) d->command)); d->again = sys_info.async_threads == 0; @@ -315,7 +322,7 @@ $FreeBSD$ DRIVER_ASYNC(d->level, desc, d->invoke, void_ptr=d, d->free); } -@@ -2247,6 +2325,8 @@ +@@ -2247,6 +2327,8 @@ return; } @@ -324,7 +331,7 @@ $FreeBSD$ switch (d->command) { case FILE_READ: -@@ -2375,6 +2455,10 @@ +@@ -2375,6 +2457,10 @@ } else { desc->fd = d->fd; desc->flags = d->flags; diff --git a/lang/erlang-runtime16/Makefile b/lang/erlang-runtime16/Makefile index 6490c58d80c1..db4e88692544 100644 --- a/lang/erlang-runtime16/Makefile +++ b/lang/erlang-runtime16/Makefile @@ -3,7 +3,7 @@ PORTNAME= erlang PORTVERSION= 16.b.03.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ @@ -43,8 +43,7 @@ OPTIONS_EXCLUDE_DragonFly= SCTP ERL_RELEASE= R${PORTVERSION:S/.//g:tu:S/1$/-1/} -USES= gmake perl5 -USE_AUTOTOOLS= autoconf:env +USES= autoreconf gmake perl5 USE_PERL5= build GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib diff --git a/lang/erlang-runtime16/files/patch-erts_emulator_drivers_common_efile__drv.c b/lang/erlang-runtime16/files/patch-erts_emulator_drivers_common_efile__drv.c new file mode 100644 index 000000000000..bc3c37541f66 --- /dev/null +++ b/lang/erlang-runtime16/files/patch-erts_emulator_drivers_common_efile__drv.c @@ -0,0 +1,11 @@ +--- 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 a/lang/erlang-runtime17/Makefile b/lang/erlang-runtime17/Makefile index 5615f0e2a79b..2d81c390859c 100644 --- a/lang/erlang-runtime17/Makefile +++ b/lang/erlang-runtime17/Makefile @@ -3,7 +3,7 @@ PORTNAME= erlang PORTVERSION= 17.5.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ http://erlang.stacken.kth.se/download/:erlangorg \ @@ -43,8 +43,7 @@ OPTIONS_EXCLUDE_DragonFly= SCTP ERL_RELEASE= 17.5 -USES= gmake perl5 -USE_AUTOTOOLS= autoconf:env +USES= autoreconf gmake perl5 USE_PERL5= build GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib diff --git a/lang/erlang-runtime17/files/patch-erts_emulator_drivers_common_efile__drv.c b/lang/erlang-runtime17/files/patch-erts_emulator_drivers_common_efile__drv.c new file mode 100644 index 000000000000..bc3c37541f66 --- /dev/null +++ b/lang/erlang-runtime17/files/patch-erts_emulator_drivers_common_efile__drv.c @@ -0,0 +1,11 @@ +--- 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 a/lang/erlang/Makefile b/lang/erlang/Makefile index b5a263208803..42df0d01fb6a 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -3,6 +3,7 @@ PORTNAME= erlang PORTVERSION= 17.5.2 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= lang parallel java MASTER_SITES= http://www.erlang.org/download/:erlangorg \ @@ -47,8 +48,7 @@ OPTIONS_EXCLUDE_DragonFly= SCTP ERL_RELEASE= 17.5 -USES= gmake perl5 -USE_AUTOTOOLS= autoconf:env +USES= autoreconf gmake perl5 USE_PERL5= build USE_RC_SUBR= epmd GNU_CONFIGURE= yes diff --git a/lang/erlang/files/patch-erts_emulator_drivers_common_efile__drv.c b/lang/erlang/files/patch-erts_emulator_drivers_common_efile__drv.c new file mode 100644 index 000000000000..bc3c37541f66 --- /dev/null +++ b/lang/erlang/files/patch-erts_emulator_drivers_common_efile__drv.c @@ -0,0 +1,11 @@ +--- 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 { |