Sun Jun 27 01:22:52 2021 UTC ()
lang/kaffe: Fix broken build on current by patching invalid regexp.


(dholland)
diff -r1.35 -r1.36 pkgsrc/lang/kaffe/distinfo
diff -r1.7 -r1.8 pkgsrc/lang/kaffe/patches/patch-ae
cvs diff -r1.35 -r1.36 pkgsrc/lang/kaffe/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/kaffe/distinfo 2015/12/29 23:34:49 1.35
+++ pkgsrc/lang/kaffe/distinfo 2021/06/27 01:22:51 1.36
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: distinfo,v 1.35 2015/12/29 23:34:49 dholland Exp $ 1$NetBSD: distinfo,v 1.36 2021/06/27 01:22:51 dholland Exp $
2 2
3SHA1 (kaffe-1.1.7.tar.gz) = 5951d16a4a7b11689932583d134520ca6de00817 3SHA1 (kaffe-1.1.7.tar.gz) = 5951d16a4a7b11689932583d134520ca6de00817
4RMD160 (kaffe-1.1.7.tar.gz) = 7523a3470cd06cf60dbade8ea2f464dc9d85277b 4RMD160 (kaffe-1.1.7.tar.gz) = 7523a3470cd06cf60dbade8ea2f464dc9d85277b
5SHA512 (kaffe-1.1.7.tar.gz) = 1edab9d1a2ed96230b2342a1770d83d37834aa748b273ef197777aecb4a2fee7fc57843ce0b5f7809c90af2e04ef6b2251d4516e8d088942acb548e824d28bc2 5SHA512 (kaffe-1.1.7.tar.gz) = 1edab9d1a2ed96230b2342a1770d83d37834aa748b273ef197777aecb4a2fee7fc57843ce0b5f7809c90af2e04ef6b2251d4516e8d088942acb548e824d28bc2
6Size (kaffe-1.1.7.tar.gz) = 14494274 bytes 6Size (kaffe-1.1.7.tar.gz) = 14494274 bytes
7SHA1 (patch-aa) = 964716433c7cc7d87c43a6ab9b7a9900a11ecc3b 7SHA1 (patch-aa) = 964716433c7cc7d87c43a6ab9b7a9900a11ecc3b
8SHA1 (patch-ab) = 0dabd3c622893bc546a36360127e76b4f7c776f1 8SHA1 (patch-ab) = 0dabd3c622893bc546a36360127e76b4f7c776f1
9SHA1 (patch-ac) = f05250ee978495a4a4db8c1b35d9d98bc5730001 9SHA1 (patch-ac) = f05250ee978495a4a4db8c1b35d9d98bc5730001
10SHA1 (patch-ad) = 083cb36be5cc18aa3fbdd8ed1a2cb464c9b2d5ed 10SHA1 (patch-ad) = 083cb36be5cc18aa3fbdd8ed1a2cb464c9b2d5ed
11SHA1 (patch-ae) = 81e4a650fbb7fa18fa19597d27362bbb0155847f 11SHA1 (patch-ae) = 740465f350e23eab08219cc568eb6b6b08ff0159
12SHA1 (patch-af) = a6e68fd7d4f4ca28bdc6ea6fc03301dc60316a10 12SHA1 (patch-af) = a6e68fd7d4f4ca28bdc6ea6fc03301dc60316a10
13SHA1 (patch-ag) = f02fd305d0dcb4c0fa2abb89eb566bc3d2edc583 13SHA1 (patch-ag) = f02fd305d0dcb4c0fa2abb89eb566bc3d2edc583
14SHA1 (patch-ah) = 86837bb24c2f25eb83189b14f2833029a2884f02 14SHA1 (patch-ah) = 86837bb24c2f25eb83189b14f2833029a2884f02
15SHA1 (patch-ba) = 1da47dc82ad6c575ee0b21381d251371bee97566 15SHA1 (patch-ba) = 1da47dc82ad6c575ee0b21381d251371bee97566
16SHA1 (patch-bb) = b637cb7f95a33d0f0f590b8f2f81067bf9c32f4f 16SHA1 (patch-bb) = b637cb7f95a33d0f0f590b8f2f81067bf9c32f4f
17SHA1 (patch-bc) = 43b2f18909e4939366afe9f3cdb1606faf384bec 17SHA1 (patch-bc) = 43b2f18909e4939366afe9f3cdb1606faf384bec
18SHA1 (patch-ca) = 0dc783a8e78016ef5e5e2f3392644690e3a2de9a 18SHA1 (patch-ca) = 0dc783a8e78016ef5e5e2f3392644690e3a2de9a
19SHA1 (patch-cb) = c698b0a2e078cc035dfd7401617fc8d4c2ef5fbe 19SHA1 (patch-cb) = c698b0a2e078cc035dfd7401617fc8d4c2ef5fbe
20SHA1 (patch-cc) = df48315c9470d433e33fd80136d7bf7f60f83e1d 20SHA1 (patch-cc) = df48315c9470d433e33fd80136d7bf7f60f83e1d
21SHA1 (patch-libraries_clib_awt_X_imggif.c) = c4da4eb55282b5c616612182e247f2080f6f249f 21SHA1 (patch-libraries_clib_awt_X_imggif.c) = c4da4eb55282b5c616612182e247f2080f6f249f
22SHA1 (patch-libraries_clib_awt_X_imgpng.c) = 0cb5d6ef9349c1f6e1ac1d5885f574f4e2a0aac9 22SHA1 (patch-libraries_clib_awt_X_imgpng.c) = 0cb5d6ef9349c1f6e1ac1d5885f574f4e2a0aac9
23SHA1 (patch-libraries_javalib_external_classpath_native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkTextLayout.c) = d3498337e52a735b14ff75dfaaf6dec7f9cabbef 23SHA1 (patch-libraries_javalib_external_classpath_native_jni_gtk-peer_gnu__java__awt__peer__gtk__GdkTextLayout.c) = d3498337e52a735b14ff75dfaaf6dec7f9cabbef
cvs diff -r1.7 -r1.8 pkgsrc/lang/kaffe/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/lang/kaffe/patches/patch-ae 2006/10/05 11:22:35 1.7
+++ pkgsrc/lang/kaffe/patches/patch-ae 2021/06/27 01:22:52 1.8
@@ -1,15 +1,25 @@ @@ -1,15 +1,25 @@
1$NetBSD: patch-ae,v 1.7 2006/10/05 11:22:35 rillig Exp $ 1$NetBSD: patch-ae,v 1.8 2021/06/27 01:22:52 dholland Exp $
2 2
3Using the ">" operator conflicts with "set -C". 3- \JNIEXPORT is an invalid regexp; it appears the backslash is just a stray
 4- Using the ">" operator conflicts with "set -C".
