CVS commit: pkgsrc/mk

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Oct  8 20:35:00 UTC 2018

Modified Files:
        pkgsrc/mk: subst.mk
        pkgsrc/mk/misc: uac-manifest.mk

Log Message:
Fix whitespace issues reported by pkglint


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/mk/subst.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mk/misc/uac-manifest.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/subst.mk
diff -u pkgsrc/mk/subst.mk:1.56 pkgsrc/mk/subst.mk:1.57
--- pkgsrc/mk/subst.mk:1.56     Tue Jan  2 21:18:48 2018
+++ pkgsrc/mk/subst.mk  Mon Oct  8 20:35:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: subst.mk,v 1.56 2018/01/02 21:18:48 rillig Exp $
+# $NetBSD: subst.mk,v 1.57 2018/10/08 20:35:00 rillig Exp $
 #
 # This Makefile fragment implements a general text replacement facility.
 # Package makefiles define a ``class'', for each of which a particular
@@ -82,7 +82,7 @@ SUBST_FILTER_CMD.${_class_}?= ${SED} ${S
 SUBST_VARS.${_class_}?=                # none
 SUBST_MESSAGE.${_class_}?=     Substituting "${_class_}" in ${SUBST_FILES.${_class_}}
 .  for v in ${SUBST_VARS.${_class_}}
-SUBST_FILTER_CMD.${_class_} += -e s,@${v}@,${${v}:S|\\|\\\\|gW:S|,|\\,|gW:S|&|\\\&|gW:Q},g
+SUBST_FILTER_CMD.${_class_}+=  -e s,@${v}@,${${v}:S|\\|\\\\|gW:S|,|\\,|gW:S|&|\\\&|gW:Q},g
 .  endfor
 .  if !empty(SUBST_SHOW_DIFF.${_class_}:Uno:M[Yy][Ee][Ss])
 _SUBST_KEEP.${_class_}?=       ${DIFF} -u "$$file" "$$tmpfile" || true

Index: pkgsrc/mk/misc/uac-manifest.mk
diff -u pkgsrc/mk/misc/uac-manifest.mk:1.2 pkgsrc/mk/misc/uac-manifest.mk:1.3
--- pkgsrc/mk/misc/uac-manifest.mk:1.2  Sat Aug 31 20:54:07 2013
+++ pkgsrc/mk/misc/uac-manifest.mk      Mon Oct  8 20:35:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: uac-manifest.mk,v 1.2 2013/08/31 20:54:07 rillig Exp $
+# $NetBSD: uac-manifest.mk,v 1.3 2018/10/08 20:35:00 rillig Exp $
 #
 # This file generates manifest files for Windows.
 #
@@ -21,7 +21,7 @@ GENERATE_PLIST+=      ${UAC_MANIFEST_GENERATE
 UAC_MANIFEST_GENERATE_PLIST= \
        ${ECHO} "@comment The following lines are automatically generated." && \
        ( cd ${DESTDIR}${PREFIX}; \
-         for file in  ${UAC_REQD_EXECS}; do \
+         for file in ${UAC_REQD_EXECS}; do \
              ${TEST} $${file} -ef $${file}.exe && file=$${file}.exe; \
              ${ECHO} $${file}.manifest; \
          done)
@@ -37,4 +37,4 @@ generate-uac-manifests:
        ${SED} -e s,@PKGNAME@,${PKGBASE}, -e s,@PROGNAME@,$${progname}, \
                ${PKGSRCDIR}/mk/misc/uac-manifest \
                > $${filename}.manifest
-.endfor
\ No newline at end of file
+.endfor