diff options
| author | dholland <dholland@pkgsrc.org> | 2021-06-27 01:22:51 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2021-06-27 01:22:51 +0000 |
| commit | 0c06e4bc0c3a9185f408f51b25c6800ff86d7d2a (patch) | |
| tree | 9b443724fe35274d1567f863e6454e72df9931bf | |
| parent | b1f79c1d5f431fa8d4065294c8c8ef57a837bc56 (diff) | |
| download | pkgsrc-0c06e4bc0c3a9185f408f51b25c6800ff86d7d2a.tar.gz | |
lang/kaffe: Fix broken build on current by patching invalid regexp.
| -rw-r--r-- | lang/kaffe/distinfo | 4 | ||||
| -rw-r--r-- | lang/kaffe/patches/patch-ae | 18 |
2 files changed, 16 insertions, 6 deletions
diff --git a/lang/kaffe/distinfo b/lang/kaffe/distinfo index 9e21ecfc1d8..f033766294e 100644 --- a/lang/kaffe/distinfo +++ b/lang/kaffe/distinfo @@ -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) = 964716433c7cc7d87c43a6ab9b7a9900a11ecc3b 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 diff --git a/lang/kaffe/patches/patch-ae b/lang/kaffe/patches/patch-ae index 276a61545be..d24ffc41d34 100644 --- a/lang/kaffe/patches/patch-ae +++ b/lang/kaffe/patches/patch-ae @@ -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. |