Received: by mail.netbsd.org (Postfix, from userid 605) id AEE2584D5E; Mon, 26 Sep 2022 10:21:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E0D1084D00 for ; Mon, 26 Sep 2022 10:21:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id J0Buu59fSHbL for ; Mon, 26 Sep 2022 10:21:33 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1081184CED for ; Mon, 26 Sep 2022 10:21:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 09BCEFA90; Mon, 26 Sep 2022 10:21:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_166418769328290" MIME-Version: 1.0 Date: Mon, 26 Sep 2022 10:21:33 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/devel/fhist To: pkgsrc-changes@NetBSD.org Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20220926102133.09BCEFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_166418769328290 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nros Date: Mon Sep 26 10:21:32 UTC 2022 Modified Files: pkgsrc/devel/fhist: Makefile distinfo pkgsrc/devel/fhist/patches: patch-common_input.h patch-common_output.h Added Files: pkgsrc/devel/fhist/patches: patch-common_error__intl.c Log Message: fhist: unbrake build and fix a bug in usage of iswctype. Set LICENSE. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/fhist/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/fhist/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/devel/fhist/patches/patch-common_error__intl.c cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/fhist/patches/patch-common_input.h \ pkgsrc/devel/fhist/patches/patch-common_output.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_166418769328290 Content-Disposition: inline Content-Length: 4283 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/fhist/Makefile diff -u pkgsrc/devel/fhist/Makefile:1.20 pkgsrc/devel/fhist/Makefile:1.21 --- pkgsrc/devel/fhist/Makefile:1.20 Sun Jan 26 05:26:23 2020 +++ pkgsrc/devel/fhist/Makefile Mon Sep 26 10:21:32 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2020/01/26 05:26:23 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2022/09/26 10:21:32 nros Exp $ # DISTNAME= fhist-1.16 @@ -9,6 +9,7 @@ MASTER_SITES= http://fhist.sourceforge. MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://fhist.sourceforge.net/ COMMENT= File history and comparison tools +LICENSE= gnu-gpl-v2 USE_TOOLS+= gsoelim msgfmt yacc GNU_CONFIGURE= YES Index: pkgsrc/devel/fhist/distinfo diff -u pkgsrc/devel/fhist/distinfo:1.8 pkgsrc/devel/fhist/distinfo:1.9 --- pkgsrc/devel/fhist/distinfo:1.8 Tue Oct 26 10:14:38 2021 +++ pkgsrc/devel/fhist/distinfo Mon Sep 26 10:21:32 2022 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.8 2021/10/26 10:14:38 nia Exp $ +$NetBSD: distinfo,v 1.9 2022/09/26 10:21:32 nros Exp $ BLAKE2s (fhist-1.16.tar.gz) = b4b4aaf3f8a8f85d64156b49ac186209bf1da3c9f833cc0283d75e0e48e79e02 SHA512 (fhist-1.16.tar.gz) = 919fc4d424e1f878404ec2d305dbcd66a4697c88c38af54033bdb178704cf08997c816d75db93ddbfc5248f29b997c4b8aaa3fd98ee790c32582124fc332bc1d Size (fhist-1.16.tar.gz) = 383180 bytes -SHA1 (patch-common_input.h) = c72555eaf8dad73406531b2933314c22c67784b2 -SHA1 (patch-common_output.h) = ea2b35c288892e6a509318501bc2b537b3837ee9 +SHA1 (patch-common_error__intl.c) = 2f5486d3bffbd86e5562c69f118e08e73edf2677 +SHA1 (patch-common_input.h) = e966e2b26b894dbb4f84ffb7866b327aa280e765 +SHA1 (patch-common_output.h) = d9990025270ec1203bbba89719edb5656cb773c8 Index: pkgsrc/devel/fhist/patches/patch-common_input.h diff -u pkgsrc/devel/fhist/patches/patch-common_input.h:1.1 pkgsrc/devel/fhist/patches/patch-common_input.h:1.2 --- pkgsrc/devel/fhist/patches/patch-common_input.h:1.1 Tue Feb 26 10:25:38 2013 +++ pkgsrc/devel/fhist/patches/patch-common_input.h Mon Sep 26 10:21:32 2022 @@ -1,4 +1,6 @@ -$NetBSD: patch-common_input.h,v 1.1 2013/02/26 10:25:38 joerg Exp $ +$NetBSD: patch-common_input.h,v 1.2 2022/09/26 10:21:32 nros Exp $ + +* remove redefinitions of functions since it conflicts with c99 --- common/input.h.orig 2013-02-25 17:15:19.000000000 +0000 +++ common/input.h @@ -7,7 +9,7 @@ $NetBSD: patch-common_input.h,v 1.1 2013 struct string_ty *input_one_line(input_ty *); -#ifdef __GNUC__ -+#if defined(__GNUC__) && !defined(__clang__) ++#if 0 extern __inline long input_read(input_ty *fp, void *data, long len) { if (len <= 0) return 0; if (fp->pushback_len > 0) { fp->pushback_len--; *(char *)data = fp->pushback_buf[ Index: pkgsrc/devel/fhist/patches/patch-common_output.h diff -u pkgsrc/devel/fhist/patches/patch-common_output.h:1.1 pkgsrc/devel/fhist/patches/patch-common_output.h:1.2 --- pkgsrc/devel/fhist/patches/patch-common_output.h:1.1 Tue Feb 26 10:25:38 2013 +++ pkgsrc/devel/fhist/patches/patch-common_output.h Mon Sep 26 10:21:32 2022 @@ -1,4 +1,6 @@ -$NetBSD: patch-common_output.h,v 1.1 2013/02/26 10:25:38 joerg Exp $ +$NetBSD: patch-common_output.h,v 1.2 2022/09/26 10:21:32 nros Exp $ + +* remove redefinitions of functions since it conflicts with c99 --- common/output.h.orig 2013-02-25 17:15:42.000000000 +0000 +++ common/output.h @@ -7,7 +9,7 @@ $NetBSD: patch-common_output.h,v 1.1 201 #ifndef DEBUG -#ifdef __GNUC__ -+#if defined(__GNUC__) && !defined(__clang__) ++#if 0 extern __inline const char *output_filename(output_ty *fp) { return fp->vptr->filename(fp); } Added files: Index: pkgsrc/devel/fhist/patches/patch-common_error__intl.c diff -u /dev/null pkgsrc/devel/fhist/patches/patch-common_error__intl.c:1.1 --- /dev/null Mon Sep 26 10:21:32 2022 +++ pkgsrc/devel/fhist/patches/patch-common_error__intl.c Mon Sep 26 10:21:32 2022 @@ -0,0 +1,15 @@ +$NetBSD: patch-common_error__intl.c,v 1.1 2022/09/26 10:21:32 nros Exp $ + +* call iswctype with the right arguments + +--- common/error_intl.c.orig 2022-09-26 07:07:12.160390023 +0000 ++++ common/error_intl.c +@@ -146,7 +146,7 @@ column_width(wchar_t wc) + kanji = wctype("kanji"); + kanji_set = 1; + } +- if (kanji && iswctype(kanji, wc)) ++ if (kanji && iswctype(wc, kanji)) + return 2; + #endif + return 1; --_----------=_166418769328290--