diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile index 34d85760292..3e32af16c24 100644 --- a/lang/newlisp/Makefile +++ b/lang/newlisp/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.19 2019/07/12 20:47:20 sthen Exp $ +# $OpenBSD: Makefile,v 1.20 2019/11/28 12:46:24 solene Exp $ COMMENT= newLISP is a LISP like, general purpose scripting language -V= 10.7.1 +V= 10.7.5 DISTNAME= newlisp-$V CATEGORIES= lang HOMEPAGE= http://newlisp.org/ -REVISION= 2 # GPLv3+ PERMIT_PACKAGE= Yes @@ -28,7 +27,4 @@ TEST_TARGET= check WRKBUILD= ${WRKSRC} SUBST_VARS= V -pre-configure: - ${SUBST_CMD} ${WRKSRC}/guiserver/newlisp-edit.lsp - .include diff --git a/lang/newlisp/distinfo b/lang/newlisp/distinfo index 77d5a920553..9641412fc6e 100644 --- a/lang/newlisp/distinfo +++ b/lang/newlisp/distinfo @@ -1,2 +1,2 @@ -SHA256 (newlisp-10.7.1.tgz) = LjAMi+02WlZNKEvzrWxJ4DYlbn/D9Gnr2gtF5uGWp8w= -SIZE (newlisp-10.7.1.tgz) = 1721645 +SHA256 (newlisp-10.7.5.tgz) = 3C0P9lHCsnW8SvOvi6WYUab7bh6t3CCudftgsekBJuw= +SIZE (newlisp-10.7.5.tgz) = 1168896 diff --git a/lang/newlisp/patches/patch-guiserver_newlisp-edit_lsp b/lang/newlisp/patches/patch-guiserver_newlisp-edit_lsp deleted file mode 100644 index 235abc15b48..00000000000 --- a/lang/newlisp/patches/patch-guiserver_newlisp-edit_lsp +++ /dev/null @@ -1,40 +0,0 @@ -$OpenBSD: patch-guiserver_newlisp-edit_lsp,v 1.5 2016/01/24 19:44:04 jasper Exp $ ---- guiserver/newlisp-edit.lsp.orig Sun Jan 24 20:34:36 2016 -+++ guiserver/newlisp-edit.lsp Sun Jan 24 20:35:41 2016 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/newlisp -+#!${PREFIX}/bin/newlisp - - ; newlisp-edit.lsp - multiple tab LISP editor and support for running code from the editor - ; needs 9.9.2 version minimum to run -@@ -158,7 +158,7 @@ - (write-file file (base64-dec text))) - (if (= ostype "Windows") - (catch (exec (string {newlisp.exe "} currentScriptFile {" } file " > " (string file "out"))) 'result) -- (catch (exec (string "/usr/local/bin/newlisp " currentScriptFile " " file)) 'result) -+ (catch (exec (string "${PREFIX}/bin/newlisp " currentScriptFile " " file)) 'result) - ) - (if (list? result) - (begin -@@ -226,7 +226,7 @@ - (gs:run-shell 'OutputArea - (string newlispDir "/newlisp.exe") (string currentExtension " -C -w \"" $HOME "\"")) - (gs:run-shell 'OutputArea -- (string "/usr/local/bin/newlisp") (string currentExtension " -C -w " $HOME)) -+ (string "${PREFIX}/bin/newlisp") (string currentExtension " -C -w " $HOME)) - ) - ) - -@@ -1449,11 +1449,7 @@ - ; all other UNIX - (true - (set 'files '( -- "/usr/bin/sensible-browser" -- "/usr/bin/x-www-browser" -- "/usr/bin/mozilla" -- "/usr/bin/firefox" -- "/usr/bin/konqueror" -+ "${LOCALBASE}/bin/xdg-open" - )) - (set 'prog (find true (map file? files))) - (if prog diff --git a/lang/newlisp/pkg/PLIST b/lang/newlisp/pkg/PLIST index ce0aef20c48..72cd56d0424 100644 --- a/lang/newlisp/pkg/PLIST +++ b/lang/newlisp/pkg/PLIST @@ -1,7 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.10 2018/09/04 12:46:14 espie Exp $ +@comment $OpenBSD: PLIST,v 1.11 2019/11/28 12:46:25 solene Exp $ bin/newlisp @bin bin/newlisp-${V} -bin/newlisp-edit bin/newlispdoc @man man/man1/newlisp.1 @man man/man1/newlispdoc.1 @@ -9,48 +8,11 @@ share/doc/newlisp/ share/doc/newlisp/COPYING share/doc/newlisp/CREDITS share/doc/newlisp/CodePatterns.html -share/doc/newlisp/guiserver/ -share/doc/newlisp/guiserver/COPYING -share/doc/newlisp/guiserver/guiserver.lsp.html -share/doc/newlisp/guiserver/index.html -share/doc/newlisp/guiserver/newlispdoc.css share/doc/newlisp/manual_frame.html share/doc/newlisp/newLISPdoc.html share/doc/newlisp/newlisp_index.html share/doc/newlisp/newlisp_manual.html -share/doc/pkg-readmes/${PKGSTEM} share/newlisp-${V}/ -share/newlisp-${V}/guiserver/ -share/newlisp-${V}/guiserver.jar -share/newlisp-${V}/guiserver.lsp -share/newlisp-${V}/guiserver/allfonts-demo.lsp -share/newlisp-${V}/guiserver/animation-demo.lsp -share/newlisp-${V}/guiserver/border-layout-demo.lsp -share/newlisp-${V}/guiserver/button-demo.lsp -share/newlisp-${V}/guiserver/clipboard-demo.lsp -share/newlisp-${V}/guiserver/cursor-demo.lsp -share/newlisp-${V}/guiserver/drag-demo.lsp -share/newlisp-${V}/guiserver/font-demo.lsp -share/newlisp-${V}/guiserver/frameless-demo.lsp -share/newlisp-${V}/guiserver/html-demo.lsp -share/newlisp-${V}/guiserver/image-demo.lsp -share/newlisp-${V}/guiserver/midi-demo.lsp -share/newlisp-${V}/guiserver/midi2-demo.lsp -share/newlisp-${V}/guiserver/mouse-demo.lsp -share/newlisp-${V}/guiserver/move-resize-demo.lsp -share/newlisp-${V}/guiserver/pinballs-demo.lsp -share/newlisp-${V}/guiserver/properties-demo.lsp -share/newlisp-${V}/guiserver/rotation-demo.lsp -share/newlisp-${V}/guiserver/shapes-demo.lsp -share/newlisp-${V}/guiserver/sound-demo.lsp -share/newlisp-${V}/guiserver/stroke-demo.lsp -share/newlisp-${V}/guiserver/table-demo.lsp -share/newlisp-${V}/guiserver/tabs-demo.lsp -share/newlisp-${V}/guiserver/textfield-demo.lsp -share/newlisp-${V}/guiserver/textrot-demo.lsp -share/newlisp-${V}/guiserver/uppercase.lsp -share/newlisp-${V}/guiserver/widgets-demo.lsp -share/newlisp-${V}/guiserver/word-count.lsp share/newlisp-${V}/modules/ share/newlisp-${V}/modules/canvas.lsp share/newlisp-${V}/modules/cgi.lsp @@ -72,7 +34,6 @@ share/newlisp-${V}/modules/stat.lsp share/newlisp-${V}/modules/unix.lsp share/newlisp-${V}/modules/xmlrpc-client.lsp share/newlisp-${V}/modules/zlib.lsp -share/newlisp-${V}/newLISP128.png share/newlisp-${V}/util/ share/newlisp-${V}/util/newlisp.vim share/newlisp-${V}/util/syntax.cgi diff --git a/lang/newlisp/pkg/README b/lang/newlisp/pkg/README deleted file mode 100644 index 2adcd9942f2..00000000000 --- a/lang/newlisp/pkg/README +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: README,v 1.2 2018/09/04 12:46:14 espie Exp $ - -+----------------------------------------------------------------------- -| Running ${PKGSTEM} on OpenBSD -+----------------------------------------------------------------------- - -GUI -============== -In order to use the GUI provided by newlisp-edit, the guiserver must -be started. In order to do this Java must be installed, which can be -done with: - - # pkg_add jdk - -Next, start the server: - - $ cd ${PREFIX}/share/newlisp-${V}/ - $ java -jar guiserver.jar 47011 guiserver.lsp - -Now run ${PREFIX}/bin/newlisp-edit to connect to the server.