Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1624756972250380"
MIME-Version: 1.0
Date: Sun, 27 Jun 2021 01:22:52 +0000
From: "David A. Holland" <dholland@netbsd.org>
Subject: CVS commit: pkgsrc/lang/kaffe
To: pkgsrc-changes@NetBSD.org
Reply-To: dholland@netbsd.org
Message-Id: <20210627012252.388CAFA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1624756972250380
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	dholland
Date:		Sun Jun 27 01:22:52 UTC 2021

Modified Files:
	pkgsrc/lang/kaffe: distinfo
	pkgsrc/lang/kaffe/patches: patch-ae

Log Message:
lang/kaffe: Fix broken build on current by patching invalid regexp.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/lang/kaffe/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/kaffe/patches/patch-ae

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1624756972250380
Content-Disposition: inline
Content-Length: 2615
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/kaffe/distinfo
diff -u pkgsrc/lang/kaffe/distinfo:1.35 pkgsrc/lang/kaffe/distinfo:1.36
--- pkgsrc/lang/kaffe/distinfo:1.35	Tue Dec 29 23:34:49 2015
+++ pkgsrc/lang/kaffe/distinfo	Sun Jun 27 01:22:51 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2015/12/29 23:34:49 dholland Exp $
+$NetBSD: distinfo,v 1.36 2021/06/27 01:22:51 dholland Exp $
 
 SHA1 (kaffe-1.1.7.tar.gz) = 5951d16a4a7b11689932583d134520ca6de00817
 RMD160 (kaffe-1.1.7.tar.gz) = 7523a3470cd06cf60dbade8ea2f464dc9d85277b
@@ -8,7 +8,7 @@ SHA1 (patch-aa) = 964716433c7cc7d87c43a6
 SHA1 (patch-ab) = 0dabd3c622893bc546a36360127e76b4f7c776f1
 SHA1 (patch-ac) = f05250ee978495a4a4db8c1b35d9d98bc5730001
 SHA1 (patch-ad) = 083cb36be5cc18aa3fbdd8ed1a2cb464c9b2d5ed
-SHA1 (patch-ae) = 81e4a650fbb7fa18fa19597d27362bbb0155847f
+SHA1 (patch-ae) = 740465f350e23eab08219cc568eb6b6b08ff0159
 SHA1 (patch-af) = a6e68fd7d4f4ca28bdc6ea6fc03301dc60316a10
 SHA1 (patch-ag) = f02fd305d0dcb4c0fa2abb89eb566bc3d2edc583
 SHA1 (patch-ah) = 86837bb24c2f25eb83189b14f2833029a2884f02

Index: pkgsrc/lang/kaffe/patches/patch-ae
diff -u pkgsrc/lang/kaffe/patches/patch-ae:1.7 pkgsrc/lang/kaffe/patches/patch-ae:1.8
--- pkgsrc/lang/kaffe/patches/patch-ae:1.7	Thu Oct  5 11:22:35 2006
+++ pkgsrc/lang/kaffe/patches/patch-ae	Sun Jun 27 01:22:52 2021
@@ -1,9 +1,19 @@
-$NetBSD: patch-ae,v 1.7 2006/10/05 11:22:35 rillig Exp $
+$NetBSD: patch-ae,v 1.8 2021/06/27 01:22:52 dholland Exp $
 
-Using the ">" operator conflicts with "set -C".
+- \JNIEXPORT is an invalid regexp; it appears the backslash is just a stray
+- Using the ">" operator conflicts with "set -C".
 
---- libraries/javalib/external/classpath/scripts/check_jni_methods.sh.orig	2005-09-05 20:46:16.000000000 +0200
-+++ libraries/javalib/external/classpath/scripts/check_jni_methods.sh	2006-10-05 13:21:27.000000000 +0200
+--- libraries/javalib/external/classpath/scripts/check_jni_methods.sh.orig	2005-09-05 18:46:16.000000000 +0000
++++ libraries/javalib/external/classpath/scripts/check_jni_methods.sh
+@@ -27,7 +27,7 @@ find native/jni -name \*.cpp | \
+ find native/jni -name \*.cpp | \
+ 	xargs egrep -h '^(JNIEXPORT .* JNICALL )?Java_' | \
+ 	cut -f4 -d\  | \
+-        LC_ALL=C sed -e 's,^\JNIEXPORT .* JNICALL \(Java_[a-z_A-Z0-9]*\) *(.*$,\1,' >> $TMPFILE2
++        LC_ALL=C sed -e 's,^JNIEXPORT .* JNICALL \(Java_[a-z_A-Z0-9]*\) *(.*$,\1,' >> $TMPFILE2
+ mv $TMPFILE2 $TMPFILE3
+ sort $TMPFILE3 > $TMPFILE2
+ rm $TMPFILE3
 @@ -43,7 +43,7 @@ EOF
  # Use fgrep and direct the output to /dev/null for compatibility with older
  # grep instead of using the non portable -q.


--_----------=_1624756972250380--