summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2018-10-08 20:35:00 +0000
committerrillig <rillig@pkgsrc.org>2018-10-08 20:35:00 +0000
commit75906d5002e5db5815ae61d0f17f2904cbdd841a (patch)
tree10c986dbb32f18d219d9642ced00a84502d414ac /mk
parentf9c0482799054ebd8ce0eef9816e1293161bbf7d (diff)
downloadpkgsrc-75906d5002e5db5815ae61d0f17f2904cbdd841a.tar.gz
Fix whitespace issues reported by pkglint
Diffstat (limited to 'mk')
-rw-r--r--mk/misc/uac-manifest.mk6
-rw-r--r--mk/subst.mk4
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/misc/uac-manifest.mk b/mk/misc/uac-manifest.mk
index c5f12a2ef75..09d72df1d28 100644
--- a/mk/misc/uac-manifest.mk
+++ b/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 \ No newline at end of file
+.endfor
diff --git a/mk/subst.mk b/mk/subst.mk
index ba55964e44d..3d08f7f3d80 100644
--- a/mk/subst.mk
+++ b/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