picolisp: Update from 16.11.24 to 16.12.22

diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index 61848e48bc5f5feb65a61e72b5d25ad4797785fe..a13c528366f55c03f9bca5627b2944ccd3cb4192 100644 (file)
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -2,12 +2,12 @@ TERMUX_PKG_HOMEPAGE=http://picolisp.com
 TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
 TERMUX_PKG_DEPENDS="libcrypt, openssl"
 _PICOLISP_YEAR=16
 TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
 TERMUX_PKG_DEPENDS="libcrypt, openssl"
 _PICOLISP_YEAR=16

-_PICOLISP_MONTH=11
-_PICOLISP_DAY=24
+_PICOLISP_MONTH=12
+_PICOLISP_DAY=22

 TERMUX_PKG_VERSION=${_PICOLISP_YEAR}.${_PICOLISP_MONTH}.${_PICOLISP_DAY}
 # We use our bintray mirror since old version snapshots are not kept on main site.
 TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/picolisp_${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_VERSION=${_PICOLISP_YEAR}.${_PICOLISP_MONTH}.${_PICOLISP_DAY}
 # We use our bintray mirror since old version snapshots are not kept on main site.
 TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/picolisp_${TERMUX_PKG_VERSION}.tar.gz

-TERMUX_PKG_SHA256=ffd585e7b0c9d4a2654dec130adef1c013bd99f3f2de56bb9a12c064af958017
+TERMUX_PKG_SHA256=af64df40f87a0dfbdb1f61e1b319d96a07feed123175fc0d17a849f03c36b26a

 TERMUX_PKG_FOLDERNAME=picoLisp
 TERMUX_PKG_BUILD_IN_SRC=true
 # The assembly is not position-independent (would be a major rewrite):
 TERMUX_PKG_FOLDERNAME=picoLisp
 TERMUX_PKG_BUILD_IN_SRC=true
 # The assembly is not position-independent (would be a major rewrite):

diff --git a/packages/picolisp/src64-mkAsm.patch b/packages/picolisp/src64-mkAsm.patch
index 519a3ce06d51074536c48447e31501ac65eaf728..005da32ae2263f92e697424989bc79a03cf5d7f3 100644 (file)
--- a/packages/picolisp/src64-mkAsm.patch
+++ b/packages/picolisp/src64-mkAsm.patch
@@ -3,11 +3,11 @@ old - just run the java version, since java is needed by the
 Termux package builds anyway.
 
 diff -u -r ../picoLisp/src64/mkAsm ./src64/mkAsm
 Termux package builds anyway.
 
 diff -u -r ../picoLisp/src64/mkAsm ./src64/mkAsm

---- ../picoLisp/src64/mkAsm    2011-06-08 12:49:19.000000000 -0400
-+++ ./src64/mkAsm      2016-06-21 16:23:47.625814914 -0400
-@@ -1,14 +1,6 @@
+--- ../picoLisp/src64/mkAsm    2016-12-14 02:35:59.000000000 -0500
++++ ./src64/mkAsm      2016-12-27 20:06:01.126373627 -0500
+@@ -1,17 +1,6 @@

  #!/bin/sh
  #!/bin/sh

- # 08jun11abu
+ # 14dec16abu

  
 -if test -x /usr/bin/picolisp
 -then
  
 -if test -x /usr/bin/picolisp
 -then


@@ -15,8 +15,12 @@ diff -u -r ../picoLisp/src64/mkAsm ./src64/mkAsm
 -elif test -x ../bin/picolisp
 -then
 -   ../pil mkAsm.l "$@"
 -elif test -x ../bin/picolisp
 -then
 -   ../pil mkAsm.l "$@"

+-elif which java >/dev/null
+-then
+-   ../ersatz/pil mkAsm.l "$@"

 -else
 -else

-    ../ersatz/pil mkAsm.l "$@"
+-   echo "No PicoLisp binary found for bootstrapping"

 -fi
 -fi

++../ersatz/pil mkAsm.l "$@"

  
  # vi:et:ts=3:sw=3
  
  # vi:et:ts=3:sw=3