 @@ -1,169 +1,169 @@
-# $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
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 # PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # Generate the data file for the directories package task.
 # MAKE_DIRS
 # OWN_DIRS
 # REQD_DIRS
 #	List of directories that should be created and destroyed when
 #	the package is installed and removed.
+#
 #	OWN_DIRS is for directories owned by the package and the user
 #	is prompted to remove the directory if it isn't empty.  The
 #	directories are created or removed only if PKG_CONFIG is "yes".
+#
 #	MAKE_DIRS is for directories used by the package and the user
 #	is never prompted to remove non-empty directories.  The
 #	directories are created or removed only if PKG_CONFIG is "yes".
+#
 #	REQD_DIRS is for directories used by the package that must
 #	always be created (PKG_CONFIG is ignored), and the user is
 #	never prompted to remove non-empty directories.  All
 #	directories listed in REQD_DIRS should be under ${PREFIX}.
 #	The use-case for REQD_DIRS is very specialized, and most
 #	packages should be using either OWN_DIRS or MAKE_DIRS instead.
+#
 #	If the directory pathname is a relative path, then it is taken
 #	to be relative to ${PREFIX}.
+#
 # MAKE_DIRS_PERMS
 # OWN_DIRS_PERMS
 # REQD_DIRS_PERMS
 #	List of sublists representing directories with ownership and
 #	explicit modes that should be created and destroyed when the
 #	package is installed and removed.  The sublists are of the
 #	form:
+#
 #		<directory> <owner> <group> <mode>
+#
 #	These variables have the same usage as the similarly-named
 #	variables that don't end in "_PERMS".
