subject:"\[update\] kawa\-3.0"

Re: [update] kawa-3.0

2018-05-06 Thread Timo Myyrä

Stuart Henderson  writes:

> On 2018/04/24 12:48, Timo Myyrä wrote:
>
>> Hi,
>> 
>> Could someone test if the following update to kawa works on i386 or does it
>> still fail to build.
>> 
>> Timo
>
> Happy to just try it on i386, I can always mark it broken again if it fails.
> Also now the uvm bug is fixed, it should be ok with 1200M heap so it probably
> makes sense to unconditionally set SLIB_JAVAFLAGS=-Xmx1200M.
>
> Is it ready to go otherwise?

Yeah, I think its ready to go in. Here's revised diff with heap tweak.

Timo

Index: Makefile
===
RCS file: /cvs/ports/lang/kawa/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile18 Mar 2018 13:26:46 -  1.16
+++ Makefile25 Apr 2018 19:58:21 -
@@ -1,10 +1,8 @@
 # $OpenBSD: Makefile,v 1.16 2018/03/18 13:26:46 sthen Exp $
 
-BROKEN-i386=   doesn't build reliably#'
-
 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/
@@ -24,7 +22,7 @@ USE_GMAKE=Yes
 AUTOCONF_VERSION=  2.69
 AUTOMAKE_VERSION=  1.15
 
-WANTLIB+=  c ncurses readline
+WANTLIB+=  c curses readline
 BUILD_DEPENDS= print/texinfo \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
@@ -40,14 +38,7 @@ MAKE_FLAGS=  JAVAC=${JAVA_HOME}/bin/java
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
 
-.include 
-# 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
-.else
-MAKE_ENV+= SLIB_JAVAFLAGS=-Xmx800M
-.endif
 
 # use UTF-8 encoding to avoid following errors:
 # unmappable character for encoding ASCII
@@ -56,8 +47,12 @@ MAKE_ENV+=   LANG=en_US.UTF-8
 TEST_FLAGS =   DIFF=diff \
PATH=${PATH}:${JAVA_HOME}/bin
 
+# Use a bit complex xargs avoid unneeded modifications to files
+# causing build issues on i386.
 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 
Index: distinfo
===
RCS file: /cvs/ports/lang/kawa/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo31 Aug 2017 06:33:05 -  1.4
+++ distinfo25 Apr 2018 19:58:21 -
@@ -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_in31 Aug 2017 06:33:05 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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.origSun 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 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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.amSat 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:

Re: [update] kawa-3.0

2018-04-25 Thread Timo Myyrä

Stuart Henderson  writes:

> On 2018/04/24 12:48, Timo Myyrä wrote:
>
>> Hi,
>> 
>> Could someone test if the following update to kawa works on i386 or does it
>> still fail to build.
>> 
>> Timo
>
> Happy to just try it on i386, I can always mark it broken again if it fails.
> Also now the uvm bug is fixed, it should be ok with 1200M heap so it probably
> makes sense to unconditionally set SLIB_JAVAFLAGS=-Xmx1200M.
>
> Is it ready to go otherwise?

Here's revised diff removing the heap conditional.
The port seems to be ready for update otherwise, I've tested it lightly on amd64
and test pass. I haven't used it on i386 though so that needs testing or the
BROKEN mark should be restored.

timo

Index: Makefile
===
RCS file: /cvs/ports/lang/kawa/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile18 Mar 2018 13:26:46 -  1.16
+++ Makefile25 Apr 2018 19:58:21 -
@@ -1,10 +1,8 @@
 # $OpenBSD: Makefile,v 1.16 2018/03/18 13:26:46 sthen Exp $
 
-BROKEN-i386=   doesn't build reliably#'
-
 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/
@@ -24,7 +22,7 @@ USE_GMAKE=Yes
 AUTOCONF_VERSION=  2.69
 AUTOMAKE_VERSION=  1.15
 
-WANTLIB+=  c ncurses readline
+WANTLIB+=  c curses readline
 BUILD_DEPENDS= print/texinfo \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
@@ -40,14 +38,7 @@ MAKE_FLAGS=  JAVAC=${JAVA_HOME}/bin/java
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
 
-.include 
-# 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
-.else
-MAKE_ENV+= SLIB_JAVAFLAGS=-Xmx800M
-.endif
 
 # use UTF-8 encoding to avoid following errors:
 # unmappable character for encoding ASCII
@@ -56,8 +47,12 @@ MAKE_ENV+=   LANG=en_US.UTF-8
 TEST_FLAGS =   DIFF=diff \
PATH=${PATH}:${JAVA_HOME}/bin
 
+# Use a bit complex xargs avoid unneeded modifications to files
+# causing build issues on i386.
 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 
