CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Tue Jan  2 21:18:48 UTC 2018

Modified Files:
        pkgsrc/mk: subst.mk

Log Message:
Allow package developers to easily see and check the SUBST changes.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/mk/subst.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/subst.mk
diff -u pkgsrc/mk/subst.mk:1.55 pkgsrc/mk/subst.mk:1.56
--- pkgsrc/mk/subst.mk:1.55     Sun Jan 31 17:27:41 2016
+++ pkgsrc/mk/subst.mk  Tue Jan  2 21:18:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: subst.mk,v 1.55 2016/01/31 17:27:41 rillig Exp $
+# $NetBSD: subst.mk,v 1.56 2018/01/02 21:18:48 rillig Exp $
 #
 # This Makefile fragment implements a general text replacement facility.
 # Package makefiles define a ``class'', for each of which a particular
@@ -45,6 +45,10 @@
 #      before any substitutions are done to it. Since that test is not
 #      perfect, it can be disabled by setting this variable to "yes".
 #
+# SUBST_SHOW_DIFF.<class>
+#      During development of a package, this can be set to "yes" to see
+#      the actual changes as a unified diff.
+#
 # See also:
 #      PLIST_SUBST
 #
@@ -80,6 +84,9 @@ SUBST_MESSAGE.${_class_}?=    Substituting 
 .  for v in ${SUBST_VARS.${_class_}}
 SUBST_FILTER_CMD.${_class_} += -e s,@${v}@,${${v}:S|\\|\\\\|gW:S|,|\\,|gW:S|&|\\\&|gW:Q},g
 .  endfor
+.  if !empty(SUBST_SHOW_DIFF.${_class_}:Uno:M[Yy][Ee][Ss])
+_SUBST_KEEP.${_class_}?=       ${DIFF} -u "$$file" "$$tmpfile" || true
+.  endif
 _SUBST_KEEP.${_class_}?=       ${DO_NADA}
 SUBST_SKIP_TEXT_CHECK.${_class_}?=     no