Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1688055536235170"
MIME-Version: 1.0
Date: Thu, 29 Jun 2023 16:18:56 +0000
From: "Hauke Fath" <hauke@netbsd.org>
Subject: CVS commit: pkgsrc/devel/editline
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: hauke@netbsd.org
Message-Id: <20230629161856.55789FA89@cvs.NetBSD.org>

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	hauke
Date:		Thu Jun 29 16:18:56 UTC 2023

Modified Files:
	pkgsrc/devel/editline: Makefile distinfo
Added Files:
	pkgsrc/devel/editline/patches: patch-src_vis.c

Log Message:
Unbreak build on OmniOS, which #defines MIN() in an uncommon
place.

This should really be picked up by autoconf.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/editline/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/editline/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/editline/patches/patch-src_vis.c

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


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

Modified files:

Index: pkgsrc/devel/editline/Makefile
diff -u pkgsrc/devel/editline/Makefile:1.14 pkgsrc/devel/editline/Makefile:1.15
--- pkgsrc/devel/editline/Makefile:1.14	Mon Jun 26 11:37:07 2023
+++ pkgsrc/devel/editline/Makefile	Thu Jun 29 16:18:56 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2023/06/26 11:37:07 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2023/06/29 16:18:56 hauke Exp $
 
 DISTNAME=		libedit-20221030-3.1
 PKGNAME=		editline-3.1.20221030
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		https://thrysoee.dk/editline/
 

Index: pkgsrc/devel/editline/distinfo
diff -u pkgsrc/devel/editline/distinfo:1.17 pkgsrc/devel/editline/distinfo:1.18
--- pkgsrc/devel/editline/distinfo:1.17	Mon Jun 26 11:37:07 2023
+++ pkgsrc/devel/editline/distinfo	Thu Jun 29 16:18:56 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2023/06/26 11:37:07 wiz Exp $
+$NetBSD: distinfo,v 1.18 2023/06/29 16:18:56 hauke Exp $
 
 BLAKE2s (libedit-20221030-3.1.tar.gz) = 28971f0b4661c9b400df3cfe8d82e6ef4cf7bc9a964a013671adf560aeec9488
 SHA512 (libedit-20221030-3.1.tar.gz) = 41eb46feaffa909e8790b9a9e304d5246e82ab366721196126a923d68b4d4964d0a433fe238f9d5e0a00aefb5c8cb66132150792929a793785ad091d91016f97
@@ -8,3 +8,4 @@ SHA1 (patch-ac) = 666403d5ef03fea39081d7
 SHA1 (patch-libedit.pc.in) = c2c810ab2c9c7b9d1862abc7bdca53fda5732119
 SHA1 (patch-src_sys.h) = 3c1f69b520b382e3a0308e7f8ffaddca65d91a8d
 SHA1 (patch-src_terminal.h) = 5d658f7b7c3b88c0c3122a1be740f3a72d7d2370
+SHA1 (patch-src_vis.c) = 45d0df27a3ae34c3d23eaa777d576768619d8bb6

Added files:

Index: pkgsrc/devel/editline/patches/patch-src_vis.c
diff -u /dev/null pkgsrc/devel/editline/patches/patch-src_vis.c:1.1
--- /dev/null	Thu Jun 29 16:18:56 2023
+++ pkgsrc/devel/editline/patches/patch-src_vis.c	Thu Jun 29 16:18:56 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_vis.c,v 1.1 2023/06/29 16:18:56 hauke Exp $
+
+OmniOS has MIN() in <utility.h>, which autoconf could check for.
+
+--- src/vis.c.orig	2022-06-11 07:56:37.000000000 +0000
++++ src/vis.c
+@@ -85,6 +85,10 @@ __weak_alias(strvisx,_strvisx)
+ #include <stdio.h>
+ #include <string.h>
+ 
++#ifndef MIN
++#define MIN(a,b)        (((a)<(b))?(a):(b))
++#endif
++
+ /*
+  * The reason for going through the trouble to deal with character encodings
+  * in vis(3), is that we use this to safe encode output of commands. This


--_----------=_1688055536235170--