CVS commit: pkgsrc/mk/patch

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Apr 12 11:35:13 UTC 2025

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

Log Message:
mk: Revert patch change. Unsuitable as long as pkgsrc uses CVS


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 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.11 pkgsrc/mk/patch/bsd.patch-vars.mk:1.12
--- pkgsrc/mk/patch/bsd.patch-vars.mk:1.11      Sat Apr 12 08:48:21 2025
+++ pkgsrc/mk/patch/bsd.patch-vars.mk   Sat Apr 12 11:35:13 2025
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.patch-vars.mk,v 1.11 2025/04/12 08:48:21 nia Exp $
+# $NetBSD: bsd.patch-vars.mk,v 1.12 2025/04/12 11:35:13 nia Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -27,11 +27,12 @@
 
 PATCHFILES?=   # none
 
+pkgsrc_patches=        ${:!echo ${PATCHDIR}/patch-* ${PATCHDIR}/emul-*-patch-*!:N*\*}
 .if !empty(LOCALPATCHES)
 local_patches= ${:!echo ${LOCALPATCHES}/${PKGPATH}/*!:N*/CVS:N*/\*}
 .endif
 
-.if !empty(PATCHFILES) || exists(${PATCHDIR}) || !empty(local_patches)
+.if !empty(PATCHFILES) || !empty(pkgsrc_patches) || !empty(local_patches)
 USE_TOOLS+=    patch
 .endif
 .if (!empty(PATCHFILES) || !empty(pkgsrc_patches)) \