Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1603197977208420"
MIME-Version: 1.0
Date: Tue, 20 Oct 2020 12:46:17 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/lang/clisp
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20201020124617.B83BBFB28@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Tue Oct 20 12:46:17 UTC 2020

Modified Files:
	pkgsrc/lang/clisp: distinfo
	pkgsrc/lang/clisp/patches: patch-src_stream.d

Log Message:
clisp: Remove iconv warning avoidance.

This breaks the build on Darwin when using pkgsrc libiconv.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/lang/clisp/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/clisp/patches/patch-src_stream.d

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


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

Modified files:

Index: pkgsrc/lang/clisp/distinfo
diff -u pkgsrc/lang/clisp/distinfo:1.37 pkgsrc/lang/clisp/distinfo:1.38
--- pkgsrc/lang/clisp/distinfo:1.37	Sat Nov  2 17:02:56 2019
+++ pkgsrc/lang/clisp/distinfo	Tue Oct 20 12:46:17 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2019/11/02 17:02:56 rillig Exp $
+$NetBSD: distinfo,v 1.38 2020/10/20 12:46:17 jperkin Exp $
 
 SHA1 (clisp-2.49.tar.gz) = 1743e7917013162400c955af441e991db43b3323
 RMD160 (clisp-2.49.tar.gz) = ae30f3b681cb023e885c6e4ed12210ee5ba14c76
@@ -11,5 +11,5 @@ SHA1 (patch-modules_readline_readline.li
 SHA1 (patch-src_configure) = 861681456cb768b7f308aa88e77f1cee1edb2090
 SHA1 (patch-src_intparam.c) = f968079252691d06e191cf991bd43eea0a0bc739
 SHA1 (patch-src_lispbibl.d) = 68eeac6def2d22ffb214fd8be3870d5c654f10bc
-SHA1 (patch-src_stream.d) = 28bde27e99277d9df24028534c3b46e2099c460c
+SHA1 (patch-src_stream.d) = 0ae0af1cc4f87180a8c9fbc1d0a933a7600937c1
 SHA1 (patch-src_unix.d) = 7158a2a18fd0f3a524658896b9b0abc98286c01e

Index: pkgsrc/lang/clisp/patches/patch-src_stream.d
diff -u pkgsrc/lang/clisp/patches/patch-src_stream.d:1.1 pkgsrc/lang/clisp/patches/patch-src_stream.d:1.2
--- pkgsrc/lang/clisp/patches/patch-src_stream.d:1.1	Tue Jan 26 09:13:26 2016
+++ pkgsrc/lang/clisp/patches/patch-src_stream.d	Tue Oct 20 12:46:17 2020
@@ -1,13 +1,24 @@
-$NetBSD: patch-src_stream.d,v 1.1 2016/01/26 09:13:26 dbj Exp $
+$NetBSD: patch-src_stream.d,v 1.2 2020/10/20 12:46:17 jperkin Exp $
+
+Remove incomplete iconv handling, it doesn't work everywhere, and warnings
+are far preferable to errors.
 
 --- src/stream.d.orig	2010-07-06 14:21:51.000000000 +0000
 +++ src/stream.d
-@@ -3994,7 +3994,7 @@ global object iconv_range (object encodi
+@@ -3993,16 +3993,6 @@ global object iconv_range (object encodi
+  error_unencodable(encoding); */
  nonreturning_function(extern, error_unencodable, (object encoding, chart ch));
  
- /* Avoid annoying warning caused by a wrongly standardized iconv() prototype. */
+-/* Avoid annoying warning caused by a wrongly standardized iconv() prototype. */
 -#ifdef GNU_LIBICONV
-+#if defined(GNU_LIBICONV) && !defined(__APPLE__)
-   #undef iconv
-   #define iconv(cd,inbuf,inbytesleft,outbuf,outbytesleft) \
-     libiconv(cd,(ICONV_CONST char **)(inbuf),inbytesleft,outbuf,outbytesleft)
+-  #undef iconv
+-  #define iconv(cd,inbuf,inbytesleft,outbuf,outbytesleft) \
+-    libiconv(cd,(ICONV_CONST char **)(inbuf),inbytesleft,outbuf,outbytesleft)
+-#else
+-  #define iconv(cd,inbuf,inbytesleft,outbuf,outbytesleft) \
+-    (iconv)(cd,(ICONV_CONST char **)(inbuf),inbytesleft,outbuf,outbytesleft)
+-#endif
+-
+ /* open the iconv conversion and signal errors when necessary
+  skip error when CHARSET is NULLOBJ
+  begin_system_call() must be called before this!!!


--_----------=_1603197977208420--