Wed Apr 24 13:09:45 2019 UTC ()
Upgrade lang/newlisp from 10.6 to 10.7.1

Changes too numerous to include, see
<http://www.newlisp.org/downloads/newLISP-10.7.1-Release.html>
<http://www.newlisp.org/downloads/previous-release-notes/>


(hauke)
diff -r1.11 -r1.12 pkgsrc/lang/newlisp/Makefile
diff -r1.7 -r1.8 pkgsrc/lang/newlisp/PLIST
diff -r1.12 -r1.13 pkgsrc/lang/newlisp/distinfo
diff -r1.3 -r1.4 pkgsrc/lang/newlisp/patches/patch-newlisp.c
cvs diff -r1.11 -r1.12 pkgsrc/lang/newlisp/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/newlisp/Makefile 2016/04/01 16:22:15 1.11
+++ pkgsrc/lang/newlisp/Makefile 2019/04/24 13:09:45 1.12
@@ -1,39 +1,38 @@ @@ -1,39 +1,38 @@
1# $NetBSD: Makefile,v 1.11 2016/04/01 16:22:15 jperkin Exp $ 1# $NetBSD: Makefile,v 1.12 2019/04/24 13:09:45 hauke Exp $
2# 2#
3 3
4DISTNAME= newlisp-10.6.0 4DISTNAME= newlisp-10.7.1
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=newlisp/} 6MASTER_SITES= http://www.newlisp.org/downloads/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= http://www.newlisp.org/ 10HOMEPAGE= http://www.newlisp.org/
11COMMENT= Lisp-like, general-purpose scripting language 11COMMENT= Lisp-like, general-purpose scripting language
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14HAS_CONFIGURE= yes 14HAS_CONFIGURE= yes
15CONFIGURE_SCRIPT= configure-alt 15CONFIGURE_SCRIPT= configure-alt
16CONFIGURE_ARGS+= --prefix=${PREFIX} 16CONFIGURE_ARGS+= --prefix=${PREFIX}
17CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 17CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
18CONFIGURE_ARGS+= --enable-readline 18CONFIGURE_ARGS+= --enable-readline
19 19
20USE_GNU_READLINE= yes 
21 
22USE_JAVA= run 20USE_JAVA= run
23USE_JAVA2= yes 21USE_JAVA2= yes
24 22
25SUBST_CLASSES+= java 23SUBST_CLASSES+= java
26SUBST_FILES.java= guiserver/guiserver.lsp 24SUBST_FILES.java= guiserver/guiserver.lsp
27SUBST_STAGE.java= pre-configure 25SUBST_STAGE.java= pre-configure
28SUBST_SED.java= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g' 26SUBST_SED.java= -e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'
29 27
30SUBST_CLASSES+= interpreter 28SUBST_CLASSES+= interpreter
31SUBST_STAGE.interpreter= pre-configure 29SUBST_STAGE.interpreter= pre-configure
32SUBST_MESSAGE.interpreter= Fix shebang 30SUBST_MESSAGE.interpreter= Fix shebang
33SUBST_FILES.interpreter= guiserver/*lsp util/syntax.cgi util/newlispdoc 31SUBST_FILES.interpreter= guiserver/*lsp util/syntax.cgi util/newlispdoc
34SUBST_SED.interpreter= -e 's,/usr/bin/newlisp,${PREFIX}/bin/newlisp,' 32SUBST_SED.interpreter= -e 's,/usr/bin/newlisp,${PREFIX}/bin/newlisp,'
 33SUBST_SED.interpreter+= -e 's,/usr/local/bin/newlisp,${PREFIX}/bin/newlisp,'
35SUBST_SED.interpreter+= -e 's,/usr/bin/env newlisp,${PREFIX}/bin/newlisp,' 34SUBST_SED.interpreter+= -e 's,/usr/bin/env newlisp,${PREFIX}/bin/newlisp,'
36 35
37.include "../../mk/readline.buildlink3.mk" 36.include "../../mk/readline.buildlink3.mk"
38.include "../../mk/java-vm.mk" 37.include "../../mk/java-vm.mk"
39.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/lang/newlisp/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/newlisp/PLIST 2014/07/07 14:25:31 1.7
+++ pkgsrc/lang/newlisp/PLIST 2019/04/24 13:09:45 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.7 2014/07/07 14:25:31 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.8 2019/04/24 13:09:45 hauke Exp $
2bin/newlisp 2bin/newlisp
3bin/${PKGNAME} 3bin/${PKGNAME}
4bin/newlisp-edit 4bin/newlisp-edit
5bin/newlispdoc 5bin/newlispdoc
6man/man1/newlisp.1 6man/man1/newlisp.1
7man/man1/newlispdoc.1 7man/man1/newlispdoc.1
8share/doc/newlisp/COPYING 8share/doc/newlisp/COPYING
9share/doc/newlisp/CREDITS 9share/doc/newlisp/CREDITS
10share/doc/newlisp/CodePatterns.html 10share/doc/newlisp/CodePatterns.html
11share/doc/newlisp/guiserver/COPYING 11share/doc/newlisp/guiserver/COPYING
12share/doc/newlisp/guiserver/guiserver.lsp.html 12share/doc/newlisp/guiserver/guiserver.lsp.html
13share/doc/newlisp/guiserver/index.html 13share/doc/newlisp/guiserver/index.html
14share/doc/newlisp/guiserver/newlispdoc.css 14share/doc/newlisp/guiserver/newlispdoc.css
@@ -41,27 +41,26 @@ share/${PKGNAME}/guiserver/sound-demo.ls @@ -41,27 +41,26 @@ share/${PKGNAME}/guiserver/sound-demo.ls
41share/${PKGNAME}/guiserver/stroke-demo.lsp 41share/${PKGNAME}/guiserver/stroke-demo.lsp
42share/${PKGNAME}/guiserver/table-demo.lsp 42share/${PKGNAME}/guiserver/table-demo.lsp
43share/${PKGNAME}/guiserver/tabs-demo.lsp 43share/${PKGNAME}/guiserver/tabs-demo.lsp
44share/${PKGNAME}/guiserver/textfield-demo.lsp 44share/${PKGNAME}/guiserver/textfield-demo.lsp
45share/${PKGNAME}/guiserver/textrot-demo.lsp 45share/${PKGNAME}/guiserver/textrot-demo.lsp
46share/${PKGNAME}/guiserver/uppercase.lsp 46share/${PKGNAME}/guiserver/uppercase.lsp
47share/${PKGNAME}/guiserver/widgets-demo.lsp 47share/${PKGNAME}/guiserver/widgets-demo.lsp
48share/${PKGNAME}/guiserver/word-count.lsp 48share/${PKGNAME}/guiserver/word-count.lsp
49share/${PKGNAME}/modules/canvas.lsp 49share/${PKGNAME}/modules/canvas.lsp
50share/${PKGNAME}/modules/cgi.lsp 50share/${PKGNAME}/modules/cgi.lsp
51share/${PKGNAME}/modules/crypto.lsp 51share/${PKGNAME}/modules/crypto.lsp
52share/${PKGNAME}/modules/ftp.lsp 52share/${PKGNAME}/modules/ftp.lsp
53share/${PKGNAME}/modules/getopts.lsp 53share/${PKGNAME}/modules/getopts.lsp
54share/${PKGNAME}/modules/gmp.lsp 
55share/${PKGNAME}/modules/gsl.lsp 54share/${PKGNAME}/modules/gsl.lsp
56share/${PKGNAME}/modules/infix.lsp 55share/${PKGNAME}/modules/infix.lsp
57share/${PKGNAME}/modules/mysql.lsp 56share/${PKGNAME}/modules/mysql.lsp
58share/${PKGNAME}/modules/odbc.lsp 57share/${PKGNAME}/modules/odbc.lsp
59share/${PKGNAME}/modules/plot.lsp 58share/${PKGNAME}/modules/plot.lsp
60share/${PKGNAME}/modules/pop3.lsp 59share/${PKGNAME}/modules/pop3.lsp
61share/${PKGNAME}/modules/postgres.lsp 60share/${PKGNAME}/modules/postgres.lsp
62share/${PKGNAME}/modules/postscript.lsp 61share/${PKGNAME}/modules/postscript.lsp
63share/${PKGNAME}/modules/smtp.lsp 62share/${PKGNAME}/modules/smtp.lsp
64share/${PKGNAME}/modules/smtpx.lsp 63share/${PKGNAME}/modules/smtpx.lsp
65share/${PKGNAME}/modules/sqlite3.lsp 64share/${PKGNAME}/modules/sqlite3.lsp
66share/${PKGNAME}/modules/stat.lsp 65share/${PKGNAME}/modules/stat.lsp
67share/${PKGNAME}/modules/unix.lsp 66share/${PKGNAME}/modules/unix.lsp
cvs diff -r1.12 -r1.13 pkgsrc/lang/newlisp/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/newlisp/distinfo 2015/12/29 23:34:52 1.12
+++ pkgsrc/lang/newlisp/distinfo 2019/04/24 13:09:45 1.13
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.12 2015/12/29 23:34:52 dholland Exp $ 1$NetBSD: distinfo,v 1.13 2019/04/24 13:09:45 hauke Exp $
2 2
3SHA1 (newlisp-10.6.0.tgz) = 8a3b23a72acfdbb00306f8c7419892b553b8026e 3SHA1 (newlisp-10.7.1.tgz) = 724e7fd1c0512a4236fde022825dfd7ef859ca96
4RMD160 (newlisp-10.6.0.tgz) = 3f710834a68f1a43fe2e22b21a273dc8a77c35fe 4RMD160 (newlisp-10.7.1.tgz) = e0981aafef32790cc66cdb570b628930a6e45c22
5SHA512 (newlisp-10.6.0.tgz) = 2356d9ba7b4a01a58705be554e01660c3706e79aa725ff97e1e85c60cd103fd2ad9dac27f45cc60feaeffdfa4d6a98f752013cbbcfb568de88df18eab4b637b0 5SHA512 (newlisp-10.7.1.tgz) = dff9ea671581e9421028abec786ec4f4557b150ffff8357c42c03af414d6d78a277b7c13cf08cd9950427eff32570a15b85072009e7596e66592c8a4186c6560
6Size (newlisp-10.6.0.tgz) = 1670428 bytes 6Size (newlisp-10.7.1.tgz) = 1721645 bytes
7SHA1 (patch-configure-alt) = 6ac73164de672a048f7cde791e8958633fdae47e 7SHA1 (patch-configure-alt) = 6ac73164de672a048f7cde791e8958633fdae47e
8SHA1 (patch-guiserver_guiserver.lsp) = 47e29e73e9ecb6d96f42287a17398dd13071c572 8SHA1 (patch-guiserver_guiserver.lsp) = 47e29e73e9ecb6d96f42287a17398dd13071c572
9SHA1 (patch-newlisp.c) = 8f21fdd3ae791e1ef51bb52365fb63faa30af633 9SHA1 (patch-newlisp.c) = 2ae925e56be9ed4197876493c077976a1690726b
cvs diff -r1.3 -r1.4 pkgsrc/lang/newlisp/patches/patch-newlisp.c (expand / switch to unified diff)

--- pkgsrc/lang/newlisp/patches/patch-newlisp.c 2015/12/29 23:34:52 1.3
+++ pkgsrc/lang/newlisp/patches/patch-newlisp.c 2019/04/24 13:09:45 1.4
@@ -1,53 +1,42 @@ @@ -1,53 +1,42 @@
1$NetBSD: patch-newlisp.c,v 1.3 2015/12/29 23:34:52 dholland Exp $ 1$NetBSD: patch-newlisp.c,v 1.4 2019/04/24 13:09:45 hauke Exp $
2 2
3Fix build with recent readline. 3Fix build with recent readline.
4 4
5--- newlisp.c.orig 2014-04-08 14:02:27.000000000 +0000 5--- newlisp.c.orig 2017-01-25 16:42:21.000000000 +0000
6+++ newlisp.c 6+++ newlisp.c
7@@ -138,7 +138,7 @@ char preLoad[] =  7@@ -138,7 +138,7 @@ char preLoad[] =
8 "(define (Class:Class) (cons (context) (args)))"; 8 "(define (Class:Class) (cons (context) (args)))";
9 void printHelpText(void); 9 void printHelpText(void);
10 #ifdef READLINE 10 #ifdef READLINE
11-char ** newlisp_completion (char * text, int start, int end); 11-char ** newlisp_completion (char * text, int start, int end);
12+char ** newlisp_completion (const char * text, int start, int end); 12+char ** newlisp_completion (const char * text, int start, int end);
13 #endif 13 #endif
14 /* --------------------- globals -------------------------------------- */ 14 /* --------------------- globals -------------------------------------- */
15  15
16@@ -904,8 +904,8 @@ if(errorReg && !isNil((CELL*)errorEvent- 16@@ -931,7 +931,7 @@ if(errorReg && !isNil((CELL*)errorEvent-
17  
18 #ifdef READLINE 17 #ifdef READLINE
19 rl_readline_name = "newlisp"; 18 rl_readline_name = "newlisp";
20-rl_attempted_completion_function = (CPPFunction *)newlisp_completion; 19 rl_attempted_completion_function = (char ** (*) (const char *, int, int))newlisp_completion;
21-#if defined(LINUX) || defined(_BSD) 20-#if defined(LINUX) || defined(_BSD) || defined(KFREEBSD)
22+rl_attempted_completion_function = newlisp_completion; 21+#if defined(LINUX) || defined(KFREEBSD)
23+#if defined(LINUX) 
24 /* in Bash .inputrc put 'set blink-matching-paren on' */ 22 /* in Bash .inputrc put 'set blink-matching-paren on' */
25 rl_set_paren_blink_timeout(300000); /* 300 ms */ 23 rl_set_paren_blink_timeout(300000); /* 300 ms */
26 #endif 24 #endif
27@@ -959,7 +959,7 @@ return 0; 25@@ -985,7 +985,7 @@ return 0;
28 #endif /* not LIBRARY */ 26 #endif /* not LIBRARY */
29  27
30 #ifdef READLINE 28 #ifdef READLINE
31-char * command_generator(char * text, int state) 29-char * command_generator(char * text, int state)
32+char * command_generator(const char * text, int state) 30+char * command_generator(const char * text, int state)
33 { 31 {
34 static int list_index, len, clen; 32 static int list_index, len, clen;
35 char * name; 33 char * name;
36@@ -984,15 +984,9 @@ while((name = primitive[list_index].name 34@@ -1012,7 +1012,7 @@ return ((char *)NULL);
37 return ((char *)NULL); 35
38 } 36 char ** completion_matches(const char * text, char * (*commands)(const char *, int));
39  37
40-#ifdef _BSD 
41-extern char **completion_matches PARAMS((char *, rl_compentry_func_t *)); 
42-#else 
43-char ** completion_matches(const char * text, CPFunction commands); 
44-#endif 
45- 
46-char ** newlisp_completion (char * text, int start, int end) 38-char ** newlisp_completion (char * text, int start, int end)
47+char ** newlisp_completion (const char * text, int start, int end) 39+char ** newlisp_completion (const char * text, int start, int end)
48 { 40 {
49-return(completion_matches(text, (CPFunction *)command_generator)); 41 return(completion_matches(text, (char * (*) (const char *, int) )command_generator));
50+return(completion_matches(text, command_generator)); 
51 } 42 }
52 #endif /* READLINE */ 
53