Update to 10.6.0 from 10.5.4

* Add Java dependency, it is used with GUI server.

Changelog:
10.5.5 2013 November 20th, development release
   Allow trailing , (comma) in JSON arrays. The new JSON ECMA-404 seems not
   to allow it but the JavaScript standard ECMA-262 and many browsers do.

   Added makefile_linux_openwrt for for TP-link TL-WR703N travel router
   contributed by Dexter.

   In arithmetik big integer operations + - * / % more than two operands
   are allowed as in normal precision integer operations.

   On Windows support UNIX conventions for formatting 64-bit integers.
   I.e.: %lld %llu %llx %llX additionally to %I64d %I64u %I64x %I64X

   Added ++, -- to qa-bigint. Fixed sign change on second operand of
   bigint -- when second operand was negative.

   Some cleanup in Cilk API when releasing resources.

   The 'gcd' function now also works on big integers and > 2 operands.

   On UBUNTU Linux decimal numbers can be formatted using a GNU extension
   in libc, e.g: (format "%'d" 12345) => 12,345
   The optional ' (single quote) after the % character causes thousands
   to be separated with the appropiate character for the current locale.

   Fixed a cell leak introduced in 10.5.5 when deleting contexts.

   The default pretty-print float setting has been changed to "%1.15g".

   'reset' now also cancels command line parameter processing.

   A fix in 'round' when number is exacty 0.5.

   'map', 'apply', 'stats', 'corr', 't-test' now also can take arrays

   'bayes-query' with Fisher's Chi2 method calculated wrong probabilities
   when training in more than two categories. When training in two
   categories the result probabilities were swapped - reporting the
   probability for the second category first. 'bayes-query' calculating
   probabilities with the Chain Bayesian method - using the true flag -
   was not affected.

   Many documentation changes and corrections.

