diff options
| -rw-r--r-- | lang/newlisp/Makefile | 18 | ||||
| -rw-r--r-- | lang/newlisp/PLIST | 38 | ||||
| -rw-r--r-- | lang/newlisp/distinfo | 11 | ||||
| -rw-r--r-- | lang/newlisp/patches/patch-guiserver_guiserver.lsp | 15 |
4 files changed, 12 insertions, 70 deletions
diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile index 621e841d806..7af133ddaf2 100644 --- a/lang/newlisp/Makefile +++ b/lang/newlisp/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2019/04/24 13:09:45 hauke Exp $ +# $NetBSD: Makefile,v 1.13 2019/08/23 13:41:31 ryoon Exp $ # -DISTNAME= newlisp-10.7.1 +DISTNAME= newlisp-10.7.5 CATEGORIES= lang MASTER_SITES= http://www.newlisp.org/downloads/ EXTRACT_SUFX= .tgz @@ -17,22 +17,16 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} CONFIGURE_ARGS+= --enable-readline -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 -SUBST_FILES.interpreter= guiserver/*lsp util/syntax.cgi util/newlispdoc +SUBST_FILES.interpreter= util/syntax.cgi util/newlispdoc SUBST_SED.interpreter= -e 's,/usr/bin/newlisp,${PREFIX}/bin/newlisp,' SUBST_SED.interpreter+= -e 's,/usr/local/bin/newlisp,${PREFIX}/bin/newlisp,' SUBST_SED.interpreter+= -e 's,/usr/bin/env newlisp,${PREFIX}/bin/newlisp,' -.include "../../mk/readline.buildlink3.mk" +LDFLAGS+= -lreadline + +.include "../../devel/readline/buildlink3.mk" .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/newlisp/PLIST b/lang/newlisp/PLIST index 61de60003b2..eca43030f9e 100644 --- a/lang/newlisp/PLIST +++ b/lang/newlisp/PLIST @@ -1,51 +1,16 @@ -@comment $NetBSD: PLIST,v 1.8 2019/04/24 13:09:45 hauke Exp $ +@comment $NetBSD: PLIST,v 1.9 2019/08/23 13:41:31 ryoon Exp $ bin/newlisp bin/${PKGNAME} -bin/newlisp-edit bin/newlispdoc man/man1/newlisp.1 man/man1/newlispdoc.1 share/doc/newlisp/COPYING share/doc/newlisp/CREDITS share/doc/newlisp/CodePatterns.html -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/${PKGNAME}/guiserver.jar -share/${PKGNAME}/guiserver.lsp -share/${PKGNAME}/guiserver/allfonts-demo.lsp -share/${PKGNAME}/guiserver/animation-demo.lsp -share/${PKGNAME}/guiserver/border-layout-demo.lsp -share/${PKGNAME}/guiserver/button-demo.lsp -share/${PKGNAME}/guiserver/clipboard-demo.lsp -share/${PKGNAME}/guiserver/cursor-demo.lsp -share/${PKGNAME}/guiserver/drag-demo.lsp -share/${PKGNAME}/guiserver/font-demo.lsp -share/${PKGNAME}/guiserver/frameless-demo.lsp -share/${PKGNAME}/guiserver/html-demo.lsp -share/${PKGNAME}/guiserver/image-demo.lsp -share/${PKGNAME}/guiserver/midi-demo.lsp -share/${PKGNAME}/guiserver/midi2-demo.lsp -share/${PKGNAME}/guiserver/mouse-demo.lsp -share/${PKGNAME}/guiserver/move-resize-demo.lsp -share/${PKGNAME}/guiserver/pinballs-demo.lsp -share/${PKGNAME}/guiserver/properties-demo.lsp -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 -share/${PKGNAME}/guiserver/word-count.lsp share/${PKGNAME}/modules/canvas.lsp share/${PKGNAME}/modules/cgi.lsp share/${PKGNAME}/modules/crypto.lsp @@ -66,6 +31,5 @@ share/${PKGNAME}/modules/stat.lsp share/${PKGNAME}/modules/unix.lsp share/${PKGNAME}/modules/xmlrpc-client.lsp share/${PKGNAME}/modules/zlib.lsp -share/${PKGNAME}/newLISP128.png share/${PKGNAME}/util/newlisp.vim share/${PKGNAME}/util/syntax.cgi diff --git a/lang/newlisp/distinfo b/lang/newlisp/distinfo index 479cb525313..ed48469ffcb 100644 --- a/lang/newlisp/distinfo +++ b/lang/newlisp/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.13 2019/04/24 13:09:45 hauke Exp $ +$NetBSD: distinfo,v 1.14 2019/08/23 13:41:31 ryoon Exp $ -SHA1 (newlisp-10.7.1.tgz) = 724e7fd1c0512a4236fde022825dfd7ef859ca96 -RMD160 (newlisp-10.7.1.tgz) = e0981aafef32790cc66cdb570b628930a6e45c22 -SHA512 (newlisp-10.7.1.tgz) = dff9ea671581e9421028abec786ec4f4557b150ffff8357c42c03af414d6d78a277b7c13cf08cd9950427eff32570a15b85072009e7596e66592c8a4186c6560 -Size (newlisp-10.7.1.tgz) = 1721645 bytes +SHA1 (newlisp-10.7.5.tgz) = 706fd8af9eb22e19a6f662a2a18fcbba083721db +RMD160 (newlisp-10.7.5.tgz) = 62acd6c9fc31438689cc221cf3541de23ef0b4d3 +SHA512 (newlisp-10.7.5.tgz) = 1882c665ee8a7b683038622e0760b62386929a99afb17b197ea9243214070fae6622b83e56113738275587fcbe3cd6b127154a38dc0ff36bae2751f9e13a1209 +Size (newlisp-10.7.5.tgz) = 1168896 bytes SHA1 (patch-configure-alt) = 6ac73164de672a048f7cde791e8958633fdae47e -SHA1 (patch-guiserver_guiserver.lsp) = 47e29e73e9ecb6d96f42287a17398dd13071c572 SHA1 (patch-newlisp.c) = 2ae925e56be9ed4197876493c077976a1690726b diff --git a/lang/newlisp/patches/patch-guiserver_guiserver.lsp b/lang/newlisp/patches/patch-guiserver_guiserver.lsp deleted file mode 100644 index 57898c3ebc1..00000000000 --- a/lang/newlisp/patches/patch-guiserver_guiserver.lsp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-guiserver_guiserver.lsp,v 1.2 2015/12/29 23:34:52 dholland Exp $ - -Don't hardwire paths. - ---- 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)) - - ) - ) |