CVS commit: pkgsrc/shells/fish

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Apr 20 00:45:08 UTC 2020

Modified Files:
        pkgsrc/shells/fish: Makefile distinfo
Added Files:
        pkgsrc/shells/fish/patches: patch-src_proc.h

Log Message:
Deal with <version> from C++17. Drop unnecessary static_assert that
fails for legacy reasons for NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/shells/fish/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/shells/fish/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/shells/fish/patches/patch-src_proc.h

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

Modified files:

Index: pkgsrc/shells/fish/Makefile
diff -u pkgsrc/shells/fish/Makefile:1.22 pkgsrc/shells/fish/Makefile:1.23
--- pkgsrc/shells/fish/Makefile:1.22    Tue Feb 18 22:00:49 2020
+++ pkgsrc/shells/fish/Makefile Mon Apr 20 00:45:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/02/18 22:00:49 maya Exp $
+# $NetBSD: Makefile,v 1.23 2020/04/20 00:45:07 joerg Exp $
 
 DISTNAME=              fish-3.1.0
 CATEGORIES=            shells
@@ -42,6 +42,9 @@ PLIST.realpath= yes
 PLIST.open=    yes
 .endif
 
+post-extract:
+       ${RM} ${WRKSRC}/version
+
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gettext-tools/buildlink3.mk"

Index: pkgsrc/shells/fish/distinfo
diff -u pkgsrc/shells/fish/distinfo:1.16 pkgsrc/shells/fish/distinfo:1.17
--- pkgsrc/shells/fish/distinfo:1.16    Tue Feb 18 22:00:49 2020
+++ pkgsrc/shells/fish/distinfo Mon Apr 20 00:45:07 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2020/02/18 22:00:49 maya Exp $
+$NetBSD: distinfo,v 1.17 2020/04/20 00:45:07 joerg Exp $
 
 SHA1 (fish-3.1.0.tar.gz) = ff863d58bcd5151f1235f8adaacebc2564f11fd4
 RMD160 (fish-3.1.0.tar.gz) = 75fbb9270035b6f172d3b1d7781430eb1e638c83
@@ -8,4 +8,5 @@ SHA1 (patch-cmake_ConfigureChecks.cmake)
 SHA1 (patch-config__cmake.h.in) = 0d522168dceebb60a0e759df3e2b39595f64d156
 SHA1 (patch-src_common.cpp) = 130e632f41db5974aeec657f0830079b8d9c28ef
 SHA1 (patch-src_fallback.cpp) = 021d454b12e1b9ac45b5820236e5b0742f25e20d
+SHA1 (patch-src_proc.h) = e8ef91a36e3ee134d3220f2396deee292ff93a40
 SHA1 (patch-src_wutil.cpp) = f016ef23b3e3ad7937e944bf341cc6ce0a3f0257

Added files:

Index: pkgsrc/shells/fish/patches/patch-src_proc.h
diff -u /dev/null pkgsrc/shells/fish/patches/patch-src_proc.h:1.1
--- /dev/null   Mon Apr 20 00:45:08 2020
+++ pkgsrc/shells/fish/patches/patch-src_proc.h Mon Apr 20 00:45:07 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_proc.h,v 1.1 2020/04/20 00:45:07 joerg Exp $
+
+WIFEXITED() is not ICE for legacy reasons, so just skip the assert.
+
+--- src/proc.h.orig    2020-04-19 18:24:08.756343798 +0000
++++ src/proc.h
+@@ -70,7 +70,9 @@ class proc_status_t {
+     static proc_status_t from_exit_code(int ret) {
+         // Some paranoia.
+         constexpr int zerocode = w_exitcode(0, 0);
++#ifndef __NetBSD__
+         static_assert(WIFEXITED(zerocode), "Synthetic exit status not reported as exited");
++#endif
+         return proc_status_t(w_exitcode(ret, 0 /* sig */));
+     }
+