Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_170917220077610"
MIME-Version: 1.0
Date: Thu, 29 Feb 2024 02:03:20 +0000
From: "Jason R Thorpe" <thorpej@netbsd.org>
Subject: CVS commit: pkgsrc/devel/icestorm
To: pkgsrc-changes@NetBSD.org
Reply-To: thorpej@netbsd.org
Message-Id: <20240229020320.D8D5AFA27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	thorpej
Date:		Thu Feb 29 02:03:20 UTC 2024

Modified Files:
	pkgsrc/devel/icestorm: Makefile distinfo
Added Files:
	pkgsrc/devel/icestorm/patches: patch-icebox_Makefile

Log Message:
On Darwin, add gsed to USE_TOOLS and patch the icestorm Makefile to
stop working around a behavioral difference in the Darwin sed(1) -i
option relative to other sed implementations.

If textproc/nbsed supported the -i option, the USE_TOOLS change would
not be necessary.  But since the Darwin system sed(1) is not used in
pkgsrc at the moment, the Makefile patch would still be required.

See also PR pkg/57970.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/icestorm/Makefile \
    pkgsrc/devel/icestorm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/icestorm/patches/patch-icebox_Makefile

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


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

Modified files:

Index: pkgsrc/devel/icestorm/Makefile
diff -u pkgsrc/devel/icestorm/Makefile:1.1 pkgsrc/devel/icestorm/Makefile:1.2
--- pkgsrc/devel/icestorm/Makefile:1.1	Wed Feb 28 06:02:38 2024
+++ pkgsrc/devel/icestorm/Makefile	Thu Feb 29 02:03:20 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2024/02/28 06:02:38 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2024/02/29 02:03:20 thorpej Exp $
 
 # There are no release tags for icestorm
 ICESTORM_VERSION=0.0.20240227
@@ -13,8 +13,16 @@ HOMEPAGE=	https://github.com/YosysHQ/ice
 COMMENT=	Lattice iCE40 FPGAs Bitstream Documentation and tools
 LICENSE=	isc
 
+.include "../../mk/bsd.prefs.mk"
+
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
+.if ${OPSYS} == "Darwin"
+# The -i option on Darwin sed(1) behaves differently, and textproc/nbsed
+# (which gets substituted for the system sed(1) for other reasons) doesn't
+# support the -i option.  See also patches/patch-icebox_Makefile.
+USE_TOOLS+=	gsed
+.endif
 
 REPLACE_PYTHON+= icebox/*.py
 
Index: pkgsrc/devel/icestorm/distinfo
diff -u pkgsrc/devel/icestorm/distinfo:1.1 pkgsrc/devel/icestorm/distinfo:1.2
--- pkgsrc/devel/icestorm/distinfo:1.1	Wed Feb 28 06:02:38 2024
+++ pkgsrc/devel/icestorm/distinfo	Thu Feb 29 02:03:20 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2024/02/28 06:02:38 thorpej Exp $
+$NetBSD: distinfo,v 1.2 2024/02/29 02:03:20 thorpej Exp $
 
 BLAKE2s (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = 511978571885ce362c39616dfb1fcccd5a1df31562b8cbb925547f15d5853cce
 SHA512 (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = f0bfbc0af651a5d1cc45ecc4ce6cb9f6a8fdf4797f17b2af7e70278f0786b8d063503606cbf624aee558a3e32a3dc7c595694ac335ce7b52bfece9b18b5543da
 Size (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = 948430 bytes
+SHA1 (patch-icebox_Makefile) = 2b99d8c0e780c3b22a0697bfbd9e5b0259e0839d
 SHA1 (patch-icetime_iceutil.cc) = d5cd83337808631b148f64d9c2ac6157c0b4d823

Added files:

Index: pkgsrc/devel/icestorm/patches/patch-icebox_Makefile
diff -u /dev/null pkgsrc/devel/icestorm/patches/patch-icebox_Makefile:1.1
--- /dev/null	Thu Feb 29 02:03:20 2024
+++ pkgsrc/devel/icestorm/patches/patch-icebox_Makefile	Thu Feb 29 02:03:20 2024
@@ -0,0 +1,22 @@
+$NetBSD: patch-icebox_Makefile,v 1.1 2024/02/29 02:03:20 thorpej Exp $
+
+Disable special case for Darwin sed(1); the package Makefile forces
+the use of GNU sed(1) on Darwin.
+
+--- icebox/Makefile.orig	2024-02-28 20:06:15
++++ icebox/Makefile	2024-02-28 18:31:57
+@@ -1,10 +1,10 @@
+ include ../config.mk
+ 
+-ifneq ($(shell uname -s),Darwin)
++#ifneq ($(shell uname -s),Darwin)
+   SED_I = sed -i
+-else
+-  SED_I = sed -i ''
+-endif
++#else
++#  SED_I = sed -i ''
++#endif
+ 
+ all: chipdb-384.txt chipdb-1k.txt chipdb-8k.txt chipdb-5k.txt chipdb-lm4k.txt chipdb-u4k.txt
+ 


--_----------=_170917220077610--