Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_164058291966160"
MIME-Version: 1.0
Date: Mon, 27 Dec 2021 05:28:39 +0000
From: "David A. Holland" <dholland@netbsd.org>
Subject: CVS commit: pkgsrc/lang/classpath
To: pkgsrc-changes@NetBSD.org
Reply-To: dholland@netbsd.org
Message-Id: <20211227052839.292CDFAEC@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	dholland
Date:		Mon Dec 27 05:28:39 UTC 2021

Modified Files:
	pkgsrc/lang/classpath: distinfo
Added Files:
	pkgsrc/lang/classpath/patches: patch-scripts_check__jni__methods.sh

Log Message:
lang/classpath: fix broken build on netbsd-current


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/classpath/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/classpath/patches/patch-scripts_check__jni__methods.sh

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


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

Modified files:

Index: pkgsrc/lang/classpath/distinfo
diff -u pkgsrc/lang/classpath/distinfo:1.16 pkgsrc/lang/classpath/distinfo:1.17
--- pkgsrc/lang/classpath/distinfo:1.16	Tue Oct 26 10:51:32 2021
+++ pkgsrc/lang/classpath/distinfo	Mon Dec 27 05:28:38 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2021/10/26 10:51:32 nia Exp $
+$NetBSD: distinfo,v 1.17 2021/12/27 05:28:38 dholland Exp $
 
 BLAKE2s (classpath-0.93.tar.gz) = 5d64a5d06c427f5714070b0a6205e6f1642cb297face68049bc9093dee6a5c17
 SHA512 (classpath-0.93.tar.gz) = 69d831361085514bb7c5607fa694914cc01bc9fe589b7744d5534c97d434722193a1b68a336642d0dba9a3b50e9acea0364741790e9f19d196e5956a51c320b0
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = 15a42f42e6cb7768dc7759
 SHA1 (patch-ac) = ea5a749f064a35be6b5411c5967139103f1481ae
 SHA1 (patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__FreetypeGlyphVector.c) = ffb175228d637cfb72e883cab4d1438ad9aa4ecf
 SHA1 (patch-native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkFontPeer.c) = 21112598c611b2fd5bbf3c8295454513037219d9
+SHA1 (patch-scripts_check__jni__methods.sh) = b09191a41e9121c62259f5da78eba6f3235ebccb

Added files:

Index: pkgsrc/lang/classpath/patches/patch-scripts_check__jni__methods.sh
diff -u /dev/null pkgsrc/lang/classpath/patches/patch-scripts_check__jni__methods.sh:1.1
--- /dev/null	Mon Dec 27 05:28:39 2021
+++ pkgsrc/lang/classpath/patches/patch-scripts_check__jni__methods.sh	Mon Dec 27 05:28:38 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-scripts_check__jni__methods.sh,v 1.1 2021/12/27 05:28:38 dholland Exp $
+
+Remove wrong escape that now fails.
+
+--- scripts/check_jni_methods.sh~	2006-09-27 18:36:09.000000000 +0000
++++ scripts/check_jni_methods.sh
+@@ -25,7 +25,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 | uniq > $TMPFILE2
+ rm $TMPFILE3


--_----------=_164058291966160--