Index: distinfo
===
RCS file: /cvs/ports/lang/kawa/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo31 Aug 2017 06:33:05 -  1.4
+++ distinfo25 Apr 2018 19:58:21 -
@@ -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_in31 Aug 2017 06:33:05 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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.origSun 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 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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.amSat 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 >$@

Re: [update] kawa-3.0

2018-04-24 Thread Stuart Henderson

On 2018/04/24 12:48, Timo Myyrä wrote:
> Hi,
> 
> Could someone test if the following update to kawa works on i386 or does it
> still fail to build.
> 
> Timo

Happy to just try it on i386, I can always mark it broken again if it fails.
Also now the uvm bug is fixed, it should be ok with 1200M heap so it probably
makes sense to unconditionally set SLIB_JAVAFLAGS=-Xmx1200M.

Is it ready to go otherwise?

[update] kawa-3.0

2018-04-24 Thread Timo Myyrä

Hi,

Could someone test if the following update to kawa works on i386 or does it
still fail to build.

Timo

Index: Makefile
===
RCS file: /cvs/ports/lang/kawa/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile18 Mar 2018 13:26:46 -  1.16
+++ Makefile24 Apr 2018 09:41:39 -
@@ -1,10 +1,8 @@
 # $OpenBSD: Makefile,v 1.16 2018/03/18 13:26:46 sthen Exp $
 
-BROKEN-i386=   doesn't build reliably#'
-
 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/
@@ -24,7 +22,7 @@ USE_GMAKE=Yes
 AUTOCONF_VERSION=  2.69
 AUTOMAKE_VERSION=  1.15
 
-WANTLIB+=  c ncurses readline
+WANTLIB+=  c curses readline
 BUILD_DEPENDS= print/texinfo \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
@@ -56,8 +54,12 @@ MAKE_ENV+=   LANG=en_US.UTF-8
 TEST_FLAGS =   DIFF=diff \
PATH=${PATH}:${JAVA_HOME}/bin
 
+# Use a bit complex xargs avoid unneeded modifications to files
+# causing build issues on i386.
 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 
Index: distinfo
===
RCS file: /cvs/ports/lang/kawa/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo31 Aug 2017 06:33:05 -  1.4
+++ distinfo24 Apr 2018 09:41:39 -
@@ -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_in31 Aug 2017 06:33:05 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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.origSun 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 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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.amSat 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 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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 '#

Re: [update] kawa-3.0

2018-01-25 Thread Timo Myyrä

timo.my...@bittivirhe.fi (Timo Myyrä) writes:

> Klemens Nanni  writes:
>
>> On Sat, Jan 13, 2018 at 12:08:25AM +0200, Timo Myyrä wrote:
>>>  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'; \
>> That seems overly complicated to me. find can do what xargs does here,
>> running two xargs just makes it worse and after all there's no need for
>> grep. Since you'll encounter only one "JAR =..." assignment per line,
>> sed's `g' flag can be dropped as well.
>>
>> Might be nitpicking but how about this (untested):
>>
>>  find ${WRKSRC} -type f -exec \
>>  sed -i '/^JAR =/s,=.*,= ${JAVA_HOME}/bin/jar,' {} +
>
> I recall that there was some build issue which was solved this. The previous
> version was similar than you have.
>
> timo

Didn't find the discussion about the build error but IIRC the first version of
the command updated the file access times which made the make re-compile files
and this somehow didn't work. Thats why there's a bit more complex command to
patch the files.

Timo

Re: [update] kawa-3.0

2018-01-21 Thread Timo Myyrä

Klemens Nanni  writes:

> On Sat, Jan 13, 2018 at 12:08:25AM +0200, Timo Myyrä wrote:
>>  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'; \
> That seems overly complicated to me. find can do what xargs does here,
> running two xargs just makes it worse and after all there's no need for
> grep. Since you'll encounter only one "JAR =..." assignment per line,
> sed's `g' flag can be dropped as well.
>
> Might be nitpicking but how about this (untested):
>
>   find ${WRKSRC} -type f -exec \
>   sed -i '/^JAR =/s,=.*,= ${JAVA_HOME}/bin/jar,' {} +

I recall that there was some build issue which was solved this. The previous
version was similar than you have.

timo

Re: [update] kawa-3.0

2018-01-21 Thread Klemens Nanni

On Sat, Jan 13, 2018 at 12:08:25AM +0200, Timo Myyrä wrote:
>  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'; \
That seems overly complicated to me. find can do what xargs does here,
running two xargs just makes it worse and after all there's no need for
grep. Since you'll encounter only one "JAR =..." assignment per line,
sed's `g' flag can be dropped as well.

Might be nitpicking but how about this (untested):

