Update to abcl-1.6.0

Thanks maintainer Timo Myyrä for the patch
This commit is contained in:
solene 2019-12-03 19:46:34 +00:00
parent acb4b1476b
commit 25df19d7e7
6 changed files with 52 additions and 9 deletions

View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.16 2019/09/22 15:46:37 kurt Exp $
# $OpenBSD: Makefile,v 1.17 2019/12/03 19:46:34 solene Exp $
COMMENT = Common Lisp dialect for the Java Virtual Machine
V = 1.5.0
V = 1.6.0
JUNIT_V = 4.12
DISTNAME = abcl-src-${V}
REVISION = 3
PKGNAME = abcl-${V}
PKG_ARCH = *
CATEGORIES = lang
HOMEPAGE = http://common-lisp.net/project/armedbear/
HOMEPAGE = https://abcl.org/
MAINTAINER = Timo Myyra <timo.myyra@bittivirhe.fi>
@ -17,9 +17,15 @@ MAINTAINER = Timo Myyra <timo.myyra@bittivirhe.fi>
PERMIT_PACKAGE = Yes
MASTER_SITES = ${HOMEPAGE}/releases/$V/
MASTER_SITES0 = https://github.com/junit-team/junit4/releases/download/r${JUNIT_V}/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
junit-${JUNIT_V}.jar:0
EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
MODULES = java
MODJAVA_VER = 1.8
MODJAVA_VER = 1.8+
MODJAVA_BUILD = ant
MODJAVA_BUILD_TARGET_NAME = abcl.jar
@ -40,7 +46,9 @@ do-install:
${INSTALL_DATA} ${FILESDIR}/abcl_completions ${ABCL_HOME}
do-test:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/ant ${TEST_TARGET}
cp -v ${FULLDISTDIR}/junit-${JUNIT_V}.jar ${WRKDIR}
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/ant \
-Djunit.path=${WRKDIR}/junit-${JUNIT_V}.jar ${TEST_TARGET}
# maintainer target to generate completions file
completions: install

View File

@ -1,2 +1,4 @@
SHA256 (abcl-src-1.5.0.tar.gz) = kg7n1jSn9M7KCkadQx02EaMhxWaBTV3bktdZUMBjG8I=
SIZE (abcl-src-1.5.0.tar.gz) = 1187678
SHA256 (abcl-src-1.6.0.tar.gz) = iT/OgV0/yaOqJQx4/4TtLlG3AvccsR4b78Ki7Jxma0M=
SHA256 (junit-4.12.jar) = WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=
SIZE (abcl-src-1.6.0.tar.gz) = 2509074
SIZE (junit-4.12.jar) = 314932

View File

@ -653,6 +653,7 @@ jvm:%make-protected-node
jvm:%make-synchronized-node
jvm:%make-tagbody-node
jvm:%make-unwind-protect-node
jvm:%print-jvm-class-name
jvm:%with-compilation-unit
jvm:abcl-class-file-p
jvm:accumulate-operand
@ -740,6 +741,7 @@ jvm:constant-float/int-p
jvm:constant-member-ref-p
jvm:constant-name/type-p
jvm:constant-p
jvm:constant-pool-index
jvm:constant-string-p
jvm:constant-utf8-p
jvm:constant-value-attribute-p
@ -2364,6 +2366,7 @@ system:backtrace
system:backtrace-as-list
system:base-classname
system:bit-array-same-dimensions-p
system:bogus-sublist-error
system:boot-classloader
system:built-in-function-p
system:cache-emf
@ -2509,6 +2512,7 @@ system:dump-vector
system:empty-environment-p
system:ensure-available-symbols
system:ensure-input-stream
system:enumerate-resource-directories
system:environment-add-function-definition
system:environment-add-macro-definition
system:environment-add-symbol-binding
@ -2558,6 +2562,7 @@ system:find-system
system:find-system-jar
system:fixnum-constant-value
system:fixnum-type-p
system:flatten
system:float-denormalized-p
system:float-infinity-p
system:float-nan-p
@ -2631,9 +2636,11 @@ system:internal-debug
system:invoke-debugger-report-condition
system:istep
system:java-long-type-p
system:java.class.path
system:keyword-supplied-p
system:keywordify
system:known-type-p
system:lambda-list-broken-key-list-error
system:lambda-name
system:last-cons-of
system:layout-class
@ -2954,6 +2961,7 @@ system:svset
system:swap-slots
system:symbol-macro-p
system:symbolicate
system:system-artifacts-are-jars-p
system:system-jar-p
system:system-stream-p
system:to-file

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-build_xml,v 1.1 2019/12/03 19:46:34 solene Exp $
allows skipping junit fetch during test phase.
Index: build.xml
--- build.xml.orig
+++ build.xml
@@ -1014,11 +1014,9 @@ ${basedir}/../cl-bench
<get
src="http://cloud.github.com/downloads/KentBeck/junit/junit-4.8.1.jar"
usetimestamp="true"
- dest="${junit.path}"/>
- <get
- src="${maven.dist.uri}"
- usetimestamp="true"
- dest="${maven.local.path}"/>
+ dest="${junit.path}"
+ skipexisting="true">
+ </get>
</target>
<target name="abcl.ext.maven" depends="abcl.ext">

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2017/08/31 06:32:13 jasper Exp $
@comment $OpenBSD: PLIST,v 1.5 2019/12/03 19:46:34 solene Exp $
abcl/
abcl/abcl-contrib.jar
abcl/abcl.jar
@ -476,3 +476,4 @@ abcl/src/org/armedbear/lisp/with-standard-io-syntax.lisp
abcl/src/org/armedbear/lisp/write-sequence.lisp
abcl/src/org/armedbear/lisp/zip.java
bin/abcl
share/doc/pkg-readmes/${PKGSTEM}

2
lang/abcl/pkg/README Normal file
View File

@ -0,0 +1,2 @@
In order to use CFFI to access foreign libraries the jna package needs
to be installed.