CVS commit: pkgsrc/mk

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jan  8 10:21:48 UTC 2025

Modified Files:
        pkgsrc/mk/install: bsd.install.mk
        pkgsrc/mk/pkgformat/pkg: package.mk

Log Message:
mk: Move _KEEP_BIN_PKGS logic to package-install.

Having it done at the install level meant that anything that called
bin-install would go directly to package-install, and end up overwriting
package files in PACKAGES even with PKGSRC_KEEP_BIN_PKGS=no.

Have been testing this locally for around 8 months with no issues.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mk/install/bsd.install.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/mk/pkgformat/pkg/package.mk

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

Modified files:

Index: pkgsrc/mk/install/bsd.install.mk
diff -u pkgsrc/mk/install/bsd.install.mk:1.18 pkgsrc/mk/install/bsd.install.mk:1.19
--- pkgsrc/mk/install/bsd.install.mk:1.18       Wed Nov 23 11:26:51 2022
+++ pkgsrc/mk/install/bsd.install.mk    Wed Jan  8 10:21:47 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.install.mk,v 1.18 2022/11/23 11:26:51 jperkin Exp $
+# $NetBSD: bsd.install.mk,v 1.19 2025/01/08 10:21:47 jperkin Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to installing packages.
@@ -18,15 +18,10 @@ _COOKIE.install=    ${WRKDIR}/.install_done
 ### install (PUBLIC)
 ######################################################################
 ### install is a public target to install the package by depending
-### on stage-package-install or package-install. The difference is
-### a package is created in the public PACKAGES directory.
+### on package-install.
 ###
 .PHONY: install
-.if ${_KEEP_BIN_PKGS} == "no"
-install: stage-package-install
-.else
 install: package-install
-.endif
 
 ######################################################################
 ### stage-install (PUBLIC)

Index: pkgsrc/mk/pkgformat/pkg/package.mk
diff -u pkgsrc/mk/pkgformat/pkg/package.mk:1.20 pkgsrc/mk/pkgformat/pkg/package.mk:1.21
--- pkgsrc/mk/pkgformat/pkg/package.mk:1.20     Fri Jan 26 03:24:58 2024
+++ pkgsrc/mk/pkgformat/pkg/package.mk  Wed Jan  8 10:21:47 2025
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.20 2024/01/26 03:24:58 riastradh Exp $
+# $NetBSD: package.mk,v 1.21 2025/01/08 10:21:47 jperkin Exp $
 
 .if defined(PKG_SUFX)
 WARNINGS+=             "PKG_SUFX is deprecated, please use PKG_COMPRESSION"
@@ -125,20 +125,18 @@ tarup-pkg:
 ### Otherwise it is identical to calling package.
 ###
 
-.PHONY: package-install real-package-install su-real-package-install
+.PHONY: package-install real-package-install
+.PHONY: stage-package-install su-real-package-install
 .if defined(_PKGSRC_BARRIER)
+.  if ${_KEEP_BIN_PKGS} == "no"
+package-install: stage-package-create real-package-install
+.  else
 package-install: package real-package-install
+.  endif
 .else
 package-install: barrier
 .endif
 
-.PHONY: stage-package-install
-.if defined(_PKGSRC_BARRIER)
-stage-package-install: stage-package-create real-package-install
-.else
-stage-package-install: barrier
-.endif
-
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 real-package-install: su-real-package-install
 .else