10.5.6 December 10th, 2013, development release
   Since OSX 10.9 Maverick (format "%'d" 12345) => 12,345 will work too.
   Will not work on any locale but works on en_US.UTF-8.

   Fixed 'apply' for arrays introduced in 10.5.5 for a cell/memory leak.

   When making hash trees using the predefined context 'Tree',
   the default symbol in the new context is protected as is 'Tree:Tree'.
   Default symbols in hash trees must be 'nil' in order for the hash
   statement syntax for namespaces to work.

   When copying symbols from a source context to a target contest using 'new'
   or 'def-new', the 'protected?' property is copied too.

   An empty list as index vector for a list or array yields the original
   list or array as return value:
       (set 'L '(1 2 (3 4)))
       (L '())    => (1 2 (3 4))
       (nth '() L) => (1 2 (3 4))

   Many document changes, additions and corrections.

   'int' can convert binarys numbers like (int "0b11111") => 31
   This format is recognized by the code reader/loader since v.10.4.4.

   Integers are accepted as hash keys. This allows creating sparse vectors:
       (new Tree 'V)
       (V 123 "hello")
       (V 123) => "hello"

   'reverse' can be used on arrays.

   Anaphoric system variable $it is now set to the value of the conditional
   expression in 'if'.

   Speed improvements in evaluateExpression().  For this The -pendatic option
   has been turned off in Linux to avoid ISO C90 mixed declaration warnings.

   'length' on integers will return the number of digits, just like it already
   does on bigint numbers, on floats returns the number of decimal digits before
   the decimal separator.


10.5.7
   Fixes for deprecated CYGWIN compile. See also makefile_cygwin for more info.

   Clear potential error condition when doing 'import'.

   In guiserver.jar: When adding columns with empty string headers, this will not
   any more put the column number as header. This allows to add columns to
   headerless tables, as possible when supplying empty string headers in the
   initial gs:table statement.

   Debugger will now always highlight the correct expression, not highlight
   the first one if multiple instances exist.

   Eliminated strncat() for BSD and better speed with memcpy() in most places.

   Delay signal-behavior change in spawn after getting parameters. Makes better
   error recovery.

   In guiserver.jar: New table functions. Thanks to Ferry de Bruin.
     gs:table-remove-row, gs:table-set-column-name and gs:table-set-row-count.
   To avoid API naming confusions, the naming of old gs:table-set-row-number
   is deprecated and should be called as gs:table-show-row-number.
   The old naming will continue to work. Three new optional parameters for
   'gs:scroll-pane' can specify colun header, row headers and a widget
   for the top left corner of a table used in the scroll pane.

   'find-all' should return an empty list as documented when nothing is found
   on strings too.

   Some renaming of functions and constants for better code readability and
   some small refactoring in several files.

   qa-bench has been redone with changes for Emscripten compiled newLISP.
   Now calibrates for comparison with Mac OSX 9.1 on 2.3GHz Intel Core i5.

   Fixed a crash bug when colon operator has missing or wrong-type args
   on 64-bit compiles.

   newLISP compiled to JavaSript with Emscripten
   ---------------------------------------------
   Added makefile_emscripten_lib_utf8. For this
   Must download and install the Emscripten-SDK from here:
       https://github.com/kripken/emscripten/wiki/Emscripten-SDK
   Tested on OSX 10.9 installing emsdk-portable.tar.gz v.1.7.8

   The newlisp-js-lib.js is made using makefile_emscripten_lib_utf8.

   The new function 'eval-string-js' takes a JavaSript string.
   New 'display-html' can either replace the current page or display
   a page in a new tab of the host browser. 'display-html' must be
   defined in Emscripten appplication .html

   Some functions (filter, index, clean, exists, forl-all) will not show
   error messages under certain circumstanmces in the monitor, although
   newLISP behaves correctly throwing the exception (setjmp/longjmp), they
   just don't reach the Emscripten console (log). In this case, if the error
   is not 'catch'ed newLISP exits without advising why. This problem goes away
   when compiling with Emscriptem without any optimizations, but slows
   everything down by a factor of 40 to 50. Normal performance is around
   1.5 of native on Mac OSX when excluding all time/date related functions
   and a few other outliers. Including outliers about 2.65.
   See also here: https://github.com/kripken/emscripten/issues/810
   (volatile declaration did not help)

   All file and directory functions work (almost all did all the time),
   but changes are lost after leaving the page or reloading the page.
   Storage is 'session storage' only. No URLs are in allowed in file
   functions as is on native compiled newLISP.

   As editor, CodeMirror from codemirror.net is used and mode/newlisp.js
   was created for syntax high-lighting.

10.5.8
   'macro' is now a built-in primitive function working exactly as described
   in the macro.lsp module, which is now obsolete. Macros cannot be redefined
   using 'macro'. Macros can be nested. A symbol used as a macro can only be
   used as a macro, even if changing the definition of it.

   Another speed improvement for 'read-line' on file handles (the first speed
   improvement happend in 10.3.10).

10.6.0
   Eliminated emscripten-lib.c, gets handled by unix-lib.c.

   A fix for 'file?' and 'directory?' predicates when applied to root
   directories on Windows.

   Updated examples/udp-server.lsp to nmake it work on Windows.

4 files changed, 33 insertions, 9 deletions

diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile
index 6cec1571c4b..e4fc500bb17 100644
--- a/lang/newlisp/Makefile
+++ b/lang/newlisp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2013/10/12 10:30:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2014/07/07 14:25:31 ryoon Exp $
 #
 
-DISTNAME=	newlisp-10.5.4
+DISTNAME=	newlisp-10.6.0
 CATEGORIES=	lang
-MASTER_SITES=	http://www.newlisp.org/downloads/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=newlisp/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ryoon@NetBSD.org
@@ -18,6 +18,14 @@ CONFIGURE_ARGS+=	--enable-readline
 
 USE_GNU_READLINE=	yes
 
+USE_JAVA=	run
+USE_JAVA2=	yes
+
+SUBST_CLASSES+=		java
+SUBST_FILES.java=	guiserver/guiserver.lsp
+SUBST_STAGE.java=	pre-configure
+SUBST_SED.java=		-e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'
+
 SUBST_CLASSES+=			interpreter
 SUBST_STAGE.interpreter=	pre-configure
 SUBST_MESSAGE.interpreter=	Fix shebang
@@ -26,4 +34,5 @@ SUBST_SED.interpreter=		-e 's,/usr/bin/newlisp,${PREFIX}/bin/newlisp,'
 SUBST_SED.interpreter+=		-e 's,/usr/bin/env newlisp,${PREFIX}/bin/newlisp,'
 
 .include "../../mk/readline.buildlink3.mk"
+.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/newlisp/PLIST b/lang/newlisp/PLIST
index b5c1e6c1df8..4a47a43952c 100644
--- a/lang/newlisp/PLIST
+++ b/lang/newlisp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2013/10/12 10:30:40 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.7 2014/07/07 14:25:31 ryoon Exp $
 bin/newlisp
 bin/${PKGNAME}
 bin/newlisp-edit
@@ -39,7 +39,9 @@ share/${PKGNAME}/guiserver/rotation-demo.lsp
 share/${PKGNAME}/guiserver/shapes-demo.lsp
 share/${PKGNAME}/guiserver/sound-demo.lsp
 share/${PKGNAME}/guiserver/stroke-demo.lsp
+share/${PKGNAME}/guiserver/table-demo.lsp
 share/${PKGNAME}/guiserver/tabs-demo.lsp
+share/${PKGNAME}/guiserver/textfield-demo.lsp
 share/${PKGNAME}/guiserver/textrot-demo.lsp
 share/${PKGNAME}/guiserver/uppercase.lsp
 share/${PKGNAME}/guiserver/widgets-demo.lsp
@@ -52,7 +54,6 @@ share/${PKGNAME}/modules/getopts.lsp
 share/${PKGNAME}/modules/gmp.lsp
 share/${PKGNAME}/modules/gsl.lsp
 share/${PKGNAME}/modules/infix.lsp
-share/${PKGNAME}/modules/macro.lsp
 share/${PKGNAME}/modules/mysql.lsp
 share/${PKGNAME}/modules/odbc.lsp
 share/${PKGNAME}/modules/plot.lsp
diff --git a/lang/newlisp/distinfo b/lang/newlisp/distinfo
index a2d2f3e5ba3..666995d9728 100644
--- a/lang/newlisp/distinfo
+++ b/lang/newlisp/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2013/10/12 10:30:40 ryoon Exp $
+$NetBSD: distinfo,v 1.9 2014/07/07 14:25:31 ryoon Exp $
 
-SHA1 (newlisp-10.5.4.tgz) = a1fa37eb21f8045858a30493429d243ababc2488
-RMD160 (newlisp-10.5.4.tgz) = 389e6522d2e2629dbba5235ae7cda979b596749b
-Size (newlisp-10.5.4.tgz) = 1637762 bytes
+SHA1 (newlisp-10.6.0.tgz) = 8a3b23a72acfdbb00306f8c7419892b553b8026e
+RMD160 (newlisp-10.6.0.tgz) = 3f710834a68f1a43fe2e22b21a273dc8a77c35fe
+Size (newlisp-10.6.0.tgz) = 1670428 bytes
 SHA1 (patch-configure-alt) = f8669b8432fe460af18d0f2d3d1135debfd74654
+SHA1 (patch-guiserver_guiserver.lsp) = b1ef345be637cf3640c6181b592420aaae5d636f
 SHA1 (patch-newlisp.c) = 0ec358377dcae961d89fbbf00474e2feda3f53ae
diff --git a/lang/newlisp/patches/patch-guiserver_guiserver.lsp b/lang/newlisp/patches/patch-guiserver_guiserver.lsp
new file mode 100644
index 00000000000..260fab2214e
--- /dev/null
+++ b/lang/newlisp/patches/patch-guiserver_guiserver.lsp
@@ -0,0 +1,13 @@
+$NetBSD: patch-guiserver_guiserver.lsp,v 1.1 2014/07/07 14:25:31 ryoon Exp $
+
+--- guiserver/guiserver.lsp.orig	2014-04-08 14:02:28.000000000 +0000
++++ guiserver/guiserver.lsp
+@@ -1879,7 +1879,7 @@ true
+ 			(env "JAVA_HOME")
+ 			(process (string (env "JAVA_HOME") "/bin/java -jar " server-path " " portIn))
+ 
+-			(process (string "/usr/bin/java -jar " server-path " " portIn))
++			(process (string "@JAVA_HOME@/bin/java -jar " server-path " " portIn))
+ 
+ 		)
+ 	)