CVS commit: pkgsrc/mk

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun Apr 28 14:17:49 UTC 2024

Modified Files:
        pkgsrc/mk: haskell.mk
        pkgsrc/mk/haskell: disable-executables.awk

Log Message:
mk/haskell.mk: pkglint doesn't like ${FOO:ts\t}


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/mk/haskell.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mk/haskell/disable-executables.awk

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

Modified files:

Index: pkgsrc/mk/haskell.mk
diff -u pkgsrc/mk/haskell.mk:1.62 pkgsrc/mk/haskell.mk:1.63
--- pkgsrc/mk/haskell.mk:1.62   Sun Apr 28 14:13:48 2024
+++ pkgsrc/mk/haskell.mk        Sun Apr 28 14:17:49 2024
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.62 2024/04/28 14:13:48 pho Exp $
+# $NetBSD: haskell.mk,v 1.63 2024/04/28 14:17:49 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages. Package
 # configuration, building, installation, registration and unregistration
@@ -209,7 +209,7 @@ SUBST_FILES.exec?=  ${HASKELL_PKG_NAME:C/
 SUBST_MESSAGE.exec?=   Disabling executables: ${HASKELL_DISABLE_EXECUTABLES}
 SUBST_FILTER_CMD.exec= \
        ${AWK} -f "${.CURDIR}/../../mk/haskell/disable-executables.awk" \
-               -v exec="${HASKELL_DISABLE_EXECUTABLES:ts\t}"
+               -v exec=${HASKELL_DISABLE_EXECUTABLES:Q}
 .endif
 
 # Haskell packages don't use semvars but they use something similar to it,

Index: pkgsrc/mk/haskell/disable-executables.awk
diff -u pkgsrc/mk/haskell/disable-executables.awk:1.1 pkgsrc/mk/haskell/disable-executables.awk:1.2
--- pkgsrc/mk/haskell/disable-executables.awk:1.1       Sun Apr 28 14:13:48 2024
+++ pkgsrc/mk/haskell/disable-executables.awk   Sun Apr 28 14:17:49 2024
@@ -1,10 +1,10 @@
-# $NetBSD: disable-executables.awk,v 1.1 2024/04/28 14:13:48 pho Exp $
+# $NetBSD: disable-executables.awk,v 1.2 2024/04/28 14:17:49 pho Exp $
 #
-# Prevent executables specified with "exec=foo\tbar\t..." from being
-# built or installed.
+# Prevent executables specified with -v "exec=foo bar ..." from being built
+# or installed.
 #
 BEGIN {
-    split(exec, execv, /\t/);
+    split(exec, execv, /[[:space:]]+/);
 }
 
 {