CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 11 16:12:49 UTC 2026

Modified Files:
        pkgsrc/mk/checksum: checksum.mk distinfo.awk
        pkgsrc/mk/patch: bsd.patch-vars.mk patch.mk

Log Message:
mk: remove support for patches/emul-*-patch-*

No files matching this pattern exist in pkgsrc, and its point is not
documented.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/mk/checksum/checksum.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mk/checksum/distinfo.awk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mk/patch/bsd.patch-vars.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/mk/patch/patch.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/checksum/checksum.mk
diff -u pkgsrc/mk/checksum/checksum.mk:1.33 pkgsrc/mk/checksum/checksum.mk:1.34
--- pkgsrc/mk/checksum/checksum.mk:1.33 Tue Oct 22 06:29:21 2024
+++ pkgsrc/mk/checksum/checksum.mk      Sun Jan 11 16:12:49 2026
@@ -1,4 +1,4 @@
-# $NetBSD: checksum.mk,v 1.33 2024/10/22 06:29:21 jperkin Exp $
+# $NetBSD: checksum.mk,v 1.34 2026/01/11 16:12:49 wiz Exp $
 #
 # See bsd.checksum.mk for helpful comments.
 #
@@ -97,7 +97,6 @@ _DISTINFO_ARGS_COMMON+=       ${_PATCH_DIGEST_
 .endif
 
 _DISTINFO_ARGS_PATCHSUM+=      ${PATCHDIR}/patch-*
-_DISTINFO_ARGS_PATCHSUM+=      ${PATCHDIR}/emul-*-patch-*
 
 distinfo:
 .  if ${USE_TMPFILES} == yes

Index: pkgsrc/mk/checksum/distinfo.awk
diff -u pkgsrc/mk/checksum/distinfo.awk:1.6 pkgsrc/mk/checksum/distinfo.awk:1.7
--- pkgsrc/mk/checksum/distinfo.awk:1.6 Mon May 13 08:08:15 2024
+++ pkgsrc/mk/checksum/distinfo.awk     Sun Jan 11 16:12:49 2026
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $NetBSD: distinfo.awk,v 1.6 2024/05/13 08:08:15 wiz Exp $
+# $NetBSD: distinfo.awk,v 1.7 2026/01/11 16:12:49 wiz Exp $
 #
 # Copyright (c) 2007 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -50,7 +50,7 @@
 #
 #      For example:
 #
-#      $NetBSD: distinfo.awk,v 1.6 2024/05/13 08:08:15 wiz Exp $
+#      $NetBSD: distinfo.awk,v 1.7 2026/01/11 16:12:49 wiz Exp $
 #
 #      SHA1 (make-3.81.tar.gz) = cd4fa5a3184176492bf0799593a8f250a728210c
 #      RMD160 (make-3.81.tar.gz) = a713a72875cb9a29568677c98022465c6f55cbbf
@@ -282,7 +282,7 @@ function header() {
 ###
 function is_patch(file) {
        if (file ~ /^patch-local-|[.]orig$|[.]rej$|~$/) return 0
-       if (file ~ /^patch-|^emul-.*-patch-/) return 1
+       if (file ~ /^patch-/) return 1
        return 0
 }
 

Index: pkgsrc/mk/patch/bsd.patch-vars.mk
diff -u pkgsrc/mk/patch/bsd.patch-vars.mk:1.12 pkgsrc/mk/patch/bsd.patch-vars.mk:1.13
--- pkgsrc/mk/patch/bsd.patch-vars.mk:1.12      Sat Apr 12 11:35:13 2025
+++ pkgsrc/mk/patch/bsd.patch-vars.mk   Sun Jan 11 16:12:49 2026
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.patch-vars.mk,v 1.12 2025/04/12 11:35:13 nia Exp $
+# $NetBSD: bsd.patch-vars.mk,v 1.13 2026/01/11 16:12:49 wiz Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -27,7 +27,7 @@
 
 PATCHFILES?=   # none
 
-pkgsrc_patches=        ${:!echo ${PATCHDIR}/patch-* ${PATCHDIR}/emul-*-patch-*!:N*\*}
+pkgsrc_patches=        ${:!echo ${PATCHDIR}/patch-*!:N*\*}
 .if !empty(LOCALPATCHES)
 local_patches= ${:!echo ${LOCALPATCHES}/${PKGPATH}/*!:N*/CVS:N*/\*}
 .endif

Index: pkgsrc/mk/patch/patch.mk
diff -u pkgsrc/mk/patch/patch.mk:1.19 pkgsrc/mk/patch/patch.mk:1.20
--- pkgsrc/mk/patch/patch.mk:1.19       Tue May  7 19:36:44 2019
+++ pkgsrc/mk/patch/patch.mk    Sun Jan 11 16:12:49 2026
@@ -1,4 +1,4 @@
-# $NetBSD: patch.mk,v 1.19 2019/05/07 19:36:44 rillig Exp $
+# $NetBSD: patch.mk,v 1.20 2026/01/11 16:12:49 wiz Exp $
 #
 # The following variables may be set in a package Makefile and control
 # how pkgsrc patches are applied.
@@ -262,9 +262,6 @@ do-distribution-patch:
 
 .if defined(PATCHDIR) && exists(${PATCHDIR})
 _PKGSRC_PATCHES+=      ${PATCHDIR}/patch-*
-.  if defined(EMUL_PLATFORM)
-_PKGSRC_PATCHES+=      ${PATCHDIR}/emul-${EMUL_PLATFORM}-patch-*
-.  endif
 .endif
 .if defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH})
 _PKGSRC_PATCHES+=      ${LOCALPATCHES}/${PKGPATH}/*
@@ -291,7 +288,7 @@ do-pkgsrc-patch:
                        ;;                                              \
                ${PATCHDIR}/patch-local-*)                              \
                        ;;                                              \
-               ${PATCHDIR}/patch-*|${PATCHDIR}/emul-*-patch-*)         \
+               ${PATCHDIR}/patch-*)            \
                        if ${TEST} ! -f ${DISTINFO_FILE:Q}; then        \
                                patch_warning "Ignoring patch file $$i: distinfo not found"; \
                                continue;                               \