Ok, Here is an updated diff: - Added your build fix - removed leftover patch-gnu_xquery_testsuite_Makefile_am patch file
Timo Index: Makefile =================================================================== RCS file: /cvs/ports/lang/kawa/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile 19 Sep 2017 19:23:04 -0000 1.15 +++ Makefile 6 Oct 2017 06:08:45 -0000 @@ -2,7 +2,7 @@ COMMENT= Scheme and language framework for the Java platform -DISTNAME= kawa-2.4 +DISTNAME= kawa-3.0 CATEGORIES= lang java HOMEPAGE= https://www.gnu.org/software/kawa/ @@ -56,6 +56,8 @@ TEST_FLAGS = DIFF=diff \ pre-patch: find ${WRKSRC} -type f | \ - xargs sed -i 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g' + xargs fgrep -l "JAR =" | \ + xargs sed -i 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g'; \ + touch ${WRKSRC}/configure.ac .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/lang/kawa/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 31 Aug 2017 06:33:05 -0000 1.4 +++ distinfo 6 Oct 2017 06:08:45 -0000 @@ -1,2 +1,2 @@ -SHA256 (kawa-2.4.tar.gz) = FMCL6BYxoeuLiSbKI1GYyhZRVsDBeey+boONP0tHY10= -SIZE (kawa-2.4.tar.gz) = 3285436 +SHA256 (kawa-3.0.tar.gz) = Hm6FIXvW2MKgw0eIgqRXAxTfa5UHj+exIlkRw5q/OM0= +SIZE (kawa-3.0.tar.gz) = 3393879 Index: patches/patch-bin_kawa_sh_in =================================================================== RCS file: patches/patch-bin_kawa_sh_in diff -N patches/patch-bin_kawa_sh_in --- patches/patch-bin_kawa_sh_in 31 Aug 2017 06:33:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ -$OpenBSD: patch-bin_kawa_sh_in,v 1.1 2017/08/31 06:33:05 jasper Exp $ ---- 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 --- patches/patch-doc_Makefile_am 31 Aug 2017 06:33:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-doc_Makefile_am,v 1.1 2017/08/31 06:33:05 jasper Exp $ ---- 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-gnu_xquery_testsuite_Makefile_am =================================================================== RCS file: patches/patch-gnu_xquery_testsuite_Makefile_am diff -N patches/patch-gnu_xquery_testsuite_Makefile_am --- patches/patch-gnu_xquery_testsuite_Makefile_am 31 Aug 2017 06:33:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,85 +0,0 @@ -$OpenBSD: patch-gnu_xquery_testsuite_Makefile_am,v 1.1 2017/08/31 06:33:05 jasper Exp $ - -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 --- patches/patch-gnu_xquery_testsuite_exp-format-users_html 31 Aug 2017 06:33:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-gnu_xquery_testsuite_exp-format-users_html,v 1.1 2017/08/31 06:33:05 jasper Exp $ - -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 --- patches/patch-gnu_xquery_testsuite_latin1a_expected 31 Aug 2017 06:33:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,9 +0,0 @@ -$OpenBSD: patch-gnu_xquery_testsuite_latin1a_expected,v 1.1 2017/08/31 06:33:05 jasper Exp $ - -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 --- patches/patch-testsuite_Makefile_am 31 Aug 2017 06:33:05 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-testsuite_Makefile_am,v 1.1 2017/08/31 06:33:05 jasper Exp $ - -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.5 diff -u -p -r1.5 PLIST --- pkg/PLIST 31 Aug 2017 06:33:05 -0000 1.5 +++ pkg/PLIST 6 Oct 2017 06:08:45 -0000 @@ -1,11 +1,7 @@ @comment $OpenBSD: PLIST,v 1.5 2017/08/31 06:33:05 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 +@bin bin/qexo +@info info/kawa.info @man man/man1/kawa.1 @man man/man1/qexo.1 share/kawa/ Nigel Taylor <njtaylor0...@btinternet.com> writes: > This need fixing to stop random build failures. > > forwarding my e-mail sent for 2.4 with details... > > On 10/05/17 20:58, Timo Myyrä wrote: >> Hi, >> >> Here's an update to kawa 3.0. A lot of patches got upstreamed so zap those. >> Slightly tested on amd64. >> >> Timo >> >> >> Index: Makefile >> =================================================================== >> RCS file: /cvs/ports/lang/kawa/Makefile,v >> retrieving revision 1.15 >> diff -u -p -r1.15 Makefile >> --- Makefile 19 Sep 2017 19:23:04 -0000 1.15 >> +++ Makefile 5 Oct 2017 05:14:55 -0000 >> @@ -2,7 +2,7 @@ >> >> COMMENT= Scheme and language framework for the Java platform >> >> -DISTNAME= kawa-2.4 >> +DISTNAME= kawa-3.0 >> CATEGORIES= lang java >> >> HOMEPAGE= https://www.gnu.org/software/kawa/ >> Index: distinfo >> =================================================================== >> RCS file: /cvs/ports/lang/kawa/distinfo,v >> retrieving revision 1.4 >> diff -u -p -r1.4 distinfo >> --- distinfo 31 Aug 2017 06:33:05 -0000 1.4 >> +++ distinfo 5 Oct 2017 05:14:55 -0000 >> @@ -1,2 +1,2 @@ >> -SHA256 (kawa-2.4.tar.gz) = FMCL6BYxoeuLiSbKI1GYyhZRVsDBeey+boONP0tHY10= >> -SIZE (kawa-2.4.tar.gz) = 3285436 >> +SHA256 (kawa-3.0.tar.gz) = Hm6FIXvW2MKgw0eIgqRXAxTfa5UHj+exIlkRw5q/OM0= >> +SIZE (kawa-3.0.tar.gz) = 3393879 >> Index: patches/patch-bin_kawa_sh_in >> =================================================================== >> RCS file: patches/patch-bin_kawa_sh_in >> diff -N patches/patch-bin_kawa_sh_in >> --- patches/patch-bin_kawa_sh_in 31 Aug 2017 06:33:05 -0000 1.1 >> +++ /dev/null 1 Jan 1970 00:00:00 -0000 >> @@ -1,10 +0,0 @@ >> -$OpenBSD: patch-bin_kawa_sh_in,v 1.1 2017/08/31 06:33:05 jasper Exp $ >> ---- 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 >> --- patches/patch-doc_Makefile_am 31 Aug 2017 06:33:05 -0000 1.1 >> +++ /dev/null 1 Jan 1970 00:00:00 -0000 >> @@ -1,19 +0,0 @@ >> -$OpenBSD: patch-doc_Makefile_am,v 1.1 2017/08/31 06:33:05 jasper Exp $ >> ---- 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-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 >> --- patches/patch-gnu_xquery_testsuite_exp-format-users_html 31 Aug 2017 >> 06:33:05 -0000 1.1 >> +++ /dev/null 1 Jan 1970 00:00:00 -0000 >> @@ -1,12 +0,0 @@ >> -$OpenBSD: patch-gnu_xquery_testsuite_exp-format-users_html,v 1.1 2017/08/31 >> 06:33:05 jasper Exp $ >> - >> -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 >> --- patches/patch-gnu_xquery_testsuite_latin1a_expected 31 Aug 2017 >> 06:33:05 -0000 1.1 >> +++ /dev/null 1 Jan 1970 00:00:00 -0000 >> @@ -1,9 +0,0 @@ >> -$OpenBSD: patch-gnu_xquery_testsuite_latin1a_expected,v 1.1 2017/08/31 >> 06:33:05 jasper Exp $ >> - >> -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 >> --- patches/patch-testsuite_Makefile_am 31 Aug 2017 06:33:05 -0000 >> 1.1 >> +++ /dev/null 1 Jan 1970 00:00:00 -0000 >> @@ -1,23 +0,0 @@ >> -$OpenBSD: patch-testsuite_Makefile_am,v 1.1 2017/08/31 06:33:05 jasper Exp $ >> - >> -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 >> >>
