CVS commit: pkgsrc/sysutils/podman

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jan  7 04:17:20 UTC 2025

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

Log Message:
sysutils/podman: Patch away `env -u' in Makefile.

No functional change intended to the build product; this only fixes
the build on hosts where it wouldn't build before.

PR pkg/58967: sysutils/podman fails to build on netbsd-9


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/podman/distinfo
cvs rdiff -u -r0 -r1.5 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.10 pkgsrc/sysutils/podman/distinfo:1.11
--- pkgsrc/sysutils/podman/distinfo:1.10        Mon Jun  3 02:07:44 2024
+++ pkgsrc/sysutils/podman/distinfo     Tue Jan  7 04:17:19 2025
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.10 2024/06/03 02:07:44 maya Exp $
+$NetBSD: distinfo,v 1.11 2025/01/07 04:17:19 riastradh Exp $
 
 BLAKE2s (podman-5.0.3.tar.gz) = 7afdfd82acc64c7308fbc92294dbcea42d12a92f082dda12d8579195827cfb53
 SHA512 (podman-5.0.3.tar.gz) = c605a52cc5aba43d485796c4986f2d1be704e5c931473bf5ba1cf77f703cdb3d16f41d33da0b25287e8d001077f77caf117d3ea5dbd7c56a744274025d9ab07d
 Size (podman-5.0.3.tar.gz) = 23814179 bytes
+SHA1 (patch-Makefile) = 10b1873cf6aaacaf479cf40f076dd02b45d2dbac
 SHA1 (patch-cmd_podman_registry_config.go) = 80b0f940c59f0c0f258c2240bac30af6a0cb21dd
 SHA1 (patch-pkg_machine_ignition__netbsd.go) = f5b4640d77c6152aa51c0c0e68de47fded340869
 SHA1 (patch-pkg_machine_qemu_machine.go) = c2ca6388e0517c5485ff532fd7027326ba017edc

Added files:

Index: pkgsrc/sysutils/podman/patches/patch-Makefile
diff -u /dev/null pkgsrc/sysutils/podman/patches/patch-Makefile:1.5
--- /dev/null   Tue Jan  7 04:17:20 2025
+++ pkgsrc/sysutils/podman/patches/patch-Makefile       Tue Jan  7 04:17:20 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-Makefile,v 1.5 2025/01/07 04:17:20 riastradh Exp $
+
+Avoid `env -u', which isn't available on all platforms.
+
+--- Makefile.orig      2024-05-10 15:37:14.000000000 +0000
++++ Makefile
+@@ -182,10 +182,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 unset 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 unset GOARCH; $(GO) env GOARCH)
+ GOARCH ?= $(NATIVE_GOARCH)
+ ifeq ($(call err_if_empty,GOOS),windows)
+ BINSFX := .exe