Hi, Here is an update to bring kawa to latest release. This is last release on Kawa 2.x branch as the next version will be 3.0. The next release will have lot of internal changes in the codebase so it would be better to have one 2.x update before moving on to 3.0.
Currently there are a lot of patches but those have been merged by upstream. I also included the documentation generation as I like to use the info pages as a reference. Timo Index: Makefile =================================================================== RCS file: /cvs/ports/lang/kawa/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- Makefile 21 Apr 2017 13:27:46 -0000 1.11 +++ Makefile 26 Jun 2017 04:41:20 -0000 @@ -4,9 +4,8 @@ BROKEN-i386= java COMMENT= Scheme and language framework for the Java platform -DISTNAME= kawa-2.1 +DISTNAME= kawa-2.4 CATEGORIES= lang java -REVISION= 0 HOMEPAGE= https://www.gnu.org/software/kawa/ @@ -16,30 +15,46 @@ PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= ${MASTER_SITE_GNU:=kawa/} MODULES= java -MODJAVA_VER= 1.7+ +MODJAVA_VER= 1.8+ -TEST_DEPENDS= ${BUILD_DEPENDS} +TEST_DEPENDS= ${RUN_DEPENDS} USE_GMAKE= Yes -WANTLIB += c ncurses readline - +WANTLIB+= c ncurses readline +BUILD_DEPENDS= print/texinfo \ + devel/autoconf/2.69 \ + devel/automake/1.15 + CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-kawa-frontend -CONFIGURE_ENV= JAVAC=${JAVA_HOME}/bin/javac \ - JAVA=${JAVA_HOME}/bin/java +CONFIGURE_ENV+= AUTOMAKE=/usr/local/bin/automake-1.15 \ + AUTOCONF=/usr/local/bin/autoconf-2.69 + +MAKE_FLAGS= JAVAC=${JAVA_HOME}/bin/javac \ + JAVA=${JAVA_HOME}/bin/java \ + MAKEINFO=/usr/local/bin/gmakeinfo \ + AUTOCONF_VERSION=2.69 + .include <bsd.port.arch.mk> # fails with this on i386, fails without this on amd64, unsure about # other arch but lp64 is probably not a bad indicator. .if ${PROPERTIES:Mlp64} -MAKE_ENV= SLIB_JAVAFLAGS=-Xmx1200M +MAKE_ENV+= SLIB_JAVAFLAGS=-Xmx1200M .else -MAKE_ENV= SLIB_JAVAFLAGS=-Xmx800M +MAKE_ENV+= SLIB_JAVAFLAGS=-Xmx800M .endif +# use UTF-8 encoding to avoid following errors: +# unmappable character for encoding ASCII +MAKE_ENV+= LANG=en_US.UTF-8 + +TEST_FLAGS = DIFF=diff \ + PATH=${PATH}:${JAVA_HOME}/bin + pre-patch: find ${WRKSRC} -type f | \ - xargs perl -pi -e 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g' + xargs sed -i 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g' .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/lang/kawa/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 6 Dec 2015 20:01:33 -0000 1.3 +++ distinfo 26 Jun 2017 04:41:20 -0000 @@ -1,2 +1,2 @@ -SHA256 (kawa-2.1.tar.gz) = yvjrAfvv6C8+RLWtCNQ1buVjNdp5SZ2cyityD30E/Tk= -SIZE (kawa-2.1.tar.gz) = 3015953 +SHA256 (kawa-2.4.tar.gz) = FMCL6BYxoeuLiSbKI1GYyhZRVsDBeey+boONP0tHY10= +SIZE (kawa-2.4.tar.gz) = 3285436 Index: patches/patch-bin_kawa_sh_in =================================================================== RCS file: patches/patch-bin_kawa_sh_in diff -N patches/patch-bin_kawa_sh_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-bin_kawa_sh_in 26 Jun 2017 04:41:20 -0000 @@ -0,0 +1,10 @@ +$OpenBSD$ +--- bin/kawa.sh.in.orig Sun Apr 9 08:44:21 2017 ++++ bin/kawa.sh.in Sun Apr 9 08:44:30 2017 +@@ -1,5 +1,5 @@ + #!@KAWA_SHELL@ +-thisfile=`type -p $0` ++thisfile=`command -v $0` + case "$thisfile" in + "") echo "installation error - can't find path to $0"; exit -1 ;; + /*) ;; Index: patches/patch-doc_Makefile_am =================================================================== RCS file: patches/patch-doc_Makefile_am diff -N patches/patch-doc_Makefile_am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-doc_Makefile_am 26 Jun 2017 04:41:20 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ +--- doc/Makefile.am.orig Sat Mar 25 12:33:43 2017 ++++ doc/Makefile.am Sat Mar 25 12:34:24 2017 +@@ -29,12 +29,11 @@ TEXI2PDF = texi2pdf + + man_MANS = kawa.1 qexo.1 + kawa.1: $(srcdir)/kawa.man +- nroff -man $(srcdir)/kawa.man > tpm-kawa.1 +- mv tpm-kawa.1 kawa.1 ++ cp $(srcdir)/kawa.man kawa.1 + ++ + qexo.1: $(srcdir)/qexo.man +- nroff -man $(srcdir)/qexo.man > tpm-qexo1 +- mv tpm-qexo1 qexo.1 ++ cp $(srcdir)/qexo.man qexo.1 + + ../kawa-doc-$(VERSION).tar.gz: kawa.info $(KAWA_HTMLDIR)/index.html kawa.pdf + tar cf - $(KAWA_HTMLDIR)/*.html kawa.pdf|gzip -c --best >$@ Index: patches/patch-doc_Makefile_in =================================================================== RCS file: patches/patch-doc_Makefile_in diff -N patches/patch-doc_Makefile_in --- patches/patch-doc_Makefile_in 6 Dec 2015 20:01:33 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,45 +0,0 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.3 2015/12/06 20:01:33 jasper Exp $ - -our makeinfo(1) is too old, so don't install .info files -kawa.texi:5: warning: unrecognized encoding name `UTF-8'. -kawa.texi:10: Unknown command `codequoteundirected'. -kawa.texi:11: Unknown command `codequotebacktick'. -kawa.texi:1847: Unknown command `part'. -kawa.texi:3009: Unknown command `backslashchar'. -kawa.texi:3009: Misplaced {. - ---- doc/Makefile.in.orig Sun Dec 6 20:50:27 2015 -+++ doc/Makefile.in Sun Dec 6 20:50:28 2015 -@@ -573,7 +573,7 @@ distdir: $(DISTFILES) - dist-info - check-am: all-am - check: check-am --all-am: Makefile $(INFO_DEPS) $(MANS) -+all-am: Makefile $(MANS) - installdirs: - for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -@@ -627,7 +627,7 @@ info: info-am - - info-am: $(INFO_DEPS) - --install-data-am: install-info-am install-man -+install-data-am: install-man - - install-dvi: install-dvi-am - -@@ -801,12 +801,10 @@ html: $(KAWA_HTMLS) - TEXINPUTS=$(top_srcdir)/../texinfo/texinfo.tex:$$TEXINPUTS \ - MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2PDF) -E $< - kawa.1: $(srcdir)/kawa.man -- nroff -man $(srcdir)/kawa.man > tpm-kawa.1 -- mv tpm-kawa.1 kawa.1 -+ cp $(srcdir)/kawa.man kawa.1 - - qexo.1: $(srcdir)/qexo.man -- nroff -man $(srcdir)/qexo.man > tpm-qexo1 -- mv tpm-qexo1 qexo.1 -+ cp $(srcdir)/qexo.man qexo.1 - - ../kawa-doc-$(VERSION).tar.gz: kawa.info $(KAWA_HTMLDIR)/index.html kawa.pdf - tar cf - $(KAWA_HTMLDIR)/*.html kawa.pdf|gzip -c --best >$@ Index: patches/patch-gnu_kawa_slib_Makefile_in =================================================================== RCS file: /cvs/ports/lang/kawa/patches/patch-gnu_kawa_slib_Makefile_in,v retrieving revision 1.4 diff -u -p -r1.4 patch-gnu_kawa_slib_Makefile_in --- patches/patch-gnu_kawa_slib_Makefile_in 6 Dec 2015 20:01:33 -0000 1.4 +++ patches/patch-gnu_kawa_slib_Makefile_in 26 Jun 2017 04:41:20 -0000 @@ -2,9 +2,9 @@ $OpenBSD: patch-gnu_kawa_slib_Makefile_i Fails to compile swing.scm with defaults on some arch. ---- gnu/kawa/slib/Makefile.in.orig Sun Dec 6 20:50:27 2015 -+++ gnu/kawa/slib/Makefile.in Sun Dec 6 20:50:28 2015 -@@ -138,7 +138,7 @@ INSTALL_DATA = @INSTALL_DATA@ +--- gnu/kawa/slib/Makefile.in.orig Thu Feb 9 21:03:27 2017 ++++ gnu/kawa/slib/Makefile.in Thu Feb 9 21:03:41 2017 +@@ -140,7 +140,7 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ Index: patches/patch-gnu_xquery_testsuite_Makefile_am =================================================================== RCS file: patches/patch-gnu_xquery_testsuite_Makefile_am diff -N patches/patch-gnu_xquery_testsuite_Makefile_am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-gnu_xquery_testsuite_Makefile_am 26 Jun 2017 04:41:20 -0000 @@ -0,0 +1,85 @@ +$OpenBSD$ + +Index: gnu/xquery/testsuite/Makefile.am +--- gnu/xquery/testsuite/Makefile.am.orig ++++ gnu/xquery/testsuite/Makefile.am +@@ -2,6 +2,7 @@ include $(top_srcdir)/Make-rules + + KAWALIB = $(top_builddir) + KAWA = ../../../bin/kawa.sh ++DIFF = diff -b + EXTRA_CLEAN = tmp* *.log testing.zip */*.class + mostlyclean-am: mostlyclean-generic + rm -rf Mod1 Mod2 +@@ -34,7 +35,7 @@ XQTS_JAVA_FLAGS = -Xmx120m + check-XQTS: RunXQTS.class + CLASSPATH=$(KAWALIB) \ + $(JAVA) $(XQTS_JAVA_FLAGS) gnu.xquery.testsuite.RunXQTS $(XQTS_DIR) +- @if diff -b $(srcdir)/XQTS-trace.exp XQuery-trace.log; \ ++ @if $(DIFF) $(srcdir)/XQTS-trace.exp XQuery-trace.log; \ + then echo '# XQTS trace output matches'; \ + else echo FAIL XQuery trace output mismatch; fi + +@@ -47,7 +48,7 @@ check-suite: TestSuite.class + + check-maketab1: maketab1.xql + CLASSPATH=".$(CLASSPATH_SEPARATOR)$(KAWALIB)" $(KAWA) $< >tmp2 +- @if diff -b $(srcdir)/tab.html tmp2; then echo '# maketab1 test passes'; else echo FAIL maketab1 test; fi ++ @if $(DIFF) $(srcdir)/tab.html tmp2; then echo '# maketab1 test passes'; else echo FAIL maketab1 test; fi + + # FIXME - this does not do the correct thing + check-desc: +@@ -59,29 +60,29 @@ multab.class: multab.xql + check-multab: multab.class + CLASSPATH=".$(CLASSPATH_SEPARATOR)$(KAWALIB)" $(JAVA) multab \ + max=10 caption="Multiplication table " out:xml-indent=pretty >tmpmul +- @if diff -b $(srcdir)/expectedmul.xml tmpmul; then echo '# multab test passes'; else echo FAIL multab test; fi ++ @if $(DIFF) $(srcdir)/expectedmul.xml tmpmul; then echo '# multab test passes'; else echo FAIL multab test; fi + + descend.class: descend.xql + $(KAWA) --main --xquery -C $< + + check-descend: descend.class + CLASSPATH=".$(CLASSPATH_SEPARATOR)$(KAWALIB)" $(JAVA) descend >tmpdesc +- @if diff -b $(srcdir)/expdescend.xml tmpdesc; then echo '# descend test passes'; else echo FAIL descend test; fi ++ @if $(DIFF) $(srcdir)/expdescend.xml tmpdesc; then echo '# descend test passes'; else echo FAIL descend test; fi + + check-latin1a: + $(KAWA) --xquery $(srcdir)/latin1a.xql >tmplatin1a +- @if diff -b $(srcdir)/latin1a.expected tmplatin1a; then echo '# latin1a test passes'; else echo FAIL latin1a test; fi ++ @if $(DIFF) $(srcdir)/latin1a.expected tmplatin1a; then echo '# latin1a test passes'; else echo FAIL latin1a test; fi + + check-xsltest1: + $(KAWA) --xslt -f $(srcdir)/xsltest1.xsl $(srcdir)/outline.xml >tmp-xsltest1.log +- @if diff -b $(srcdir)/xsltest1.expected tmp-xsltest1.log; \ ++ @if $(DIFF) $(srcdir)/xsltest1.expected tmp-xsltest1.log; \ + then echo '# xsltest1 test passes'; \ + else echo FAIL xsltest1 test; fi + + check-format-users: + $(KAWA) --xslt $(srcdir)/format-users.xsl $(srcdir)/users.xml \ +- |sed 's/^ *//'>tmp-format-users.html +- @if diff -b -B $(srcdir)/exp-format-users.html tmp-format-users.html; then echo '# format-users test passes'; else echo FAIL format-users test; fi ++ |sed 's/^ *//; /^\s*$$/d' >tmp-format-users.html ++ @if $(DIFF) $(srcdir)/exp-format-users.html tmp-format-users.html; then echo '# format-users test passes'; else echo FAIL format-users test; fi + + ./Mod1/mod1.class: mod1.xql + $(CLASSPATH_ENV) $(KAWA) --module-static -d ../../.. -C $< +@@ -93,7 +94,7 @@ usemod.class: usemod.xql ./Mod1/mod1.class ./Mod2/mod2 + $(CLASSPATH_ENV) $(KAWA) --main -C $< + check-mod: usemod.class + CLASSPATH=".$(CLASSPATH_SEPARATOR)$(KAWALIB)" $(JAVA) usemod >tmp-usemod +- @if diff -b $(srcdir)/usemod.exp tmp-usemod; \ ++ @if $(DIFF) $(srcdir)/usemod.exp tmp-usemod; \ + then echo '# usemod test passes'; \ + else echo FAIL usemod test; fi + +@@ -101,7 +102,7 @@ bad-1.log: $(srcdir)/bad-1.xql + -CLASSPATH=$(KAWALIB) $(KAWA) -C $< 2>&1 \ + | sed -e '1d' -e 's|^.*/bad-1.xql|bad-1.xql|' >bad-1.log + check-bad-1: bad-1.log +- @if diff -b $(srcdir)/expected-1.errs bad-1.log; \ ++ @if $(DIFF) $(srcdir)/expected-1.errs bad-1.log; \ + then echo '# bad-1 test passes'; \ + else echo FAIL bad-1 test; fi + Index: patches/patch-gnu_xquery_testsuite_exp-format-users_html =================================================================== RCS file: patches/patch-gnu_xquery_testsuite_exp-format-users_html diff -N patches/patch-gnu_xquery_testsuite_exp-format-users_html --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-gnu_xquery_testsuite_exp-format-users_html 26 Jun 2017 04:41:20 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ + +Index: gnu/xquery/testsuite/exp-format-users.html +--- gnu/xquery/testsuite/exp-format-users.html.orig ++++ gnu/xquery/testsuite/exp-format-users.html +@@ -29,4 +29,4 @@ + <td>Rip Van Winkle</td> + <td>B</td> + </tr> +-</table> ++</table> +\ No newline at end of file Index: patches/patch-gnu_xquery_testsuite_latin1a_expected =================================================================== RCS file: patches/patch-gnu_xquery_testsuite_latin1a_expected diff -N patches/patch-gnu_xquery_testsuite_latin1a_expected --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-gnu_xquery_testsuite_latin1a_expected 26 Jun 2017 04:41:20 -0000 @@ -0,0 +1,9 @@ +$OpenBSD$ + +Index: gnu/xquery/testsuite/latin1a.expected +--- gnu/xquery/testsuite/latin1a.expected.orig ++++ gnu/xquery/testsuite/latin1a.expected +@@ -1 +1 @@ +-<p>Norwegian letters: ae:æ oe:ø aa:å</p> ++<p>Norwegian letters: ae:æ oe:ø aa:å</p> +\ No newline at end of file Index: patches/patch-testsuite_Makefile_am =================================================================== RCS file: patches/patch-testsuite_Makefile_am diff -N patches/patch-testsuite_Makefile_am --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-testsuite_Makefile_am 26 Jun 2017 04:41:20 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ + +Index: testsuite/Makefile.am +--- testsuite/Makefile.am.orig ++++ testsuite/Makefile.am +@@ -8,7 +8,7 @@ KAWA = ../bin/kawa.sh + CPJAVA = CLASSPATH="..$(CLASSPATH_SEPARATOR)@conf_classpath@.$(CLASSPATH_SEPARATOR)$$CLASSPATH" $(JAVA) + CPKAWA = CLASSPATH="@conf_classpath@.$(CLASSPATH_SEPARATOR)$$CLASSPATH" $(KAWA) + KAWATEST = CLASSPATH=".$(CLASSPATH_SEPARATOR)$$CLASSPATH" $(KAWA) $(OPTIONS) -e '(load "testing.zip")' +-DIFF = diff --strip-trailing-cr ++DIFF = diff + + if ENABLE_SERVLET + if ENABLE_XQUERY +@@ -632,7 +632,7 @@ check-bridge: + $(KAWA) $(OPTIONS) "$(srcdir)/bridge.scm" + + check-life-grid: +- $(KAWA) $(srcdir)/life-grid.scm >& life-grid.log ++ $(KAWA) $(srcdir)/life-grid.scm > life-grid.log 2>&1 + @if $(DIFF) $(srcdir)/life-grid.expected life-grid.log; \ + then echo '# check-life-grid passes'; \ + else echo FAIL check-life-grid passes; fi Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/kawa/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 6 Dec 2015 20:01:33 -0000 1.4 +++ pkg/PLIST 26 Jun 2017 04:41:20 -0000 @@ -1,8 +1,15 @@ @comment $OpenBSD: PLIST,v 1.4 2015/12/06 20:01:33 jasper Exp $ @bin bin/kawa bin/qexo +info/kawa.info +info/kawa.info-1 +info/kawa.info-2 +info/kawa.info-3 +info/kawa.info-4 @man man/man1/kawa.1 @man man/man1/qexo.1 -share/java/ -share/java/kawa-2.1.jar -share/java/kawa.jar +share/kawa/ +share/kawa/bin/ +share/kawa/bin/kawa +share/kawa/lib/ +share/kawa/lib/kawa.jar
