CVS commit: pkgsrc/sysutils/podman

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Feb 20 09:58:02 UTC 2023

Modified Files:
        pkgsrc/sysutils/podman: distinfo
        pkgsrc/sysutils/podman/patches: patch-Makefile

Log Message:
podman: try to fix build on netbsd-9

"env -u" flag was added in NetBSD 10.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/podman/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/podman/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/sysutils/podman/distinfo
diff -u pkgsrc/sysutils/podman/distinfo:1.7 pkgsrc/sysutils/podman/distinfo:1.8
--- pkgsrc/sysutils/podman/distinfo:1.7 Tue Feb 14 00:33:12 2023
+++ pkgsrc/sysutils/podman/distinfo     Mon Feb 20 09:58:02 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2023/02/14 00:33:12 tnn Exp $
+$NetBSD: distinfo,v 1.8 2023/02/20 09:58:02 tnn Exp $
 
 BLAKE2s (podman-4.4.1.tar.gz) = 6ea927ab6855095064f5d915e407d424ca54a738d4d2a378b522d4eedef7ae37
 SHA512 (podman-4.4.1.tar.gz) = 33a22b7941f4f6715baa1cd2d5b29a4e2e95264c5239877122448f71e1408d8c393bcd2cdaef9516a580eede911c84f1cfea9d7b4c9d287a2737986fdc604e2c
 Size (podman-4.4.1.tar.gz) = 14396828 bytes
-SHA1 (patch-Makefile) = a5c09292ef911863db1c7f36d5cba1231f23ee92
+SHA1 (patch-Makefile) = a0323aacb2176f2df4c0e21ad3dfff1479c91db3
 SHA1 (patch-cmd_podman_machine_init.go) = 840273e31e44b670ef5a5ce0f26fedbeb8ebdb34
 SHA1 (patch-cmd_podman_registry_config.go) = 80b0f940c59f0c0f258c2240bac30af6a0cb21dd
 SHA1 (patch-pkg_machine_ignition__netbsd.go) = f5b4640d77c6152aa51c0c0e68de47fded340869

Index: pkgsrc/sysutils/podman/patches/patch-Makefile
diff -u pkgsrc/sysutils/podman/patches/patch-Makefile:1.2 pkgsrc/sysutils/podman/patches/patch-Makefile:1.3
--- pkgsrc/sysutils/podman/patches/patch-Makefile:1.2   Tue Feb 14 00:33:13 2023
+++ pkgsrc/sysutils/podman/patches/patch-Makefile       Mon Feb 20 09:58:02 2023
@@ -1,9 +1,22 @@
-$NetBSD: patch-Makefile,v 1.2 2023/02/14 00:33:13 tnn Exp $
+$NetBSD: patch-Makefile,v 1.3 2023/02/20 09:58:02 tnn Exp $
 
 Add netbsd support
 
 --- Makefile.orig      2023-02-08 19:03:18.000000000 +0000
 +++ Makefile
+@@ -162,10 +162,10 @@ err_if_empty = $(if $(strip $($(1))),$(s
+ # Windows and Mac (both podman-remote client only) require CGO_ENABLED=0.
+ CGO_ENABLED ?= 1
+ # Default to the native OS type and architecture unless otherwise specified
+-NATIVE_GOOS := $(shell env -u GOOS $(GO) env GOOS)
++NATIVE_GOOS := $(shell env GOOS= $(GO) env GOOS)
+ GOOS ?= $(call err_if_empty,NATIVE_GOOS)
+ # Default to the native architecture type
+-NATIVE_GOARCH := $(shell env -u GOARCH $(GO) env GOARCH)
++NATIVE_GOARCH := $(shell env GOARCH= $(GO) env GOARCH)
+ GOARCH ?= $(NATIVE_GOARCH)
+ ifeq ($(call err_if_empty,GOOS),windows)
+ BINSFX := .exe
 @@ -175,6 +175,10 @@ else ifeq ($(GOOS),darwin)
  BINSFX :=
  SRCBINDIR := bin/darwin