Index: Makefile
===================================================================
--- Makefile	(revision 505284)
+++ Makefile	(working copy)
@@ -7,6 +7,9 @@
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	gnu-
 
+PATCH_SITES=	https://svn.savannah.gnu.org/viewvc/apl/trunk/src/
+PATCHFILES=	Tokenizer.cc?r1=1164&r2=1177&view=patch:-p1
+
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Free interpreter for APL programming language
 
@@ -14,7 +17,7 @@
 
 LIB_DEPENDS=	libfftw3.so:math/fftw3
 
-USES=		gmake libtool localbase
+USES=		compiler:c++11-lang gmake libtool localbase
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
Index: distinfo
===================================================================
--- distinfo	(revision 505284)
+++ distinfo	(working copy)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1561298598
+TIMESTAMP = 1561894718
 SHA256 (apl-1.8.tar.gz) = 144f4c858a0d430ce8f28be90a35920dd8e0951e56976cb80b55053fa0d8bbcb
 SIZE (apl-1.8.tar.gz) = 3565018
+SHA256 (Tokenizer.cc?r1=1164&r2=1177&view=patch) = 1386e9fe8a75316118aa923f2ecb57fab33112d278a2d2ee0a12979221f49714
+SIZE (Tokenizer.cc?r1=1164&r2=1177&view=patch) = 1369
Index: files/patch-src_Error.hh
===================================================================
--- files/patch-src_Error.hh	(nonexistent)
+++ files/patch-src_Error.hh	(working copy)
@@ -0,0 +1,10 @@
+--- src/Error.hh.orig	2019-06-30 10:39:00 UTC
++++ src/Error.hh
+@@ -25,6 +25,7 @@
+ #include "Common.hh"
+ #include "ErrorCode.hh"
+ #include "UCS_string.hh"
++#include <cstring>
+ 
+ #ifdef __GNUC__
+     #define GNUC__noreturn __attribute__ ((noreturn))

Property changes on: files/patch-src_Error.hh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-src_Quad__WA.cc
===================================================================
--- files/patch-src_Quad__WA.cc	(nonexistent)
+++ files/patch-src_Quad__WA.cc	(working copy)
@@ -0,0 +1,11 @@
+--- src/Quad_WA.cc.orig	2019-06-30 11:05:40 UTC
++++ src/Quad_WA.cc
+@@ -24,7 +24,7 @@
+ extern uint64_t top_of_memory();
+ 
+ rlim_t Quad_WA::initial_rlimit = RLIM_INFINITY;
+-uint64_t Quad_WA::total_memory = 0x40000000;   // a little more than 1 Gig
++int64_t Quad_WA::total_memory = 0x40000000;   // a little more than 1 Gig
+ int64_t  Quad_WA::WA_margin = 0;  // 100000000;
+ int      Quad_WA::WA_scale = 90;   // percent
+ unsigned long long Quad_WA::initial_sbrk = 0;

Property changes on: files/patch-src_Quad__WA.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-src_Quad__WA.hh
===================================================================
--- files/patch-src_Quad__WA.hh	(nonexistent)
+++ files/patch-src_Quad__WA.hh	(working copy)
@@ -0,0 +1,11 @@
+--- src/Quad_WA.hh.orig	2019-06-30 11:05:53 UTC
++++ src/Quad_WA.hh
+@@ -38,7 +38,7 @@ class Quad_WA : public RO_SystemVariable (public)
+    static void init(bool log_startup);
+ 
+    /// the estimated (!) the amount of free memory
+-   static uint64_t total_memory;
++   static int64_t total_memory;
+ 
+    /// a safety margin causing WS FULL before complete memory starvation
+    static int64_t WA_margin;

Property changes on: files/patch-src_Quad__WA.hh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-src_Value.cc
===================================================================
--- files/patch-src_Value.cc	(nonexistent)
+++ files/patch-src_Value.cc	(working copy)
@@ -0,0 +1,11 @@
+--- src/Value.cc.orig	2019-06-30 11:24:46 UTC
++++ src/Value.cc
+@@ -181,7 +181,7 @@ bool
+ Value::check_WS_FULL(const char * args, ShapeItem requested_cell_count,
+                      const char * loc)
+ {
+-const uint64_t used_memory
++const int64_t used_memory
+                = (total_ravel_count + requested_cell_count) * sizeof(Cell)
+                + (value_count + 1) * sizeof(Value)
+                + Workspace::SI_entry_count() * sizeof(StateIndicator);

Property changes on: files/patch-src_Value.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property