 @@ -1,14 +1,14 @@
-# $NetBSD: plist.mk,v 1.54 2020/03/30 22:54:24 rillig Exp $
+# $NetBSD: plist.mk,v 1.55 2020/06/10 16:06:09 leot Exp $
+#
 # This Makefile fragment handles the creation of PLISTs for use by
 # pkg_create(8).
+#
 # The following variables affect the PLIST generation:
+#
 #    PLIST_TYPE specifies whether the generated PLIST is derived
 #	automatically from the installed files, or if the PLIST entries
 #	are listed in files.  Valid values are "dynamic" and "static",
 #	and the default value is "static".
+#
 #    PLIST_VARS is the list of names corresponding to automatic variables
 #	generated by plist.mk to simplify having conditionally-present
 @@ -137,28 +137,29 @@ _PLIST_AWK_ENV+=	TEST=${TOOLS_TEST:Q}
 _PLIST_AWK_ENV+=	${PLIST_AWK_ENV}
 # PLIST_SUBST contains package-settable VAR=value substitutions that are
 # used when generating the actual file list for the package from the
 # package's PLIST files, as listed in PLIST_SRC. These files may contain
 # placeholders of the form ${VAR}, which are then substituted by their
 # corresponding value from PLIST_SUBST.
+#
 # Example: PLIST_SUBST+= PKGNAME=${PKGNAME_NOREV} means that the package's
 # PLIST file may contain the placeholder ${PKGNAME}, which will be replaced
 # with the package version excluding the "nb13" extension.
+#
 # The other direction of generating the package's PLIST file from the list
-# of actually installed files is covered by PRINT_PLIST_AWK. This is only
+# of actually installed files is covered by EARLY_PRINT_PLIST_AWK and
-# needed when developing the package itself, for example after an update.
+# PRINT_PLIST_AWK. This is only needed when developing the package itself,
 # for example after an update.
+#
 PLIST_SUBST+=	OPSYS=${OPSYS:Q}					\
 		OS_VERSION=${OS_VERSION:Q}				\
 		MACHINE_ARCH=${MACHINE_ARCH:Q}				\
 		MACHINE_GNU_ARCH=${MACHINE_GNU_ARCH:Q}			\
 		MACHINE_GNU_PLATFORM=${MACHINE_GNU_PLATFORM:Q}		\
 		LN=${LN:Q}						\
 		LOWER_VENDOR=${LOWER_VENDOR:Q}				\
 		LOWER_OPSYS=${LOWER_OPSYS:Q}				\
 		LOWER_OS_VERSION=${LOWER_OS_VERSION:Q}			\
 		PKGBASE=${PKGBASE:Q}					\
 		PKGNAME=${PKGNAME_NOREV:Q}				\
 		PKGLOCALEDIR=${PKGLOCALEDIR:Q}				\

 @@ -1,14 +1,14 @@
-# $NetBSD: print-plist.mk,v 1.35 2020/04/18 10:54:21 rillig Exp $
+# $NetBSD: print-plist.mk,v 1.36 2020/06/10 16:06:09 leot Exp $
+#
 # Automatic PLIST generation
 #  - files & symlinks first
 #  - empty directories are handled properly
 #  - dirs from mtree files are excluded
 #  - substitute for platform or package specifics substrings
+#
 # Usage:
 #  - make install
 #  - make print-PLIST | brain >PLIST
+#
 # Keywords: plist print-plist
 @@ -84,26 +84,29 @@ _PRINT_PLIST_LIBTOOLIZE_FILTER?=	${CAT}
 .endif
 .PHONY: print-PLIST
 .if !target(print-PLIST)
 print-PLIST:
 	${RUN} ${ECHO} '@comment $$'NetBSD'$$'
 	${RUN} ${ALL_ENV};						\
 	shlib_type=${SHLIB_TYPE:Q};					\
 	case $$shlib_type in 						\
 	"a.out")	genlinks=1 ;;					\
 	*)		genlinks=0 ;;					\
 	esac;								\
 	${_PRINT_PLIST_FILES_CMD}					\
 	 | ${AWK} '							\
 		${EARLY_PRINT_PLIST_AWK}				\
 		{ print $$0; }'						\
 	 | ${_PRINT_PLIST_LIBTOOLIZE_FILTER}				\
 	 | ${SORT}							\
 	 | ${AWK} '							\
 		{ sub("${DESTDIR:S|+|\\\\+|g}${PREFIX}/\\./", ""); }	\
 		${_PRINT_PLIST_AWK_IGNORE} { next; } 			\
 		${PRINT_PLIST_AWK}					\
 		${_PRINT_PLIST_AWK_SUBST}				\
 		/^@/ { print $$0; next }				\
 		/.*\/lib[^\/]+\.so\.[0-9]+\.[0-9]+\.[0-9]+$$/ { 	\
 			print $$0;					\
 			sub("\\.[0-9]+$$", "");				\
 			if ('$$genlinks') print $$0;			\
 			sub("\\.[0-9]+$$", "");				\
 @@ -114,26 +117,29 @@ print-PLIST:
 		}							\
 		/.*\/lib[^\/]+\.so\.[0-9]+\.[0-9]+$$/ { 		\
 			print $$0;					\
 			sub("\\.[0-9]+$$", "");				\
 			if ('$$genlinks') print $$0;			\
 			sub("\\.[0-9]+$$", "");				\
 			if ('$$genlinks') print $$0;			\
 			next;						\
 		}							\
 		/^man\// { sub("\\.gz$$", ""); }			\
 		{ print $$0; }'
 	${RUN}\
 	for i in `${_PRINT_PLIST_DIRS_CMD}				\
 			| ${AWK} '					\
 				${EARLY_PRINT_PLIST_AWK}		\
 				{ print $$0; }'				\
 			| ${SORT} -r					\
 			| ${AWK} '					\
 				/emul\/linux\/proc/ { next; }		\
 				/${DESTDIR:S|/|\\/|g:S/+/\\\\+/g}${PREFIX:S|/|\\/|g}\/\.$$/ { next; }	\
 				/${PKG_DBDIR:S|/|\\/|g}\// { next; }	\
 				{ sub("${DESTDIR:S/+/\\\\\\+/g}${PREFIX}/\\\\./", ""); }	\
 				{ sub("^${PKGINFODIR}/", "info/"); }	\
 				{ sub("^${PKGMANDIR}/", "man/"); }	\
 				/^${PKG_DBDIR:S|^${PREFIX}/||:S|/|\\/|g}(\/|$$)/ { next; } \
 				/^${PKGINFODIR:S|/|\\/|g}$$/ { next; }	\
 				{ print $$0; }'` ;			\
 	do								\
 		if [ `${LS} -la ${DESTDIR}${PREFIX}/$$i | ${WC} -l` = 3 ]; then	\