+#
 _PKG_VARS.pkgtasks+=	MAKE_DIRS MAKE_DIRS_PERMS \
 			OWN_DIRS OWN_DIRS_PERMS \
 			REQD_DIRS REQD_DIRS_PERMS
 MAKE_DIRS?=		# empty
 MAKE_DIRS_PERMS?=	# empty
 OWN_DIRS?=		# empty
 OWN_DIRS_PERMS?=	# empty
 REQD_DIRS?=		# empty
 REQD_DIRS_PERMS?=	# empty
 # Trigger pkgtasks dependency if needed.
 _PKGTASKS_DATAVARS.directories=		\
 	MAKE_DIRS MAKE_DIRS_PERMS	\
 	OWN_DIRS OWN_DIRS_PERMS		\
 	REQD_DIRS REQD_DIRS_PERMS
 .for _var_ in ${_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
 .for _var_ in MAKE_DIRS_PERMS OWN_DIRS_PERMS REQD_DIRS_PERMS
 .  if empty(${_var_}) || empty(${_var_}:C/.*/4/:M*:S/4 4 4 4//gW)
 # ${_var_} has a multiple of 4 words.
 .    for d o g m in ${${_var_}}
 _DIRS.${d}+=		${_var_}
 _ALL_DIRS.directories+=	${d}
 .    endfor
 .  else
 PKG_FAIL_REASON+=	${_var_:Q}" must have a multiple of 4 words."
 .  endif
 .endfor
 .for d in ${_ALL_DIRS.directories:O:u}
 .  if ${_DIRS.${d}:[#]} != 1
 PKG_FAIL_REASON+=	${d:Q}" is listed more than once: "${_DIRS.${d}:Q}
 .  endif
 .endfor
 _PKGTASKS_DATA.directories=	${_PKGTASKS_DIR}/directories
 _PKGTASKS_DATAFILES+=		${_PKGTASKS_DATA.directories}
 ${_PKGTASKS_DATA.directories}:
 	${RUN}${MKDIR} ${.TARGET:H:Q}
 	${RUN}exec > ${.TARGET:Q}.tmp
 	${RUN}set -- args ${_MAKE_DIRS}; shift;				\
 	while ${TEST} "$$#" -gt 0; do					\
 		dir="$$1"; shift;					\
 		${ECHO} "# DIR: $$dir m" >> ${.TARGET:Q}.tmp;		\
 	done
 	${RUN}set -- args ${_MAKE_DIRS_PERMS}; shift;			\
 	while ${TEST} "$$#" -gt 0; do					\
 		dir="$$1"; owner="$$2"; group="$$3"; mode="$$4"; shift 4; \
 		${ECHO} "# DIR: $$dir m $$mode $$owner $$group"		\
 			>> ${.TARGET:Q}.tmp;				\
 	done
 	${RUN}set -- args ${_OWN_DIRS}; shift;				\
 	while ${TEST} "$$#" -gt 0; do					\
 		dir="$$1"; shift;					\
 		${ECHO} "# DIR: $$dir mo" >> ${.TARGET:Q}.tmp;		\
 	done
 	${RUN}set -- args ${_OWN_DIRS_PERMS}; shift;			\
 	while ${TEST} "$$#" -gt 0; do					\
 		dir="$$1"; owner="$$2"; group="$$3"; mode="$$4"; shift 4; \
 		${ECHO} "# DIR: $$dir mo $$mode $$owner $$group"	\
 			>> ${.TARGET:Q}.tmp;				\
 	done
 	${RUN}set -- args ${_REQD_DIRS}; shift;				\
 	while ${TEST} "$$#" -gt 0; do					\
 		dir="$$1"; shift;					\
 		${ECHO} "# DIR: $$dir fm" >> ${.TARGET:Q}.tmp;		\
 	done
 	${RUN}set -- args ${_REQD_DIRS_PERMS}; shift;			\
 	while ${TEST} "$$#" -gt 0; do					\
 		dir="$$1"; owner="$$2"; group="$$3"; mode="$$4"; shift 4; \
 		${ECHO} "# DIR: $$dir fm $$mode $$owner $$group"	\
 			>> ${.TARGET:Q}.tmp;				\
 	done
 	${RUN}${MV} ${.TARGET:Q}.tmp ${.TARGET:Q}

 @@ -1,263 +1,263 @@
-# $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
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 # PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # Generate the data file for the files package task.
 ###
 # CONF_FILES
 # REQD_FILES
 # _INIT_SCRIPTS
 #	List of pairs of files that should be copied and removed when
 #	the package is installed and removed.  The pairs are of the
 #	form:
+#
 #		<source> <target>
+#
 #	During installation, if the target file does not exist, then the
 #	source file is copied into place.  During removal, if the target
 #	file does not differ from the source file, then the target file
 #	is also removed.
+#
 #	CONF_FILES triggers system changes only if PKG_CONFIG is "yes".
 #	REQD_FILES always trigger system changes (PKG_CONFIG is ignored).
 #	_INIT_SCRIPTS trigger system changes only if PKG_CONFIG and
 #	PKG_INIT_SCRIPTS are both "yes".
+#
 #	The use-case for REQD_FILES is very specialized, and most packages
 #	should be using CONF_FILES instead.
+#
 #	If the source and target pathnames are relative paths, then they
 #	are taken to be relative to ${PREFIX}.
+#
 # CONF_FILES_MODE
 # REQD_FILES_MODE
 # _INIT_SCRIPTS_MODE
 #	These are the file modes for the target files listed in CONF_FILES,
 #	REQD_FILES, and _INIT_SCRIPTS, respectively.
+#
 # CONF_FILES_PERMS
 # REQD_FILES_PERMS
 # _INIT_SCRIPTS_PERMS
 #	List of sublists representing files with ownership and explicit
 #	modes that should be copied and removed when the package is
 #	installed and removed.  The sublists are of the form:
+#
 #		<source> <target> <owner> <group> <mode>
+#
 #	These variables have the same usage as the similarly-named
 #	variables that don't end in "_PERMS".
+#
 # The _INIT_SCRIPTS* variables are a hook for bsd.init.mk into the config
 # file framework.  They should not be used by packages.
+#
 _PKG_VARS.pkgtasks+=	CONF_FILES CONF_FILES_MODE CONF_FILES_PERMS \
 			REQD_FILES REQD_FILES_MODE REQD_FILES_PERMS
 CONF_FILES?=		# empty
 CONF_FILES_MODE?=	0644
 CONF_FILES_PERMS?=	# empty
 REQD_FILES?=		# empty
 REQD_FILES_MODE?=	0644
 REQD_FILES_PERMS?=	# empty
 _INIT_SCRIPTS?=		# empty
 _INIT_SCRIPTS_MODE?=	0755
 _INIT_SCRIPTS_PERMS?=	# empty
 # Trigger pkgtasks dependency if needed.
 _PKGTASKS_DATAVARS.files+=		\
 	CONF_FILES CONF_FILES_PERMS	\
 	REQD_FILES REQD_FILES_PERMS	\
 	_INIT_SCRIPTS _INIT_SCRIPTS_PERMS
 .for _var_ in ${_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
 .for _var_ in CONF_FILES_PERMS REQD_FILES_PERMS _INIT_SCRIPT_PERMS
 .  if empty(${_var_}) || empty(${_var_}:C/.*/5/:M*:S/5 5 5 5 5//gW)
 # ${_var_} has a multiple of 5 words.
 .    for s t o g m in ${${_var_}}
 _FILE_VARLIST.${t}+=		${_var_}
 _ALL_TARGET_FILES.files+=	${t}
 .    endfor
 .  else
 PKG_FAIL_REASON+=	${_var_:Q}" must have a multiple of 5 words."
 .  endif
 .endfor
 .for t in ${_ALL_TARGET_FILES.files:O:u}
 .  if ${_FILE_VARLIST.${t}:[#]} != 1
 PKG_FAIL_REASON+=       ${t:Q}" is listed more than once: "${_FILE_VARLIST.${t}:Q}
 .  endif
 .endfor
 # Hook into directories.mk to create ${PKG_SYSCONFDIR} in the package
 # tasks.
+#
 # The following variables used are set within bsd.pkg.mk:
+#
 #	PKG_SYSCONFDIR
 #	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}
 	${RUN}exec > ${.TARGET:Q}.tmp
 	${RUN}set -- args ${_CONF_FILES}; shift;			\
 	while ${TEST} "$$#" -gt 0; do					\
 		egfile="$$1"; file="$$2"; shift 2;			\
 		${ECHO} "# FILE: $$file c $$egfile "${CONF_FILES_MODE:Q} \
 			>> ${.TARGET:Q}.tmp;				\
 	done
 	${RUN}set -- args ${_CONF_FILES_PERMS}; shift;			\
 	while ${TEST} "$$#" -gt 0; do					\
 		egfile="$$1"; file="$$2";				\
 		owner="$$3"; group="$$4"; mode="$$5"; shift 5;		\
 		${ECHO} "# FILE: $$file c $$egfile $$mode $$owner $$group" \
 			>> ${.TARGET:Q}.tmp;				\
 	done
 	${RUN}set -- args ${_REQD_FILES}; shift;			\
 	while ${TEST} "$$#" -gt 0; do					\
 		egfile="$$1"; file="$$2"; shift 2;			\
 		${ECHO} "# FILE: $$file cf $$egfile "${REQD_FILES_MODE:Q} \
 			>> ${.TARGET:Q}.tmp;				\
 	done
 	${RUN}set -- args ${_REQD_FILES_PERMS}; shift;			\
 	while ${TEST} "$$#" -gt 0; do					\
 		egfile="$$1"; file="$$2";				\
 		owner="$$3"; group="$$4"; mode="$$5"; shift 5;		\
 		${ECHO} "# FILE: $$file cf $$egfile $$mode $$owner $$group" \
 			>> ${.TARGET:Q}.tmp;				\
 	done
 	${RUN}set -- args ${__INIT_SCRIPTS}; shift;			\
 	while ${TEST} "$$#" -gt 0; do					\
 		egfile="$$1"; file="$$2"; shift 2;			\
 		${ECHO} "# FILE: $$file cr $$egfile "${_INIT_SCRIPTS_MODE:Q} \
 			>> ${.TARGET:Q}.tmp;				\
 	done
 	${RUN}set -- args ${__INIT_SCRIPTS_PERMS}; shift;		\
 	while ${TEST} "$$#" -gt 0; do					\
 		egfile="$$1"; file="$$2";				\
 		owner="$$3"; group="$$4"; mode="$$5"; shift 5;		\
 		${ECHO} "# FILE: $$file cr $$egfile $$mode $$owner $$group" \
 			>> ${.TARGET:Q}.tmp;				\
 	done
 	${RUN}${MV} ${.TARGET:Q}.tmp ${.TARGET:Q}
 privileged-install-hook: _pkgtasks-files-postinstall-check
 _pkgtasks-files-postinstall-check: .PHONY
 	${RUN}set -- args ${_CONF_FILES}; shift;			\
 	while ${TEST} "$$#" -gt 0; do					\
 		${TEST} "$$#" -gt 2 || break;				\
 		egfile=${DESTDIR:Q}${PREFIX:Q}"/$$1"; shift 2;		\
 		${TEST} -f "$$egfile" || ${TEST} -c "$$egfile" ||	\
 		${FAIL_MSG} "CONF_FILES $$egfile does not exist.";	\
 	done
 	${RUN}set -- args ${_CONF_FILES_PERMS}; shift;			\
 	while ${TEST} "$$#" -gt 0; do					\
 		${TEST} "$$#" -gt 5 || break;				\
 		egfile=${DESTDIR:Q}${PREFIX:Q}"/$$1"; shift 5;		\
 		${TEST} -f "$$egfile" || ${TEST} -c "$$egfile" ||	\
 		${FAIL_MSG} "CONF_FILES_PERMS $$egfile does not exist.";\
 	done
 	${RUN}set -- args ${_REQD_FILES}; shift;			\
 	while ${TEST} "$$#" -gt 0; do					\
 		${TEST} "$$#" -gt 2 || break;				\
 		egfile=${DESTDIR:Q}${PREFIX:Q}"/$$1"; shift 2;		\
 		${TEST} -f "$$egfile" || ${TEST} -c "$$egfile" ||	\
 		${FAIL_MSG} "REQD_FILES $$egfile does not exist.";	\
 	done
 	${RUN}set -- args ${_REQD_FILES_PERMS}; shift;			\
 	while ${TEST} "$$#" -gt 0; do					\
 		${TEST} "$$#" -gt 5 || break;				\
 		egfile=${DESTDIR:Q}${PREFIX:Q}"/$$1"; shift 5;		\
 		${TEST} -f "$$egfile" || ${TEST} -c "$$egfile" ||	\
 		${FAIL_MSG} "REQD_FILES_PERMS $$egfile does not exist.";\
 	done
 	${RUN}set -- args ${__INIT_SCRIPTS}; shift;			\
 	while ${TEST} "$$#" -gt 0; do					\
 		${TEST} "$$#" -gt 2 || break;				\
 		egfile=${DESTDIR:Q}${PREFIX:Q}"/$$1"; shift 2;		\
 		${TEST} -f "$$egfile" || ${TEST} -c "$$egfile" ||	\
 		${FAIL_MSG} "REQD_FILES $$egfile does not exist.";	\
 	done
 	${RUN}set -- args ${__INIT_SCRIPTS_PERMS}; shift;		\
 	while ${TEST} "$$#" -gt 0; do					\
 		${TEST} "$$#" -gt 5 || break;				\
 		egfile=${DESTDIR:Q}${PREFIX:Q}"/$$1"; shift 5;		\
 		${TEST} -f "$$egfile" || ${TEST} -c "$$egfile" ||	\
 		${FAIL_MSG} "REQD_FILES_PERMS $$egfile does not exist.";\
 	done

 @@ -1,112 +1,112 @@
-# $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
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 # PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # Generate the data file for the permissions package task.
 # SPECIAL_PERMS
 #	List of blocks of four words of the following form:
+#
 #		<file> <owner> <group> <mode>
+#
 #	The <file> (it may be a directory) is changed to be owned by
 #	<owner>:<group> with <mode> permissions.  If <file> is a
 #	relative path, then it is taken to be relative to ${PREFIX}.
+#
 #	SPECIAL_PERMS should be used primarily to change permissions of
 #	files or directories listed in the PLIST.  This may be used to
 #	ensure certain files are set-uid or to change the ownership of a
 #	directory.
+#
 _PKG_VARS.pkgtasks+=	SPECIAL_PERMS
 SPECIAL_PERMS?=		# empty
 # Trigger pkgtasks dependency if needed.
 _PKGTASKS_DATAVARS.permissions=	SPECIAL_PERMS
 .for _var_ in ${_PKGTASKS_DATAVARS.permissions}
 .  if !empty(${_var_})
 USE_PKGTASKS=		yes
 .  endif
 .endfor
 # Strip leading "${PREFIX}/" from pathnames.
 _SPECIAL_PERMS=		${SPECIAL_PERMS:S|^${PREFIX}/||g}
 # SETUID_ROOT_PERMS
 #	Convenience variable used to note an executable should be setuid
 #	root, and should be used as follows:
+#
 #	SPECIAL_PERMS+=	/path/to/suidroot ${SETUID_ROOT_PERMS}
+#
 # SETGID_GAMES_PERMS
 #	Convenience variable used to note an executable should be setgid
 #	games, and should be used as follows:
+#
 #	SPECIAL_PERMS+=	/path/to/sgidgame ${SETGID_GAMES_PERMS}
+#
 # GAMEDATA_PERMS
 # GAMEDIR_PERMS
 #	Convenience variables for files or directories that should be
 #	accessible by executables that are setgid games.  Since such
 #	files or directories should normally live under ${VARBASE},
 #	these definitions should be used roughly as follows:
+#
 #	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}
 	${RUN}exec > ${.TARGET}.tmp
 	${RUN}set -- args ${_SPECIAL_PERMS}; shift;			\
 	while ${TEST} "$$#" -gt 0; do					\
 		path="$$1"; owner="$$2"; group="$$3"; mode="$$4"; shift 4; \
 		${ECHO} "# PERMS: $$path $$mode $$owner $$group"	\
 			>> ${.TARGET}.tmp;				\
 	done
 	${RUN}${MV} ${.TARGET:Q}.tmp ${.TARGET:Q}