diff options
| -rw-r--r-- | lang/newlisp/Makefile | 15 | ||||
| -rw-r--r-- | lang/newlisp/PLIST | 5 | ||||
| -rw-r--r-- | lang/newlisp/distinfo | 9 | ||||
| -rw-r--r-- | lang/newlisp/patches/patch-guiserver_guiserver.lsp | 13 |
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)) + + ) + ) |