Stuart Henderson <[email protected]> [2022-07-16, 10:00 +0100]:
> Quick comments:
>
> - if the Java version needs to be kept in sync with jna, it would be
> worth adding a comment to jna mentioning that
>
> - pkg/README is supposed to use a standard format with the header text.
> Or there's probably not much downside to adding a tub dependency on
> jna and getting rid of the readme.
>
> - up to you as maintainer what to do for tests, seems you have picked a
> sensible way to handle it to me. Tests are not run in bulk builds.
Here's another attempt at this:
- add bash as build dependency and use it to generate abcl.properties
- remove the patches for getting the java tests to run
- remove README and add jna as run dependency
- add mention to about syncing MODJAVA_VER with jna
I removed the test setup, a bit too much patching for just running 16
tests. Perphaps easier to just run tests separately as needed.
timo
diff fa25a47aa4e844fb29f93cb52cae81fdcf98ad16 /usr/ports
blob - 821f1c92c6f3b82b2e43d6327452fb9cffb0a742
file + lang/abcl/Makefile
--- lang/abcl/Makefile
+++ lang/abcl/Makefile
@@ -1,9 +1,8 @@
COMMENT = Common Lisp dialect for the Java Virtual Machine
-V = 1.8.0
+V = 1.9.0
DISTNAME = abcl-src-${V}
PKGNAME = abcl-${V}
PKG_ARCH = *
-REVISION = 0
CATEGORIES = lang
@@ -19,18 +18,25 @@ MASTER_SITES = ${HOMEPAGE}/releases/${V}/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY = ${DISTNAME}${EXTRACT_SUFX}
+# Remember to keep MODJAVA_VER in sync with jna
MODULES = java
-MODJAVA_VER = 1.8+
+MODJAVA_VER = 11
MODJAVA_BUILD = ant
MODJAVA_BUILD_TARGET_NAME = abcl.jar
+BUILD_DEPENDS = shells/bash
+
RUN_DEPENDS = java/javaPathHelper \
+ java/jna \
misc/rlwrap
NO_TEST = Yes
ABCL_HOME = ${PREFIX}/abcl
+pre-configure:
+ bash ${WRKSRC}/ci/create-abcl-properties.bash ${MODJAVA_VER}
+
do-install:
${INSTALL_DATA_DIR} ${ABCL_HOME}
${INSTALL_DATA} ${WRKSRC}/dist/abcl.jar ${ABCL_HOME}
blob - 9dd1aa6f45939c8b6cbca890d519245d8047f544
file + lang/abcl/distinfo
--- lang/abcl/distinfo
+++ lang/abcl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (abcl-src-1.8.0.tar.gz) = HYce4va8+ZHVpu/36lEF74CGENuIJgTU3wQR6XGtJX8=
-SIZE (abcl-src-1.8.0.tar.gz) = 2613411
+SHA256 (abcl-src-1.9.0.tar.gz) = oStchPKINL2Yjjra4K0q1MxsRR2eRPPAhT0AcVjBmGk=
+SIZE (abcl-src-1.9.0.tar.gz) = 2470791
blob - a41cb1e432aad256f439a9ad0ff2721415b3d25e
file + lang/abcl/files/abcl_completions
--- lang/abcl/files/abcl_completions
+++ lang/abcl/files/abcl_completions
@@ -50,6 +50,7 @@ array-rank
array-row-major-index
array-total-size
arrayp
+as-jar-pathname-archive
ash
asin
asinh
@@ -128,7 +129,6 @@ cdddr
cddr
cdr
ceiling
-cell-error-name
cerror
change-class
char
@@ -284,7 +284,6 @@ ffloor
fifth
file-author
file-directory-p
-file-error-pathname
file-length
file-namestring
file-position
@@ -1816,7 +1815,6 @@ os-oldmac-p
os-unix-p
os-windows-p
output-stream-p
-package-error-package
package-local-nicknames
package-locally-nicknamed-by-list
package-name
@@ -2377,7 +2375,6 @@ system:case-body
system:case-body-aux
system:case-body-error
system:casify
-system:cfp-output-file-default
system:check-declaration-type
system:check-disjoint
system:check-for-circularity
@@ -2867,6 +2864,7 @@ system:read-evaluated-form
system:read-feature
system:read-list
system:read-quote
+system:read-random-state
system:read-right-paren
system:read-string
system:read-vector-unsigned-byte-8
@@ -3313,3 +3311,7 @@ xp:xp-structure-p
y-or-n-p
yes-or-no-p
zerop
+-structure-p
+y-or-n-p
+yes-or-no-p
+zerop
blob - 53f21721432307466ac4b90381a0ce858dffd7e2
file + lang/abcl/pkg/PLIST
--- lang/abcl/pkg/PLIST
+++ lang/abcl/pkg/PLIST
@@ -295,7 +295,6 @@ abcl/src/org/armedbear/lisp/fasl-concat.lisp
abcl/src/org/armedbear/lisp/fdefinition.lisp
abcl/src/org/armedbear/lisp/featurep.lisp
abcl/src/org/armedbear/lisp/file_author.java
-abcl/src/org/armedbear/lisp/file_error_pathname.java
abcl/src/org/armedbear/lisp/file_length.java
abcl/src/org/armedbear/lisp/file_string_length.java
abcl/src/org/armedbear/lisp/file_write_date.java
@@ -387,7 +386,6 @@ abcl/src/org/armedbear/lisp/open_stream_p.java
abcl/src/org/armedbear/lisp/or.lisp
abcl/src/org/armedbear/lisp/output_stream_p.java
abcl/src/org/armedbear/lisp/package.lisp
-abcl/src/org/armedbear/lisp/package_error_package.java
abcl/src/org/armedbear/lisp/parse-integer.lisp
abcl/src/org/armedbear/lisp/parse-lambda-list.lisp
abcl/src/org/armedbear/lisp/pathnames.lisp
@@ -487,4 +485,3 @@ abcl/src/org/armedbear/lisp/with-standard-io-syntax.li
abcl/src/org/armedbear/lisp/write-sequence.lisp
abcl/src/org/armedbear/lisp/zip.java
bin/abcl
-share/doc/pkg-readmes/${PKGSTEM}
blob - fec0ad5c724e4f7a62d3d05281393d7ee87c10bc
file + /dev/null
--- lang/abcl/pkg/README
+++ /dev/null
@@ -1,2 +0,0 @@
-In order to use CFFI to access foreign libraries the jna package needs
-to be installed.
