lang/quickjs: Update 2020.04.12 -> 2020.09.06

PR:		250592
Submitted by:	swills

5 files changed, 31 insertions, 39 deletions

diff --git a/lang/quickjs/Makefile b/lang/quickjs/Makefile
index 4de59e6fcbb7..0c6ac7e5634c 100644
--- a/lang/quickjs/Makefile
+++ b/lang/quickjs/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	quickjs
-DISTVERSION=	2020.04.12
+DISTVERSION=	2020.09.06
 CATEGORIES=	lang devel
 MASTER_SITES=	https://bellard.org/${PORTNAME}/
 DISTNAME=	${PORTNAME}-${DISTVERSION:S/./-/g}
diff --git a/lang/quickjs/distinfo b/lang/quickjs/distinfo
index 4d12f286d2e8..dea98409b6ef 100644
--- a/lang/quickjs/distinfo
+++ b/lang/quickjs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1590816786
-SHA256 (quickjs-2020-04-12.tar.xz) = 22b15f2cc910289821379dc8d314d35ef492f6d69d4419c9bcb1b2263e9d71c8
-SIZE (quickjs-2020-04-12.tar.xz) = 741060
+TIMESTAMP = 1603622497
+SHA256 (quickjs-2020-09-06.tar.xz) = 0021a3e8cdc6b61e225411d05e2841d2437e1ccf4b4cabb9a5f7685ebfb57717
+SIZE (quickjs-2020-09-06.tar.xz) = 753080
diff --git a/lang/quickjs/files/patch-qjs.c b/lang/quickjs/files/patch-qjs.c
index cd092b28c605..5af56c5da80e 100644
--- a/lang/quickjs/files/patch-qjs.c
+++ b/lang/quickjs/files/patch-qjs.c
@@ -1,20 +1,11 @@
---- qjs.c.orig	2019-09-18 18:34:20 UTC
+--- qjs.c.orig	2020-09-06 09:31:51 UTC
 +++ qjs.c
-@@ -130,7 +130,7 @@ static inline size_t js_trace_malloc_usable_size(void 
-     return malloc_usable_size(ptr);
- #else
-     /* change this to `return 0;` if compilation fails */
--    return malloc_usable_size(ptr);
-+    return 0; //return malloc_usable_size(ptr);
+@@ -36,6 +36,8 @@
+ #include <malloc/malloc.h>
+ #elif defined(__linux__)
+ #include <malloc.h>
++#elif defined(__FreeBSD__)
++#include <malloc_np.h>
  #endif
- }
- 
-@@ -246,7 +246,7 @@ static const JSMallocFunctions trace_mf = {
-     (size_t (*)(const void *))malloc_usable_size,
- #else
-     /* change this to `NULL,` if compilation fails */
--    malloc_usable_size,
-+    NULL, //malloc_usable_size,
- #endif
- };
  
+ #include "cutils.h"
diff --git a/lang/quickjs/files/patch-quickjs-libc.c b/lang/quickjs/files/patch-quickjs-libc.c
index 30a7b486e4ac..0decd5f412e1 100644
--- a/lang/quickjs/files/patch-quickjs-libc.c
+++ b/lang/quickjs/files/patch-quickjs-libc.c
@@ -1,17 +1,18 @@
---- quickjs-libc.c.orig	2020-04-12 13:18:13 UTC
+--- quickjs-libc.c.orig	2020-09-06 09:31:51 UTC
 +++ quickjs-libc.c
-@@ -45,9 +45,13 @@
- #include <termios.h>
+@@ -47,8 +47,14 @@
  #include <sys/ioctl.h>
  #include <sys/wait.h>
+ 
 -#if defined(__APPLE__)
++#if defined(__FreeBSD__)
++extern char **environ;
++#endif
++
 +#if defined(__APPLE__) || defined(__FreeBSD__)
  typedef sig_t sighandler_t;
- #endif
 +#endif
-+
-+#if defined(__FreeBSD__)
-+extern char **environ;
- #endif
- 
- #include "cutils.h"
++#if defined(__APPLE__)
+ #if !defined(environ)
+ #include <crt_externs.h>
+ #define environ (*_NSGetEnviron())
diff --git a/lang/quickjs/files/patch-quickjs.c b/lang/quickjs/files/patch-quickjs.c
index 4102224158be..435ab081af7b 100644
--- a/lang/quickjs/files/patch-quickjs.c
+++ b/lang/quickjs/files/patch-quickjs.c
@@ -1,11 +1,11 @@
---- quickjs.c.orig	2020-04-12 13:18:13 UTC
+--- quickjs.c.orig	2020-09-06 09:31:51 UTC
 +++ quickjs.c
-@@ -1694,7 +1694,7 @@ static const JSMallocFunctions def_malloc_funcs = {
-     (size_t (*)(const void *))malloc_usable_size,
- #else
-     /* change this to `NULL,` if compilation fails */
--    malloc_usable_size,
-+    NULL, //malloc_usable_size,
+@@ -36,6 +36,8 @@
+ #include <malloc/malloc.h>
+ #elif defined(__linux__)
+ #include <malloc.h>
++#elif defined(__FreeBSD__)
++#include <malloc_np.h>
  #endif
- };
  
+ #include "cutils.h"