find ${WRKSRC} -type f -exec \
sed -i '/^JAR =/s,=.*,= ${JAVA_HOME}/bin/jar,' {} +

Re: [update] kawa-3.0

2018-01-20 Thread Timo Myyrä

timo.my...@bittivirhe.fi (Timo Myyrä) writes:

> Hi,
>
> Re-sending earlier diff to bring kawa to latest release.
>
> 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 -  1.15
> +++ Makefile  12 Jan 2018 22:09:18 -
> @@ -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/
> @@ -27,7 +27,7 @@ BUILD_DEPENDS=  print/texinfo \
>   ${MODGNU_AUTOCONF_DEPENDS} \
>   ${MODGNU_AUTOMAKE_DEPENDS}
>  
> -CONFIGURE_STYLE= gnu
> +CONFIGURE_STYLE= autoconf no-autoheader
>  CONFIGURE_ARGS+= --enable-kawa-frontend
>  CONFIGURE_ENV+=  AUTOMAKE=${LOCALBASE}/bin/automake-1.15 \
>   AUTOCONF=${LOCALBASE}/bin/autoconf-2.69
> @@ -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 
> 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 -  1.4
> +++ distinfo  12 Jan 2018 22:09:18 -
> @@ -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 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -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 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -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_am31 Aug 2017 06:33:05 
> -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -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

[update] kawa-3.0

2018-01-12 Thread Timo Myyrä

Hi,

Re-sending earlier diff to bring kawa to latest release.

Timo

Index: Makefile
===
RCS file: /cvs/ports/lang/kawa/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile19 Sep 2017 19:23:04 -  1.15
+++ Makefile12 Jan 2018 22:09:18 -
@@ -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/
@@ -27,7 +27,7 @@ BUILD_DEPENDS=print/texinfo \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
 
-CONFIGURE_STYLE=   gnu
+CONFIGURE_STYLE=   autoconf no-autoheader
 CONFIGURE_ARGS+=   --enable-kawa-frontend
 CONFIGURE_ENV+=AUTOMAKE=${LOCALBASE}/bin/automake-1.15 \
AUTOCONF=${LOCALBASE}/bin/autoconf-2.69
@@ -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 
Index: distinfo
===
RCS file: /cvs/ports/lang/kawa/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo31 Aug 2017 06:33:05 -  1.4
+++ distinfo12 Jan 2018 22:09:18 -
@@ -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_in31 Aug 2017 06:33:05 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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.origSun 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 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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.amSat 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 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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

Re: [update] kawa-3.0

2017-10-06 Thread Timo Myyrä

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
--- Makefile19 Sep 2017 19:23:04 -  1.15
+++ Makefile6 Oct 2017 06:08:45 -
@@ -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 
Index: distinfo
===
RCS file: /cvs/ports/lang/kawa/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo31 Aug 2017 06:33:05 -  1.4
+++ distinfo6 Oct 2017 06:08:45 -
@@ -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_in31 Aug 2017 06:33:05 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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.origSun 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 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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.amSat 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 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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
-

Re: [update] kawa-3.0

2017-10-05 Thread Nigel Taylor

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 -  1.15
> +++ Makefile  5 Oct 2017 05:14:55 -
> @@ -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 -  1.4
> +++ distinfo  5 Oct 2017 05:14:55 -
> @@ -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 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -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 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -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 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -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 @@
> - Rip Van Winkle
> - B
> - 
> --
> -+
> -\ 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 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -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 @@
> --Norwegian letters: ae: oe: aa:
> -+Norwegian letters: ae: oe: aa:
> -\ 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 -  
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -

[update] kawa-3.0

2017-10-05 Thread Timo Myyrä

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
--- Makefile19 Sep 2017 19:23:04 -  1.15
+++ Makefile5 Oct 2017 05:14:55 -
@@ -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
--- distinfo31 Aug 2017 06:33:05 -  1.4
+++ distinfo5 Oct 2017 05:14:55 -
@@ -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_in31 Aug 2017 06:33:05 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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.origSun 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 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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.amSat 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_html31 Aug 2017 
06:33:05 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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 @@
- Rip Van Winkle
- B
- 
--
-+
-\ 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 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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 @@
--Norwegian letters: ae: oe: aa:
-+Norwegian letters: ae: oe: aa:
-\ 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 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -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 =

Re: [update] kawa-3.0

Re: [update] kawa-3.0

Re: [update] kawa-3.0

[update] kawa-3.0

Re: [update] kawa-3.0

Re: [update] kawa-3.0

Re: [update] kawa-3.0

Re: [update] kawa-3.0

[update] kawa-3.0

Re: [update] kawa-3.0

Re: [update] kawa-3.0

[update] kawa-3.0

12 matches

Site Navigation

Mail list logo

Footer information