Fix whitespace issues reported by pkglint

mk/misc/uac-manifest.mk

@@ -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_PLIST}
 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
+.endfor

mk/subst.mk

@@ -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} ${SUBST_SED.${_class_}}
 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