 @@ -1,14 +1,14 @@
-# $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.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Johnny C. Lam.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -85,28 +85,28 @@ _PKGTASKS_DATAVARS.directories=		\
 .  if !empty(${_var_})
 USE_PKGTASKS=		yes
 .  endif
 .endfor
 # Strip leading "${PREFIX}/" from the directory pathnames.
 _MAKE_DIRS=		${MAKE_DIRS:S|^${PREFIX}/||g}
 _MAKE_DIRS_PERMS=	${MAKE_DIRS_PERMS:S|^${PREFIX}/||g}
 _OWN_DIRS=		${OWN_DIRS:S|^${PREFIX}/||g}
 _OWN_DIRS_PERMS=	${OWN_DIRS_PERMS:S|^${PREFIX}/||g}
 _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
+# ASSERT: The variables have the right number of words and that no
-# that no directory is listed in more than one variable.
+#	directory is listed in more than one variable.
+#
 # _ALL_DIRS.directories
 #	List of directories named in MAKE_DIRS, OWN_DIRS, REQD_DIRS,
 #	MAKE_DIRS_PERMS, OWN_DIRS_PERMS, and REQD_DIRS_PERMS.  This
 #	variable is used in pkgsrc/mk/pkgtasks/files.mk.
+#
 _ALL_DIRS.directories=	# empty
 .for _var_ in MAKE_DIRS OWN_DIRS REQD_DIRS
 .  for d in ${${_var_}}
 _DIRS.${d}+=		${_var_}
 _ALL_DIRS.directories+=	${d}
 .  endfor
 .endfor

 @@ -1,14 +1,14 @@
-# $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.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Johnny C. Lam.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -97,28 +97,28 @@ _PKGTASKS_DATAVARS.files+=		\
 .  if !empty(${_var_})
 USE_PKGTASKS=		yes
 .  endif
 .endfor
 # Strip leading "${PREFIX}/" from the file pathnames.
 _CONF_FILES=		${CONF_FILES:S|^${PREFIX}/||g}
 _CONF_FILES_PERMS=	${CONF_FILES_PERMS:S|^${PREFIX}/||g}
 _REQD_FILES=		${REQD_FILES:S|^${PREFIX}/||g}
 _REQD_FILES_PERMS=	${REQD_FILES_PERMS:S|^${PREFIX}/||g}
 __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
+# ASSERT: The variables have the right number of words and that
-# that no target file is listed in more than one variable.
+#	no target file is listed in more than one variable.
+#
 _ALL_TARGET_FILES.files=	# empty
 .for _var_ in CONF_FILES REQD_FILES _INIT_SCRIPTS
 .  if empty(${_var_}) || empty(${_var_}:C/.*/2/:M*:S/2 2//gW)
 # ${_var_} has a multiple of 2 words.
 .    for s t in ${${_var_}}
 _FILE_VARLIST.${t}+=		${_var_}
 _ALL_TARGET_FILES.files+=	${t}
 .    endfor
 .  else
 PKG_FAIL_REASON+=	${_var_:Q}" must have a multiple of 2 words."
 .  endif
 .endfor
 @@ -148,29 +148,29 @@ PKG_FAIL_REASON+=       ${t:Q}" is liste
 #	PKG_SYSCONFDIR_PERMS
 #	PKG_SYSCONFSUBDIR
+#
 .if defined(PKG_SYSCONFSUBDIR) && !empty(PKG_SYSCONFSUBDIR)
 # Always create ${PKG_SYSCONFDIR} if ${PKG_SYSCONFSUBDIR} is non-empty.
 MAKE_DIRS_PERMS+=	${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR_PERMS}
 _ALL_DIRS.directories+=	${PKG_SYSCONFDIR}
 .elif !empty(_ALL_TARGET_FILES.files:M${PKG_SYSCONFDIR}/*)
 # Create ${PKG_SYSCONFDIR} if any target files are in that directory.
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
 _ALL_DIRS.directories+=	${PKG_SYSCONFDIR}
 .endif
-# Assert that the directories that contain target files are listed in
+# ASSERT: The directories that contain target files are listed in
-# one of the directory variables.  This makes use of
+#	one of the directory variables.  This makes use of
-# ${_ALL_DIRS.directories}, which is defined in directories.mk.
+#	${_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}/*}@}
 .  if empty(_FILEMATCH.${t})
 PKG_FAIL_REASON+=	"This package may need MAKE_DIRS+="${t:C|/[^/]*$||:Q}
 .  endif
 .endfor
 _PKGTASKS_DATA.files=	${_PKGTASKS_DIR}/files
 _PKGTASKS_DATAFILES+=	${_PKGTASKS_DATA.files}
 ${_PKGTASKS_DATA.files}:
 	${RUN}${MKDIR} ${.TARGET:H:Q}

 @@ -1,14 +1,14 @@
-# $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.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Johnny C. Lam.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -78,27 +78,27 @@ _SPECIAL_PERMS=		${SPECIAL_PERMS:S|^${PR
+#
 #	REQD_DIRS_PERMS+=  /path/to/scoredir ${GAMEDIR_PERMS}
 #	REQD_FILES_PERMS+= /dev/null /path/to/scorefile ${GAMEDATA_PERMS}
+#
 # Keywords: setuid setgid st_mode perms
+#
 _SYS_VARS.pkgtasks+=	SETUID_ROOT_PERMS SETGID_GAMES_PERMS \
 			GAMEDATA_PERMS GAMEDIR_PERMS
 SETUID_ROOT_PERMS?=	${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4511
 SETGID_GAMES_PERMS?=	${GAMES_USER} ${GAMES_GROUP} ${GAMEMODE}
 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.
 .  else
 PKG_FAIL_REASON+=	${_var_:Q}" must have a multiple of 4 words."
 .  endif
 .endfor
 _PKGTASKS_DATA.permissions=	${_PKGTASKS_DIR}/permissions
 _PKGTASKS_DATAFILES+=		${_PKGTASKS_DATA.permissions}
 ${_PKGTASKS_DATA.permissions}:
 	${RUN}${MKDIR} ${.TARGET:H:Q}