summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD57
-rwxr-xr-xmkAsm14
-rw-r--r--picolisp.install51
4 files changed, 43 insertions, 98 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cc60e6b89547..ec783eb40404 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
pkgbase = picolisp
pkgdesc = Fast and tiny 64-bit Lisp interpreter: OO, dynamic and functional (database, prolog, coroutines).
-pkgver = 18.9.5
+pkgver = 21.6
pkgrel = 1
url = http://www.picolisp.com
-install = picolisp.install
-arch = any
+arch = x86_64
license = MIT
-makedepends = git
-depends = bash
+makedepends = clang
+makedepends = llvm
depends = openssl
-optdepends = jre: for picolisp ersatz.jar
-source = git+https://github.com/taij33n/picolisp.git#tag=v18.9.5
-source = mkAsm
-md5sums = SKIP
-md5sums = SKIP
+depends = libffi
+depends = readline
+depends = ncurses
+source = https://software-lab.de/picoLisp-21.6.tgz
+md5sums = 099847a7a17f60692bcbc5493470d231
pkgname = picolisp
diff --git a/PKGBUILD b/PKGBUILD
index a4be19f14cbd..7a8c0ac73e33 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,46 @@
-# Maintainer: taij33n <bwbuiz@gmail.com>
-pkgname=picolisp
-pkgver=18.9.5
+pkgname=picolisp
+pkgver=21.6
pkgrel=1
pkgdesc="Fast and tiny 64-bit Lisp interpreter: OO, dynamic and functional (database, prolog, coroutines)."
url="http://www.picolisp.com"
arch=('x86_64')
license=('MIT')
-depends=('bash' 'openssl')
-optdepends=('jre: for picolisp ersatz.jar')
-makedepends=('make' 'git' 'gcc')
-_vendor="github.com/taij33n"
-source=("git+https://$_vendor/$pkgname.git#tag=v$pkgver"
- "mkAsm")
-md5sums=("SKIP"
- "SKIP")
-install=$pkgname.install
+depends=('openssl' 'libffi' 'readline' 'ncurses')
+makedepends=('clang' 'llvm')
+source=("https://software-lab.de/picoLisp-$pkgver.tgz")
+md5sums=("099847a7a17f60692bcbc5493470d231")
build() {
- # build tools first
- cd "${srcdir}/${pkgname}/src"
- make tools gate
- make clean
-
- # build the 64bit version
- cd "${srcdir}/${pkgname}/src64"
- # real 64-bit env
- make
+ cd $srcdir/pil21/src
+ make
make clean
}
package() {
- install -d -m755 "${pkgdir}/usr/lib/picolisp"
- cp -a ${srcdir}/${pkgname}/* ${pkgdir}/usr/lib/picolisp/
+ install -d -m755 ${LIBDIR:=$pkgdir/usr/lib/$pkgname}
+ cp -a $srcdir/pil21/* $LIBDIR
+
+ install -d -m755 ${BINDIR:=$pkgdir/usr/bin}
+ ln -s /usr/lib/$pkgname/bin/picolisp $BINDIR
+ ln -s /usr/lib/$pkgname/bin/pil $BINDIR
+
+ install -d -m755 ${MAN1DIR:=$pkgdir/usr/share/man/man1}
+ mv $LIBDIR/man/man1/*.1 $MAN1DIR
+ rmdir $LIBDIR/man/man1
+ rmdir $LIBDIR/man
+
+ install -d -m755 ${DOCDIR:=$pkgdir/usr/share/doc/$pkgname}
+ mv $LIBDIR/doc/* $DOCDIR
+ chmod 0644 $DOCDIR/app.html
+ rmdir $LIBDIR/doc
+
+ install -d -m755 ${DATADIR:=$pkgdir/usr/share/$pkgname}
+ mv $LIBDIR/COPYING $DATADIR
+ mv $LIBDIR/README $DATADIR
+ mv $LIBDIR/INSTALL $DATADIR
+ mv $LIBDIR/test $DATADIR
+ mv $LIBDIR/misc $DATADIR
+ mv $LIBDIR/src $DATADIR
+ mv $LIBDIR/img $DATADIR
+ mv $LIBDIR/lib.css $DATADIR
}
diff --git a/mkAsm b/mkAsm
deleted file mode 100755
index bca250c8c608..000000000000
--- a/mkAsm
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# 05sep16taijeen
-
-if test -x ../bin/picolisp
-then
- ../bin/picolisp ../lib.l ../lib/misc.l ../lib/btree.l ../lib/db.l ../lib/pilog.l mkAsm.l "$@"
-elif test -x /usr/bin/picolisp
-then
- /usr/bin/pil mkAsm.l "$@"
-else
- ../ersatz/pil mkAsm.l "$@"
-fi
-
-# vi:et:ts=3:sw=3
diff --git a/picolisp.install b/picolisp.install
deleted file mode 100644
index e6246cd7d6b1..000000000000
--- a/picolisp.install
+++ /dev/null
@@ -1,51 +0,0 @@
-# before files are extracted.
-
-pre_install() {
- if [ -d /usr/lib/picolisp ]
- then
- rm -rf /usr/lib/picolisp
- fi
-}
-
-# after files are extracted
-post_install() {
-
- # binary
- install -d -m755 "/usr/bin/"
- ln -s "/usr/lib/picolisp/bin/picolisp" "/usr/bin/"
- ln -s "/usr/lib/picolisp/bin/pil" "/usr/bin/"
-
- ln -s "/usr/lib/picolisp/bin/ssl" "/usr/bin/"
- ln -s "/usr/lib/picolisp/bin/httpGate" "/usr/bin/"
- ln -s "/usr/lib/picolisp/bin/psh" "/usr/bin/"
-
- # documentation
- install -d -m755 "/usr/share/man/man1/"
- ln -s "/usr/lib/picolisp/man/man1/picolisp.1" "/usr/share/man/man1/"
- ln -s "/usr/lib/picolisp/man/man1/pil.1" "/usr/share/man/man1/"
-
- ln -s "/usr/lib/picolisp" "/usr/share/"
-
- # license
- install -Dm755 /usr/lib/picolisp/COPYING /usr/share/licenses/picolisp/LICENSE
-
-}
-
-pre_remove() {
- if [ -d /usr/lib/picolisp ]
- then
- rm -rf /usr/lib/picolisp
-
- rm /usr/bin/picolisp
- rm /usr/bin/pil
- rm /usr/bin/ssl
- rm /usr/bin/httpGate
- rm /usr/bin/psh
-
- rm /usr/share/man/man1/picolisp.1
- rm /usr/share/man/man1/pil.1
- rm /usr/share/picolisp
-
- rm /usr/share/licenses/picolisp/LICENSE
- fi
-} \ No newline at end of file