CVS commit: pkgsrc/mk

["Roy Marples" <roy%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   roy
Date:           Tue Jan 22 14:29:44 UTC 2019

Modified Files:
        pkgsrc/mk/install: replace.mk
        pkgsrc/mk/pkgformat/pkg: replace.mk

Log Message:
Call replace-names before SU

This allows the replace target to work with OBJ on NFS where root
isn't allowed.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mk/install/replace.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mk/pkgformat/pkg/replace.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/replace.mk
diff -u pkgsrc/mk/install/replace.mk:1.18 pkgsrc/mk/install/replace.mk:1.19
--- pkgsrc/mk/install/replace.mk:1.18   Sun Apr 10 15:58:02 2016
+++ pkgsrc/mk/install/replace.mk        Tue Jan 22 14:29:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.18 2016/04/10 15:58:02 joerg Exp $
+# $NetBSD: replace.mk,v 1.19 2019/01/22 14:29:44 roy Exp $
 #
 # Public targets:
 #
@@ -28,6 +28,7 @@ _REPLACE_TARGETS+=    stage-package-create
 _REPLACE_TARGETS+=     package
 .endif
 _REPLACE_TARGETS+=     replace-message
+_REPLACE_TARGETS+=     replace-names
 _REPLACE_TARGETS+=     unprivileged-install-hook
 
 #

Index: pkgsrc/mk/pkgformat/pkg/replace.mk
diff -u pkgsrc/mk/pkgformat/pkg/replace.mk:1.5 pkgsrc/mk/pkgformat/pkg/replace.mk:1.6
--- pkgsrc/mk/pkgformat/pkg/replace.mk:1.5      Sat Aug 19 00:30:19 2017
+++ pkgsrc/mk/pkgformat/pkg/replace.mk  Tue Jan 22 14:29:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.5 2017/08/19 00:30:19 jlam Exp $
+# $NetBSD: replace.mk,v 1.6 2019/01/22 14:29:44 roy Exp $
 #
 
 # _pkgformat-destdir-replace:
@@ -11,7 +11,6 @@
 # to installing the new package, should be one transaction.
 #
 _pkgformat-replace: \
-       replace-names \
        replace-tarup \
        replace-preserve-installed-info \
        replace-preserve-required-by \
@@ -24,7 +23,6 @@ _pkgformat-replace: \
 
 # tarup is omitted for DESTDIR, because the benefits are very small
 _pkgformat-destdir-replace: \
-       replace-names \
        replace-destdir \
        .PHONY