CVS commit: pkgsrc/mk/patch

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jan 16 08:17:46 UTC 2026

Modified Files:
        pkgsrc/mk/patch: bsd.patch-vars.mk

Log Message:
mk: get rid of two more unconditional forks

Assume that CVS users know about 'update -d' by now and do not have
empty patches/ directories lying around. Worst case if they don't:
they end up with an unnecessary 'patch' tool dependency, which is
installed by default on NetBSD.

Assume that LOCALPATCHES users do not have empty directories lying
around.  Worst case: see above.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mk/patch/bsd.patch-vars.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/patch/bsd.patch-vars.mk
diff -u pkgsrc/mk/patch/bsd.patch-vars.mk:1.13 pkgsrc/mk/patch/bsd.patch-vars.mk:1.14
--- pkgsrc/mk/patch/bsd.patch-vars.mk:1.13      Sun Jan 11 16:12:49 2026
+++ pkgsrc/mk/patch/bsd.patch-vars.mk   Fri Jan 16 08:17:46 2026
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.patch-vars.mk,v 1.13 2026/01/11 16:12:49 wiz Exp $
+# $NetBSD: bsd.patch-vars.mk,v 1.14 2026/01/16 08:17:46 wiz Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -27,16 +27,10 @@
 
 PATCHFILES?=   # none
 
-pkgsrc_patches=        ${:!echo ${PATCHDIR}/patch-*!:N*\*}
-.if !empty(LOCALPATCHES)
-local_patches= ${:!echo ${LOCALPATCHES}/${PKGPATH}/*!:N*/CVS:N*/\*}
-.endif
-
-.if !empty(PATCHFILES) || !empty(pkgsrc_patches) || !empty(local_patches)
+.if !empty(PATCHFILES) || exists(${PATCHDIR}) || exists(${LOCALPATCHES}/${PKGPATH})
 USE_TOOLS+=    patch
 .endif
-.if (!empty(PATCHFILES) || !empty(pkgsrc_patches)) \
-  && empty(TOOLS_PLATFORM.mktool)
+.if (!empty(PATCHFILES) || exists(${PATCHDIR})) && empty(TOOLS_PLATFORM.mktool)
 USE_TOOLS+=    digest:bootstrap
 .endif