CVS commit: pkgsrc/mk/plist

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Wed Jun 10 16:06:09 UTC 2020

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

Log Message:
mk/plist: Add EARLY_PRINT_PLIST_AWK

EARLY_PRINT_PLIST_AWK is like PRINT_PLIST_AWK but operates before the
file/directory lists are sorted.

Discussed on tech-pkg@ mainly to address `print-PLIST' order problems for
Python 3 packages:

 <https://mail-index.NetBSD.org/tech-pkg/2020/05/27/msg023249.html>


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/mk/plist/plist.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/mk/plist/print-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.54 pkgsrc/mk/plist/plist.mk:1.55
--- pkgsrc/mk/plist/plist.mk:1.54       Mon Mar 30 22:54:24 2020
+++ pkgsrc/mk/plist/plist.mk    Wed Jun 10 16:06:09 2020
@@ -1,4 +1,4 @@
-# $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).
@@ -147,8 +147,9 @@ _PLIST_AWK_ENV+=    ${PLIST_AWK_ENV}
 # 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
-# needed when developing the package itself, for example after an update.
+# of actually installed files is covered by EARLY_PRINT_PLIST_AWK and
+# 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}                              \

Index: pkgsrc/mk/plist/print-plist.mk
diff -u pkgsrc/mk/plist/print-plist.mk:1.35 pkgsrc/mk/plist/print-plist.mk:1.36
--- pkgsrc/mk/plist/print-plist.mk:1.35 Sat Apr 18 10:54:21 2020
+++ pkgsrc/mk/plist/print-plist.mk      Wed Jun 10 16:06:09 2020
@@ -1,4 +1,4 @@
-# $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
@@ -94,6 +94,9 @@ print-PLIST:
        *)              genlinks=0 ;;                                   \
        esac;                                                           \
        ${_PRINT_PLIST_FILES_CMD}                                       \
+        | ${AWK} '                                                     \
+               ${EARLY_PRINT_PLIST_AWK}                                \
+               { print $$0; }'                                         \
         | ${_PRINT_PLIST_LIBTOOLIZE_FILTER}                            \
         | ${SORT}                                                      \
         | ${AWK} '                                                     \
@@ -124,6 +127,9 @@ print-PLIST:
                { print $$0; }'
        ${RUN}\
        for i in `${_PRINT_PLIST_DIRS_CMD}                              \
+                       | ${AWK} '                                      \
+                               ${EARLY_PRINT_PLIST_AWK}                \
+                               { print $$0; }'                         \
                        | ${SORT} -r                                    \
                        | ${AWK} '                                      \
                                /emul\/linux\/proc/ { next; }           \