4 5
5--- libraries/javalib/external/classpath/scripts/check_jni_methods.sh.orig 2005-09-05 20:46:16.000000000 +0200 6--- libraries/javalib/external/classpath/scripts/check_jni_methods.sh.orig 2005-09-05 18:46:16.000000000 +0000
6+++ libraries/javalib/external/classpath/scripts/check_jni_methods.sh 2006-10-05 13:21:27.000000000 +0200 7+++ libraries/javalib/external/classpath/scripts/check_jni_methods.sh
 8@@ -27,7 +27,7 @@ find native/jni -name \*.cpp | \
 9 find native/jni -name \*.cpp | \
 10 xargs egrep -h '^(JNIEXPORT .* JNICALL )?Java_' | \
 11 cut -f4 -d\ | \
 12- LC_ALL=C sed -e 's,^\JNIEXPORT .* JNICALL \(Java_[a-z_A-Z0-9]*\) *(.*$,\1,' >> $TMPFILE2
 13+ LC_ALL=C sed -e 's,^JNIEXPORT .* JNICALL \(Java_[a-z_A-Z0-9]*\) *(.*$,\1,' >> $TMPFILE2
 14 mv $TMPFILE2 $TMPFILE3
 15 sort $TMPFILE3 > $TMPFILE2
 16 rm $TMPFILE3
7@@ -43,7 +43,7 @@ EOF 17@@ -43,7 +43,7 @@ EOF
8 # Use fgrep and direct the output to /dev/null for compatibility with older 18 # Use fgrep and direct the output to /dev/null for compatibility with older
9 # grep instead of using the non portable -q. 19 # grep instead of using the non portable -q.
10 if diff -b -U 0 $TMPFILE $TMPFILE2 | grep '^[+-]Java' | \ 20 if diff -b -U 0 $TMPFILE $TMPFILE2 | grep '^[+-]Java' | \
11- fgrep -v -f $TMPFILE3 > /dev/null; 21- fgrep -v -f $TMPFILE3 > /dev/null;
12+ fgrep -v -f $TMPFILE3 >> /dev/null; 22+ fgrep -v -f $TMPFILE3 >> /dev/null;
13 then 23 then
14 PROBLEM=1 24 PROBLEM=1
15 echo "Found a problem with the JNI methods declared and implemented." 25 echo "Found a problem with the JNI methods declared and implemented."