Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1657133638172140"
MIME-Version: 1.0
Date: Wed, 6 Jul 2022 18:53:58 +0000
From: "Roland Illig" <rillig@netbsd.org>
Subject: CVS commit: pkgsrc/mk/install
To: pkgsrc-changes@NetBSD.org
Reply-To: rillig@netbsd.org
Message-Id: <20220706185358.B421DFB1A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1657133638172140
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rillig
Date:		Wed Jul  6 18:53:58 UTC 2022

Modified Files:
	pkgsrc/mk/install: bin-install.mk bsd.install-vars.mk install.mk

Log Message:
mk/install: fix indentation and alignment, no functional change


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mk/install/bin-install.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mk/install/bsd.install-vars.mk
cvs rdiff -u -r1.80 -r1.81 pkgsrc/mk/install/install.mk

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


--_----------=_1657133638172140
Content-Disposition: inline
Content-Length: 3510
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mk/install/bin-install.mk
diff -u pkgsrc/mk/install/bin-install.mk:1.29 pkgsrc/mk/install/bin-install.mk:1.30
--- pkgsrc/mk/install/bin-install.mk:1.29	Mon Sep  2 02:23:03 2019
+++ pkgsrc/mk/install/bin-install.mk	Wed Jul  6 18:53:58 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bin-install.mk,v 1.29 2019/09/02 02:23:03 rillig Exp $
+# $NetBSD: bin-install.mk,v 1.30 2022/07/06 18:53:58 rillig Exp $
 #
 
 # This file provides the following targets:
@@ -55,11 +55,11 @@ bin-install: \
 	do-bin-install \
 	do-bin-install-from-source
 
-.  if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 do-bin-install: su-do-bin-install
-.  else
+.else
 do-bin-install: su-target
-.  endif
+.endif
 	@${PHASE_MSG} "Binary install for "${PKGNAME_REQD:Q}
 
 su-do-bin-install: \

Index: pkgsrc/mk/install/bsd.install-vars.mk
diff -u pkgsrc/mk/install/bsd.install-vars.mk:1.10 pkgsrc/mk/install/bsd.install-vars.mk:1.11
--- pkgsrc/mk/install/bsd.install-vars.mk:1.10	Wed Jul  8 12:37:13 2020
+++ pkgsrc/mk/install/bsd.install-vars.mk	Wed Jul  6 18:53:58 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.install-vars.mk,v 1.10 2020/07/08 12:37:13 jperkin Exp $
+# $NetBSD: bsd.install-vars.mk,v 1.11 2022/07/06 18:53:58 rillig Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -36,9 +36,9 @@
 #
 .if !defined(_MANCOMPRESSED)
 .  if defined(MANCOMPRESSED) && !empty(MANCOMPRESSED:M[yY][eE][sS])
-_MANCOMPRESSED=		yes
+_MANCOMPRESSED=	yes
 .  else
-_MANCOMPRESSED=		no
+_MANCOMPRESSED=	no
 .  endif
 .  if defined(MANCOMPRESSED_IF_MANZ) && defined(PKGMAKECONF)
 _MANCOMPRESSED!=							\

Index: pkgsrc/mk/install/install.mk
diff -u pkgsrc/mk/install/install.mk:1.80 pkgsrc/mk/install/install.mk:1.81
--- pkgsrc/mk/install/install.mk:1.80	Sat Aug 14 08:38:01 2021
+++ pkgsrc/mk/install/install.mk	Wed Jul  6 18:53:58 2022
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.80 2021/08/14 08:38:01 rillig Exp $
+# $NetBSD: install.mk,v 1.81 2022/07/06 18:53:58 rillig Exp $
 #
 # This file provides the code for the "install" phase.
 #
@@ -201,11 +201,11 @@ _INSTALL_ALL_TARGETS+=		privileged-insta
 _INSTALL_ALL_TARGETS+=		error-check
 
 .PHONY: install-all su-install-all
-.  if !empty(_MAKE_INSTALL_AS_ROOT:M[Yy][Ee][Ss])
+.if !empty(_MAKE_INSTALL_AS_ROOT:M[Yy][Ee][Ss])
 install-all: su-target
-.  else
+.else
 install-all: su-install-all
-.  endif
+.endif
 su-install-all: ${_INSTALL_ALL_TARGETS}
 
 ######################################################################
@@ -218,8 +218,8 @@ su-install-all: ${_INSTALL_ALL_TARGETS}
 install-check-umask:
 	${RUN}								\
 	umask=`${SH} -c umask`;						\
-	if [ "$$umask" -ne ${DEF_UMASK} ]; then			\
-		${WARNING_MSG} "Your umask is \`\`$$umask''.";	\
+	if [ "$$umask" -ne ${DEF_UMASK} ]; then				\
+		${WARNING_MSG} "Your umask is \`\`$$umask''.";		\
 		${WARNING_MSG} "If this is not desired, set it to an appropriate value (${DEF_UMASK}) and install"; \
 		${WARNING_MSG} "this package again by \`\`${MAKE} deinstall reinstall''."; \
         fi
@@ -235,7 +235,8 @@ install-check-umask:
 # A shell command that creates the directory ${DESTDIR}${PREFIX}/$$dir
 # with appropriate permissions and ownership.
 #
-_INSTALL_ONE_DIR_CMD= { \
+_INSTALL_ONE_DIR_CMD= \
+	{								\
 	ddir="${DESTDIR}${PREFIX}/$$dir";				\
 	[ ! -f "$$ddir" ] || ${FAIL_MSG} "[install.mk] $$ddir should be a directory, but is a file."; \
 	case "$$dir" in							\


--_----------=_1657133638172140--