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 > >
