CVS commit: pkgsrc

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Tue Mar 24 04:40:34 UTC 2020

Modified Files:
        pkgsrc/lang/python: application.mk
        pkgsrc/mk/configure: replace-interpreter.mk

Log Message:
replace-interpreter: make documentation more precise

There are several places in pkgsrc where the files to be patched are
listed individually instead of just saying util/*/*.sh. This is
unnecessarily detailed. Encourage package authors to use filename
patterns more often.

An example is REPLACE_PYTHON in lang/clang, which currently fails because
some of the listed files don't exist anymore.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/python/application.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mk/configure/replace-interpreter.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python/application.mk
diff -u pkgsrc/lang/python/application.mk:1.12 pkgsrc/lang/python/application.mk:1.13
--- pkgsrc/lang/python/application.mk:1.12      Mon Jul  3 18:13:43 2017
+++ pkgsrc/lang/python/application.mk   Tue Mar 24 04:40:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: application.mk,v 1.12 2017/07/03 18:13:43 joerg Exp $
+# $NetBSD: application.mk,v 1.13 2020/03/24 04:40:34 rillig Exp $
 #
 # Replace the #! interpreter for Python scripts.
 #
@@ -10,7 +10,8 @@
 # Package-settable variables:
 #
 # REPLACE_PYTHON
-#      A list of Python scripts to be installed, relative to ${WRKSRC}.
+#      A list of filename patterns for Python scripts to be installed,
+#      relative to ${WRKSRC}.
 #
 # Keywords: python
 #

Index: pkgsrc/mk/configure/replace-interpreter.mk
diff -u pkgsrc/mk/configure/replace-interpreter.mk:1.18 pkgsrc/mk/configure/replace-interpreter.mk:1.19
--- pkgsrc/mk/configure/replace-interpreter.mk:1.18     Sun Mar 22 21:31:21 2020
+++ pkgsrc/mk/configure/replace-interpreter.mk  Tue Mar 24 04:40:34 2020
@@ -1,4 +1,4 @@
-# $NetBSD: replace-interpreter.mk,v 1.18 2020/03/22 21:31:21 rillig Exp $
+# $NetBSD: replace-interpreter.mk,v 1.19 2020/03/24 04:40:34 rillig Exp $
 
 # This file provides common templates for replacing #! interpreters
 # in script files.
@@ -12,9 +12,9 @@
 # REPLACE_PERL
 # REPLACE_PERL6
 # REPLACE_SH
-#      Lists of files relative to WRKSRC in which the #! interpreter
-#      should be replaced by the pkgsrc one. If any directories
-#      appear in the lists, they are silenty skipped, assuming that
+#      Lists of filename patterns relative to WRKSRC in which the #!
+#      interpreter should be replaced by the pkgsrc one. Any directories
+#      that appear in the lists are silenty skipped, assuming that
 #      they result from shell globbing expressions.
 #
 #      Use REPLACE_SH for shell programs that don't need any