CVS commit: pkgsrc/mk/pkgtasks

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Thu Aug 10 05:37:44 UTC 2017

Modified Files:
        pkgsrc/mk/pkgtasks: directories.mk files.mk permissions.mk

Log Message:
mk/pkgtasks: Make the assertion comments more obvious.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mk/pkgtasks/directories.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mk/pkgtasks/files.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mk/pkgtasks/permissions.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/pkgtasks/directories.mk
diff -u pkgsrc/mk/pkgtasks/directories.mk:1.2 pkgsrc/mk/pkgtasks/directories.mk:1.3
--- pkgsrc/mk/pkgtasks/directories.mk:1.2       Thu Aug 10 05:37:32 2017
+++ pkgsrc/mk/pkgtasks/directories.mk   Thu Aug 10 05:37:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: directories.mk,v 1.2 2017/08/10 05:37:32 jlam Exp $
+# $NetBSD: directories.mk,v 1.3 2017/08/10 05:37:44 jlam Exp $
 #
 # Copyright (c) 2017 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -95,8 +95,8 @@ _OWN_DIRS_PERMS=      ${OWN_DIRS_PERMS:S|^${P
 _REQD_DIRS=            ${REQD_DIRS:S|^${PREFIX}/||g}
 _REQD_DIRS_PERMS=      ${REQD_DIRS_PERMS:S|^${PREFIX}/||g}
 
-# Assert that the variables have the right number of words and
-# that no directory is listed in more than one variable.
+# ASSERT: The variables have the right number of words and that no
+#      directory is listed in more than one variable.
 #
 # _ALL_DIRS.directories
 #      List of directories named in MAKE_DIRS, OWN_DIRS, REQD_DIRS,

Index: pkgsrc/mk/pkgtasks/files.mk
diff -u pkgsrc/mk/pkgtasks/files.mk:1.5 pkgsrc/mk/pkgtasks/files.mk:1.6
--- pkgsrc/mk/pkgtasks/files.mk:1.5     Thu Aug 10 05:37:32 2017
+++ pkgsrc/mk/pkgtasks/files.mk Thu Aug 10 05:37:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.mk,v 1.5 2017/08/10 05:37:32 jlam Exp $
+# $NetBSD: files.mk,v 1.6 2017/08/10 05:37:44 jlam Exp $
 #
 # Copyright (c) 2017 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -107,8 +107,8 @@ _REQD_FILES_PERMS=  ${REQD_FILES_PERMS:S|
 __INIT_SCRIPTS=                ${_INIT_SCRIPTS:S|^${PREFIX}/||g}
 __INIT_SCRIPTS_PERMS=  ${_INIT_SCRIPTS_PERMS:S|^${PREFIX}/||g}
 
-# Assert that the variables have the right number of words and
-# that no target file is listed in more than one variable.
+# ASSERT: The variables have the right number of words and that
+#      no target file is listed in more than one variable.
 #
 _ALL_TARGET_FILES.files=       # empty
 .for _var_ in CONF_FILES REQD_FILES _INIT_SCRIPTS
@@ -158,9 +158,9 @@ MAKE_DIRS+=         ${PKG_SYSCONFDIR}
 _ALL_DIRS.directories+=        ${PKG_SYSCONFDIR}
 .endif
 
-# Assert that the directories that contain target files are listed in
-# one of the directory variables.  This makes use of
-# ${_ALL_DIRS.directories}, which is defined in directories.mk.
+# ASSERT: The directories that contain target files are listed in
+#      one of the directory variables.  This makes use of
+#      ${_ALL_DIRS.directories}, which is defined in directories.mk.
 #
 .for t in ${_ALL_TARGET_FILES.files:O:u}
 _FILEMATCH.${t}=       ${_ALL_DIRS.directories:@d@${t:M${d}/*}@}

Index: pkgsrc/mk/pkgtasks/permissions.mk
diff -u pkgsrc/mk/pkgtasks/permissions.mk:1.1 pkgsrc/mk/pkgtasks/permissions.mk:1.2
--- pkgsrc/mk/pkgtasks/permissions.mk:1.1       Thu Jun  1 02:06:04 2017
+++ pkgsrc/mk/pkgtasks/permissions.mk   Thu Aug 10 05:37:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: permissions.mk,v 1.1 2017/06/01 02:06:04 jlam Exp $
+# $NetBSD: permissions.mk,v 1.2 2017/08/10 05:37:44 jlam Exp $
 #
 # Copyright (c) 2017 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -88,7 +88,7 @@ SETGID_GAMES_PERMS?=  ${GAMES_USER} ${GAM
 GAMEDATA_PERMS?=       ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
 GAMEDIR_PERMS?=                ${GAMES_USER} ${GAMES_GROUP} ${GAMEDIRMODE}
 
-# Assert that the variables have the right number of words.
+# ASSERT: The variables have the right number of words.
 .for _var_ in SPECIAL_PERMS
 .  if empty(${_var_}) || empty(${_var_}:C/.*/4/:M*:S/4 4 4 4//gW)
 # ${_var_} has a multiple of 4 words.