Thu Feb 29 02:03:20 2024 UTC (89d)
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.


(thorpej)
diff -r1.1 -r1.2 pkgsrc/devel/icestorm/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/icestorm/distinfo
diff -r0 -r1.1 pkgsrc/devel/icestorm/patches/patch-icebox_Makefile
cvs diff -r1.1 -r1.2 pkgsrc/devel/icestorm/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/icestorm/Makefile 2024/02/28 06:02:38 1.1
+++ pkgsrc/devel/icestorm/Makefile 2024/02/29 02:03:20 1.2
@@ -1,26 +1,34 @@ @@ -1,26 +1,34 @@
1# $NetBSD: Makefile,v 1.1 2024/02/28 06:02:38 thorpej Exp $ 1# $NetBSD: Makefile,v 1.2 2024/02/29 02:03:20 thorpej Exp $
2 2
3# There are no release tags for icestorm 3# There are no release tags for icestorm
4ICESTORM_VERSION=0.0.20240227 4ICESTORM_VERSION=0.0.20240227
5 5
6DISTNAME= icestorm-${ICESTORM_VERSION} 6DISTNAME= icestorm-${ICESTORM_VERSION}
7CATEGORIES= devel 7CATEGORIES= devel
8MASTER_SITES= ${MASTER_SITE_GITHUB:=YosysHQ/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=YosysHQ/}
9GITHUB_TAG= 1a40ae75d4eebee9cce73a2c4d634fd42ed0110f 9GITHUB_TAG= 1a40ae75d4eebee9cce73a2c4d634fd42ed0110f
10 10
11MAINTAINER= thorpej@NetBSD.org 11MAINTAINER= thorpej@NetBSD.org
12HOMEPAGE= https://github.com/YosysHQ/icestorm 12HOMEPAGE= https://github.com/YosysHQ/icestorm
13COMMENT= Lattice iCE40 FPGAs Bitstream Documentation and tools 13COMMENT= Lattice iCE40 FPGAs Bitstream Documentation and tools
14LICENSE= isc 14LICENSE= isc
15 15
 16.include "../../mk/bsd.prefs.mk"
 17
16USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
17USE_TOOLS+= gmake 19USE_TOOLS+= gmake
 20.if ${OPSYS} == "Darwin"
 21# The -i option on Darwin sed(1) behaves differently, and textproc/nbsed
 22# (which gets substituted for the system sed(1) for other reasons) doesn't
 23# support the -i option. See also patches/patch-icebox_Makefile.
 24USE_TOOLS+= gsed
 25.endif
18 26
19REPLACE_PYTHON+= icebox/*.py 27REPLACE_PYTHON+= icebox/*.py
20 28
21INSTALLATION_DIRS= bin share 29INSTALLATION_DIRS= bin share
22 30
23.include "../../devel/libftdi/buildlink3.mk" 31.include "../../devel/libftdi/buildlink3.mk"
24.include "../../lang/python/application.mk" 32.include "../../lang/python/application.mk"
25.include "../../lang/python/tool.mk" 33.include "../../lang/python/tool.mk"
26.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/devel/icestorm/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/icestorm/distinfo 2024/02/28 06:02:38 1.1
+++ pkgsrc/devel/icestorm/distinfo 2024/02/29 02:03:20 1.2
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.1 2024/02/28 06:02:38 thorpej Exp $ 1$NetBSD: distinfo,v 1.2 2024/02/29 02:03:20 thorpej Exp $
2 2
3BLAKE2s (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = 511978571885ce362c39616dfb1fcccd5a1df31562b8cbb925547f15d5853cce 3BLAKE2s (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = 511978571885ce362c39616dfb1fcccd5a1df31562b8cbb925547f15d5853cce
4SHA512 (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = f0bfbc0af651a5d1cc45ecc4ce6cb9f6a8fdf4797f17b2af7e70278f0786b8d063503606cbf624aee558a3e32a3dc7c595694ac335ce7b52bfece9b18b5543da 4SHA512 (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = f0bfbc0af651a5d1cc45ecc4ce6cb9f6a8fdf4797f17b2af7e70278f0786b8d063503606cbf624aee558a3e32a3dc7c595694ac335ce7b52bfece9b18b5543da
5Size (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = 948430 bytes 5Size (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = 948430 bytes
 6SHA1 (patch-icebox_Makefile) = 2b99d8c0e780c3b22a0697bfbd9e5b0259e0839d
6SHA1 (patch-icetime_iceutil.cc) = d5cd83337808631b148f64d9c2ac6157c0b4d823 7SHA1 (patch-icetime_iceutil.cc) = d5cd83337808631b148f64d9c2ac6157c0b4d823
File Added: pkgsrc/devel/icestorm/patches/patch-icebox_Makefile
$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