CVS commit: pkgsrc/mk/plist

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Oct 17 18:08:02 UTC 2022

Modified Files:
        pkgsrc/mk/plist: plist.mk

Log Message:
mk: Simplify nokeywords PLIST generation.

Previously there was a static list of commands to filter out, which was always
going to become out of date at some point, as it has since 2009 when @pkgdir
was introduced and those entries have leaked into nokeywords files ever since.

Simply remove any line starting with "@" instead.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 pkgsrc/mk/plist/plist.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/plist/plist.mk
diff -u pkgsrc/mk/plist/plist.mk:1.56 pkgsrc/mk/plist/plist.mk:1.57
--- pkgsrc/mk/plist/plist.mk:1.56       Tue Nov 30 09:39:50 2021
+++ pkgsrc/mk/plist/plist.mk    Mon Oct 17 18:08:02 2022
@@ -1,4 +1,4 @@
-# $NetBSD: plist.mk,v 1.56 2021/11/30 09:39:50 jperkin Exp $
+# $NetBSD: plist.mk,v 1.57 2022/10/17 18:08:02 jperkin Exp $
 #
 # This Makefile fragment handles the creation of PLISTs for use by
 # pkg_create(8).
@@ -86,7 +86,9 @@ PLIST_SRC?=           ${PLIST_SRC_DFLT}
 
 # This is the path to the generated PLIST file.
 PLIST=         ${WRKDIR}/.PLIST
-_PLIST_NOKEYWORDS=${PLIST}_nokeywords
+
+# The nokeywords PLIST file strips out any pkg_create(1) "@" commands.
+_PLIST_NOKEYWORDS=     ${PLIST}_nokeywords
 
 ######################################################################
 
@@ -266,18 +268,9 @@ ${PLIST}:
        ${RUN} ${PKGSRC_SETENV} ${_PLIST_AWK_ENV} ${AWK} ${_PLIST_AWK} < ${.TARGET}-2mac > ${.TARGET}-3mag
        ${RUN} ${PKGSRC_SETENV} ${_PLIST_AWK_ENV} ${AWK} ${_PLIST_SHLIB_AWK} < ${.TARGET}-3mag > ${.TARGET}
 
-# for list of keywords see pkg_create(1)
 ${_PLIST_NOKEYWORDS}: ${PLIST}
-       ${RUN} ${AWK} < ${PLIST} > ${.TARGET} ' \
-               BEGIN {                                                 \
-                       FILTER="@(";                                    \
-                       FILTER=FILTER"cd|cwd|src|exec|unexec|mode|option";\
-                       FILTER=FILTER"|owner|group|comment|ignore";     \
-                       FILTER=FILTER"|ignore_inst|name|dirrm|mtree";   \
-                       FILTER=FILTER"|display|pkgdep|blddep|pkgcfl";   \
-                       FILTER=FILTER")[[:space:]]";                    \
-               };                                                      \
-               $$0 ~ FILTER { next };                                  \
+       ${RUN} ${AWK} < ${PLIST} > ${.TARGET} '                         \
+               $$0 ~ /^@/ { next };                                    \
                { print }'
 
 .if defined(INFO_FILES)