CVS commit: pkgsrc

"Thomas Klausner" <[email protected]> Mon, 3 Aug 2026 13:12:35 +0000
Newsgroups gmane.os.netbsd.devel.pkgsrc.cvs
Message-ID <[email protected]> 
This is a multi-part message in MIME format.

--_----------=_1785762755120090
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Mon Aug  3 13:12:34 UTC 2026

Modified Files:
	pkgsrc/audio/bmp: Makefile
	pkgsrc/audio/cddbd: Makefile
	pkgsrc/audio/xmcd: Makefile
	pkgsrc/audio/xmix: Makefile
	pkgsrc/benchmarks/hbench: Makefile
	pkgsrc/chat/ii: options.mk
	pkgsrc/comms/synce-rra: Makefile
	pkgsrc/comms/xtel: Makefile
	pkgsrc/converters/ja-dvi2tty: Makefile
	pkgsrc/converters/smbchartool: Makefile
	pkgsrc/cross/freemint-binutils: Makefile
	pkgsrc/cross/freemint-gcc: Makefile
	pkgsrc/cross/freemint-mintlib: Makefile
	pkgsrc/cross/freemint-pml: Makefile
	pkgsrc/cross/xtensa-lx106-elf-gcc: Makefile
	pkgsrc/databases/java-db3: Makefile
	pkgsrc/devel/SDL_Pango: Makefile
	pkgsrc/devel/py-hg-evolve: Makefile
	pkgsrc/devel/syncdir: Makefile
	pkgsrc/devel/tvision: Makefile
	pkgsrc/doc/guide/files: components.xml
	pkgsrc/editors/beav: Makefile
	pkgsrc/editors/emacs20: Makefile
	pkgsrc/editors/ng: Makefile
	pkgsrc/editors/nvi-m17n: Makefile
	pkgsrc/emulators/xnp2: Makefile
	pkgsrc/games/craft: Makefile
	pkgsrc/games/finalbattle: Makefile
	pkgsrc/games/fkiss: Makefile
	pkgsrc/games/netris: Makefile
	pkgsrc/games/nighthawk: Makefile
	pkgsrc/games/xemeraldia: Makefile
	pkgsrc/graphics/cpia2view: Makefile
	pkgsrc/graphics/p5-GD-SecurityImage: Makefile
	pkgsrc/graphics/pixmap: Makefile
	pkgsrc/graphics/png: options.mk
	pkgsrc/graphics/urt: Makefile
	pkgsrc/graphics/xv: Makefile
	pkgsrc/inputmethod/kinput2: Makefile
	pkgsrc/lang/gcc12: Makefile.common
	pkgsrc/lang/gcc13: Makefile.common
	pkgsrc/lang/gcc15: Makefile.common
	pkgsrc/lang/gcc2: Makefile
	pkgsrc/lang/go123: Makefile
	pkgsrc/lang/go125: Makefile
	pkgsrc/lang/gpc: Makefile
	pkgsrc/lang/ja-gawk: Makefile
	pkgsrc/lang/php56: options.mk
	pkgsrc/lang/pict: Makefile
	pkgsrc/mail/alpine: Makefile
	pkgsrc/mail/cucipop: Makefile
	pkgsrc/mail/distribute: Makefile
	pkgsrc/mail/ja-mh: Makefile
	pkgsrc/mail/mess822: Makefile
	pkgsrc/mail/poppassd: Makefile
	pkgsrc/mail/pymsgauth: Makefile
	pkgsrc/mail/qmail: Makefile options.mk
	pkgsrc/mail/qmail-acceptutils: Makefile
	pkgsrc/mail/qmail-rejectutils: Makefile
	pkgsrc/mail/qpopper: Makefile
	pkgsrc/mail/queue-repair: Makefile
	pkgsrc/mbone/vic: Makefile
	pkgsrc/mbone/vic-devel: Makefile
	pkgsrc/misc/ja-less: Makefile
	pkgsrc/misc/xjdic: options.mk
	pkgsrc/mk/patch: patch.mk
	pkgsrc/net/nbtscan: Makefile
	pkgsrc/net/omniNotify: Makefile
	pkgsrc/net/proftpd: Makefile.common
	pkgsrc/net/tinyfugue: Makefile
	pkgsrc/net/traceroute-nanog: Makefile
	pkgsrc/net/ucspi-tcp: Makefile
	pkgsrc/net/vnc: Makefile
	pkgsrc/security/mhash: Makefile
	pkgsrc/security/openssh: options.mk
	pkgsrc/security/pks: Makefile
	pkgsrc/shells/bash: Makefile
	pkgsrc/shells/bash2: Makefile
	pkgsrc/sysutils/daemontools: options.mk
	pkgsrc/sysutils/fsviewer: Makefile
	pkgsrc/sysutils/xdu: Makefile
	pkgsrc/sysutils/xfm: Makefile
	pkgsrc/textproc/WordNet: Makefile
	pkgsrc/textproc/ja-grep: Makefile
	pkgsrc/textproc/ja-groff: Makefile
	pkgsrc/textproc/ja-sed: Makefile
	pkgsrc/textproc/p5-XML-Bare: Makefile
	pkgsrc/textproc/rtf-tools: Makefile
	pkgsrc/textproc/unroff: Makefile
	pkgsrc/www/ap2-limitipconn: Makefile
	pkgsrc/www/squid4: Makefile
	pkgsrc/www/squidGuard: Makefile
	pkgsrc/x11/blt: Makefile
	pkgsrc/x11/kterm: Makefile
	pkgsrc/x11/mrxvt: Makefile
	pkgsrc/x11/oneko: Makefile
	pkgsrc/x11/xdm3d: Makefile
	pkgsrc/x11/xmx: Makefile

Log Message:
mk: switch the default for PATCH_DIST_STRIP from -p0 to -p1

adapt packages that didn't set PATCH_DIST_STRIP to use -p0, and
remove the -p1 lines


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 pkgsrc/audio/bmp/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/audio/cddbd/Makefile
cvs rdiff -u -r1.84 -r1.85 pkgsrc/audio/xmcd/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/audio/xmix/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/benchmarks/hbench/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/ii/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/comms/synce-rra/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/comms/xtel/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/converters/ja-dvi2tty/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/converters/smbchartool/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/cross/freemint-binutils/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/cross/freemint-gcc/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/cross/freemint-mintlib/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/cross/freemint-pml/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/cross/xtensa-lx106-elf-gcc/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/databases/java-db3/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/devel/SDL_Pango/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/py-hg-evolve/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/syncdir/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/tvision/Makefile
cvs rdiff -u -r1.68 -r1.69 pkgsrc/doc/guide/files/components.xml
cvs rdiff -u -r1.17 -r1.18 pkgsrc/editors/beav/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/editors/emacs20/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/editors/ng/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/editors/nvi-m17n/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/emulators/xnp2/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/games/craft/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/games/finalbattle/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/games/fkiss/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/games/netris/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/games/nighthawk/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/games/xemeraldia/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/graphics/cpia2view/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/p5-GD-SecurityImage/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/graphics/pixmap/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/png/options.mk
cvs rdiff -u -r1.71 -r1.72 pkgsrc/graphics/urt/Makefile
cvs rdiff -u -r1.108 -r1.109 pkgsrc/graphics/xv/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/inputmethod/kinput2/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/lang/gcc12/Makefile.common
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/gcc13/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/gcc15/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/gcc2/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/go123/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/go125/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/lang/gpc/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/ja-gawk/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php56/options.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/pict/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/mail/alpine/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/mail/cucipop/Makefile
cvs rdiff -u -r1.40 -r1.41 pkgsrc/mail/distribute/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mail/ja-mh/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/mail/mess822/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mail/poppassd/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mail/pymsgauth/Makefile
cvs rdiff -u -r1.130 -r1.131 pkgsrc/mail/qmail/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/mail/qmail/options.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mail/qmail-acceptutils/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/qmail-rejectutils/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/mail/qpopper/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/mail/queue-repair/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/mbone/vic/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/mbone/vic-devel/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/misc/ja-less/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/xjdic/options.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/mk/patch/patch.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/nbtscan/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/omniNotify/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/proftpd/Makefile.common
cvs rdiff -u -r1.40 -r1.41 pkgsrc/net/tinyfugue/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/traceroute-nanog/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/net/ucspi-tcp/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/net/vnc/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/security/mhash/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/security/openssh/options.mk
cvs rdiff -u -r1.36 -r1.37 pkgsrc/security/pks/Makefile
cvs rdiff -u -r1.126 -r1.127 pkgsrc/shells/bash/Makefile
cvs rdiff -u -r1.94 -r1.95 pkgsrc/shells/bash2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/daemontools/options.mk
cvs rdiff -u -r1.65 -r1.66 pkgsrc/sysutils/fsviewer/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/sysutils/xdu/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/sysutils/xfm/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/textproc/WordNet/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/ja-grep/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/textproc/ja-groff/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/ja-sed/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/textproc/p5-XML-Bare/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/textproc/rtf-tools/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/textproc/unroff/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/ap2-limitipconn/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/www/squid4/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/www/squidGuard/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/x11/blt/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/x11/kterm/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/x11/mrxvt/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/oneko/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/xdm3d/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/xmx/Makefile

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


--_----------=_1785762755120090
Content-Disposition: inline
Content-Length: 69975
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/audio/bmp/Makefile
diff -u pkgsrc/audio/bmp/Makefile:1.110 pkgsrc/audio/bmp/Makefile:1.111
--- pkgsrc/audio/bmp/Makefile:1.110	Tue Jan 27 08:38:55 2026
+++ pkgsrc/audio/bmp/Makefile	Mon Aug  3 13:12:22 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2026/01/27 08:38:55 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2026/08/03 13:12:22 wiz Exp $
 #
 
 DISTNAME=	bmp-0.9.7.1
@@ -14,7 +14,6 @@ LICENSE=	gnu-gpl-v2
 FILESDIR=		${.CURDIR}/../../audio/xmms/files
 PATCH_SITES=		http://izb.knu.ac.kr/~bh/diffs/
 PATCHFILES=		bmp-0.9.7-ipv6-simple.diff
-PATCH_DIST_STRIP=	-p1
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes

Index: pkgsrc/audio/cddbd/Makefile
diff -u pkgsrc/audio/cddbd/Makefile:1.19 pkgsrc/audio/cddbd/Makefile:1.20
--- pkgsrc/audio/cddbd/Makefile:1.19	Thu Nov 27 09:03:20 2025
+++ pkgsrc/audio/cddbd/Makefile	Mon Aug  3 13:12:22 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2025/11/27 09:03:20 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2026/08/03 13:12:22 wiz Exp $
 
 DISTNAME=	cddbd-1.3.1
 PKGNAME=	cddbd-1.3.1p1
@@ -8,6 +8,7 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB:=ap
 
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	cddbd-1.3.1.patch1.gz
+PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://sourceforge.net/projects/freedb/

Index: pkgsrc/audio/xmcd/Makefile
diff -u pkgsrc/audio/xmcd/Makefile:1.84 pkgsrc/audio/xmcd/Makefile:1.85
--- pkgsrc/audio/xmcd/Makefile:1.84	Fri Feb 20 12:14:33 2026
+++ pkgsrc/audio/xmcd/Makefile	Mon Aug  3 13:12:23 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2026/02/20 12:14:33 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2026/08/03 13:12:23 wiz Exp $
 
 DISTNAME=	xmcd-3.0.2
 PKGREVISION=	15
@@ -7,7 +7,6 @@ MASTER_SITES=	http://www.ibiblio.org/tka
 
 PATCH_SITES=		${HOMEPAGE}
 PATCHFILES=		xmcd-3.0.2-proxyauth-patch
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	http://www.tikan.org/xmcd/

Index: pkgsrc/audio/xmix/Makefile
diff -u pkgsrc/audio/xmix/Makefile:1.30 pkgsrc/audio/xmix/Makefile:1.31
--- pkgsrc/audio/xmix/Makefile:1.30	Mon Apr 21 16:21:41 2025
+++ pkgsrc/audio/xmix/Makefile	Mon Aug  3 13:12:23 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2025/04/21 16:21:41 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2026/08/03 13:12:23 wiz Exp $
 
 DISTNAME=		xmix-2.1
 PKGREVISION=		4
@@ -7,6 +7,7 @@ MASTER_SITES=		${MASTER_SITE_SUNSITE:=ap
 
 PATCH_SITES=		${MASTER_SITES}
 PATCHFILES=		xmix-2.1.mixers.patch
+PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=		[email protected]
 COMMENT=		Mixer for X Window System

Index: pkgsrc/benchmarks/hbench/Makefile
diff -u pkgsrc/benchmarks/hbench/Makefile:1.65 pkgsrc/benchmarks/hbench/Makefile:1.66
--- pkgsrc/benchmarks/hbench/Makefile:1.65	Mon Jan 27 20:47:19 2025
+++ pkgsrc/benchmarks/hbench/Makefile	Mon Aug  3 13:12:23 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2025/01/27 20:47:19 rillig Exp $
+# $NetBSD: Makefile,v 1.66 2026/08/03 13:12:23 wiz Exp $
 
 DISTNAME=		hbench-OS-1.1
 PKGNAME=		hbench-1.1
@@ -8,7 +8,6 @@ CATEGORIES=		benchmarks
 
 PATCH_SITES=		http://www.eecs.harvard.edu/~dholland/netbsd/
 PATCHFILES=		hbench-OS-1.1-provisional-patch1.diff
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		[email protected]
 #HOMEPAGE=		http://www.eecs.harvard.edu/vino/perf/hbench/

Index: pkgsrc/chat/ii/options.mk
diff -u pkgsrc/chat/ii/options.mk:1.1 pkgsrc/chat/ii/options.mk:1.2
--- pkgsrc/chat/ii/options.mk:1.1	Tue Sep  2 20:24:02 2025
+++ pkgsrc/chat/ii/options.mk	Mon Aug  3 13:12:23 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2025/09/02 20:24:02 vins Exp $
+# $NetBSD: options.mk,v 1.2 2026/08/03 13:12:23 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ii
 PKG_SUPPORTED_OPTIONS=	tls
@@ -9,6 +9,5 @@ PKG_SUGGESTED_OPTIONS=	tls
 .if !empty(PKG_OPTIONS:Mtls)
 PATCH_SITES=            ${HOMEPAGE}/patches/tls/
 PATCHFILES+=            ${DISTNAME}-tls.diff
-PATCH_DIST_STRIP=	-p1
 .  include "../../security/libretls/buildlink3.mk"
 .endif

Index: pkgsrc/comms/synce-rra/Makefile
diff -u pkgsrc/comms/synce-rra/Makefile:1.12 pkgsrc/comms/synce-rra/Makefile:1.13
--- pkgsrc/comms/synce-rra/Makefile:1.12	Mon Nov 17 11:00:28 2025
+++ pkgsrc/comms/synce-rra/Makefile	Mon Aug  3 13:12:23 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2025/11/17 11:00:28 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.13 2026/08/03 13:12:23 wiz Exp $
 
 DISTNAME=		synce-rra-0.9.1
 PKGREVISION=		2
@@ -8,6 +7,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE
 
 PATCHFILES=		rra-fixes-after-V0_9_1.diff
 PATCH_SITES=		http://synce.sourceforge.net/tmp/
+PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=		[email protected]
 HOMEPAGE=		https://synce.sourceforge.net/

Index: pkgsrc/comms/xtel/Makefile
diff -u pkgsrc/comms/xtel/Makefile:1.35 pkgsrc/comms/xtel/Makefile:1.36
--- pkgsrc/comms/xtel/Makefile:1.35	Mon Apr 27 08:16:13 2026
+++ pkgsrc/comms/xtel/Makefile	Mon Aug  3 13:12:23 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2026/04/27 08:16:13 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2026/08/03 13:12:23 wiz Exp $
 
 DISTNAME=		xtel-3.3.0
 PKGREVISION=		15
@@ -7,7 +7,6 @@ MASTER_SITES=		http://pficheux.free.fr/x
 
 PATCH_SITES=		http://www.NetBSD.org/~dholland/patchkits/xtel/
 PATCHFILES=		xtel-jumbo-patch-20111008.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	http://pficheux.free.fr/xtel/

Index: pkgsrc/converters/ja-dvi2tty/Makefile
diff -u pkgsrc/converters/ja-dvi2tty/Makefile:1.15 pkgsrc/converters/ja-dvi2tty/Makefile:1.16
--- pkgsrc/converters/ja-dvi2tty/Makefile:1.15	Sun Nov  3 17:14:24 2019
+++ pkgsrc/converters/ja-dvi2tty/Makefile	Mon Aug  3 13:12:23 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/11/03 17:14:24 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2026/08/03 13:12:23 wiz Exp $
 
 DISTNAME=	dvi2tty5.0
 PKGNAME=	ja-dvi2tty-5.0
@@ -10,7 +10,6 @@ PATCH_SITES=		${MASTER_SITE_LOCAL}
 #PATCH_SITES=		ftp://ftp.web.ad.jp/pub/TeX/akiu/dviwares/dvi2tty/
 PATCHFILES=		dvi2tty-ascii-jtex-patch \
 			dvi2tty.c-patch
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 COMMENT=	Program for previewing DVI files (ASCII Japanese TeX)

Index: pkgsrc/converters/smbchartool/Makefile
diff -u pkgsrc/converters/smbchartool/Makefile:1.19 pkgsrc/converters/smbchartool/Makefile:1.20
--- pkgsrc/converters/smbchartool/Makefile:1.19	Tue Jun 28 11:31:13 2022
+++ pkgsrc/converters/smbchartool/Makefile	Mon Aug  3 13:12:23 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/06/28 11:31:13 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2026/08/03 13:12:23 wiz Exp $
 
 DISTNAME=	smbchartool-2.3a
 PKGREVISION=	13
@@ -8,7 +8,6 @@ DIST_SUBDIR=	smbchartool-2.3anb5
 
 PATCH_SITES=		http://www.miraclelinux.com/technet/samba30/download/
 PATCHFILES=		smbchartool-2.3a_3.0a.diff.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	http://www.miraclelinux.com/technet/samba30/migration.html

Index: pkgsrc/cross/freemint-binutils/Makefile
diff -u pkgsrc/cross/freemint-binutils/Makefile:1.6 pkgsrc/cross/freemint-binutils/Makefile:1.7
--- pkgsrc/cross/freemint-binutils/Makefile:1.6	Sun Apr 26 09:47:40 2020
+++ pkgsrc/cross/freemint-binutils/Makefile	Mon Aug  3 13:12:23 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/04/26 09:47:40 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2026/08/03 13:12:23 wiz Exp $
 
 DISTNAME=	binutils-2.24
 PKGNAME=	cross-freemint-${DISTNAME}
@@ -13,7 +13,6 @@ LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 AND g
 
 PATCH_SITES=		http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/
 PATCHFILES=		binutils-2.24-mint-20131217.patch.bz2
-PATCH_DIST_STRIP=	-p1
 
 FREEMINT_PREFIX=	${PREFIX}/cross-freemint
 

Index: pkgsrc/cross/freemint-gcc/Makefile
diff -u pkgsrc/cross/freemint-gcc/Makefile:1.8 pkgsrc/cross/freemint-gcc/Makefile:1.9
--- pkgsrc/cross/freemint-gcc/Makefile:1.8	Fri Jan 24 10:15:02 2025
+++ pkgsrc/cross/freemint-gcc/Makefile	Mon Aug  3 13:12:24 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2025/01/24 10:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2026/08/03 13:12:24 wiz Exp $
 
 DISTNAME=		gcc-4.6.4
 PKGNAME=		cross-freemint-${DISTNAME}
@@ -13,6 +13,7 @@ EXTRACT_SUFX=		.tar.bz2
 
 PATCH_SITES=	http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/
 PATCHFILES=	gcc-4.6.4-mint-20130415.patch.bz2
+PATCH_DIST_STRIP=	-p0
 
 WRKSRC=		${WRKDIR}
 

Index: pkgsrc/cross/freemint-mintlib/Makefile
diff -u pkgsrc/cross/freemint-mintlib/Makefile:1.13 pkgsrc/cross/freemint-mintlib/Makefile:1.14
--- pkgsrc/cross/freemint-mintlib/Makefile:1.13	Tue Jan 21 22:56:58 2025
+++ pkgsrc/cross/freemint-mintlib/Makefile	Mon Aug  3 13:12:24 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2025/01/21 22:56:58 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2026/08/03 13:12:24 wiz Exp $
 
 DISTNAME=		mintlib-CVS-20131219
 PKGNAME=		cross-freemint-${DISTNAME:S/CVS-//}
@@ -17,6 +17,7 @@ WRKSRC=		${WRKDIR}
 
 PATCH_SITES=	http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/
 PATCHFILES=	gcc-4.6.4-mint-20130415.patch.bz2
+PATCH_DIST_STRIP=	-p0
 
 # for http://gcc.gnu.org/bugzilla/attachment.cgi?id=15133 ,
 # use makeinfo from pkgsrc/devel/gtexinfo.

Index: pkgsrc/cross/freemint-pml/Makefile
diff -u pkgsrc/cross/freemint-pml/Makefile:1.5 pkgsrc/cross/freemint-pml/Makefile:1.6
--- pkgsrc/cross/freemint-pml/Makefile:1.5	Tue Jan 21 23:54:39 2025
+++ pkgsrc/cross/freemint-pml/Makefile	Mon Aug  3 13:12:24 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2025/01/21 23:54:39 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2026/08/03 13:12:24 wiz Exp $
 
 DISTNAME=		pml-2.03
 PKGNAME=		cross-freemint-${DISTNAME}
@@ -21,6 +21,7 @@ WRKSRC=		${WRKDIR}
 PATCH_SITES=	http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/
 PATCHFILES=	gcc-4.6.4-mint-20130415.patch.bz2
 PATCHFILES+=	pml-2.03-mint-20110207.patch.bz2
+PATCH_DIST_STRIP=	-p0
 
 # for http://gcc.gnu.org/bugzilla/attachment.cgi?id=15133 ,
 # use makeinfo from pkgsrc/devel/gtexinfo.

Index: pkgsrc/cross/xtensa-lx106-elf-gcc/Makefile
diff -u pkgsrc/cross/xtensa-lx106-elf-gcc/Makefile:1.7 pkgsrc/cross/xtensa-lx106-elf-gcc/Makefile:1.8
--- pkgsrc/cross/xtensa-lx106-elf-gcc/Makefile:1.7	Tue Jun 28 11:31:17 2022
+++ pkgsrc/cross/xtensa-lx106-elf-gcc/Makefile	Mon Aug  3 13:12:24 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/06/28 11:31:17 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2026/08/03 13:12:24 wiz Exp $
 
 # using configure options and sources from
 # https://github.com/earlephilhower/esp-quick-toolchain
@@ -41,7 +41,6 @@ PATCH_SITES+= https://raw.githubusercont
 
 PATCHFILES+= gcc-001-jump-tables-in-text-section-earlephilhower.patch
 PATCH_SITES+= https://github.com/earlephilhower/esp-quick-toolchain/raw/master/patches/
-PATCH_DIST_STRIP= -p1
 
 MAINTAINER=		[email protected]
 HOMEPAGE=		https://github.com/espressif/gcc

Index: pkgsrc/databases/java-db3/Makefile
diff -u pkgsrc/databases/java-db3/Makefile:1.34 pkgsrc/databases/java-db3/Makefile:1.35
--- pkgsrc/databases/java-db3/Makefile:1.34	Thu May  5 13:14:21 2022
+++ pkgsrc/databases/java-db3/Makefile	Mon Aug  3 13:12:24 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2022/05/05 13:14:21 nia Exp $
+# $NetBSD: Makefile,v 1.35 2026/08/03 13:12:24 wiz Exp $
 
 DISTNAME=	db-3.3.11
 PKGNAME=	java-db3-3.11.2
@@ -13,6 +13,7 @@ COMMENT=	Java interface to Sleepycat Sof
 PATCH_SITES=		${MASTER_SITES}
 PATCHFILES=		patch.3.3.11.1 patch.3.3.11.2
 PATCH_DIST_ARGS=	-d ${WRKSRC}/.. --forward --quiet
+PATCH_DIST_STRIP=	-p0
 
 DISTINFO_FILE?=		${.CURDIR}/../db3/distinfo
 PATCHDIR?=		${.CURDIR}/../db3/patches

Index: pkgsrc/devel/SDL_Pango/Makefile
diff -u pkgsrc/devel/SDL_Pango/Makefile:1.47 pkgsrc/devel/SDL_Pango/Makefile:1.48
--- pkgsrc/devel/SDL_Pango/Makefile:1.47	Tue Jan 27 08:39:09 2026
+++ pkgsrc/devel/SDL_Pango/Makefile	Mon Aug  3 13:12:24 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2026/01/27 08:39:09 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2026/08/03 13:12:24 wiz Exp $
 
 DISTNAME=	SDL_Pango-0.1.2
 PKGREVISION=	38
@@ -7,6 +7,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:
 
 PATCHFILES+=	SDL_Pango-0.1.2-API-adds.patch
 PATCH_SITES+=	http://zarb.org/~gc/t/
+PATCH_DIST_STRIP=       -p0
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://sdlpango.sourceforge.net/

Index: pkgsrc/devel/py-hg-evolve/Makefile
diff -u pkgsrc/devel/py-hg-evolve/Makefile:1.52 pkgsrc/devel/py-hg-evolve/Makefile:1.53
--- pkgsrc/devel/py-hg-evolve/Makefile:1.52	Fri Apr  3 17:34:18 2026
+++ pkgsrc/devel/py-hg-evolve/Makefile	Mon Aug  3 13:12:24 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2026/04/03 17:34:18 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2026/08/03 13:12:24 wiz Exp $
 #
 # Release notes:
 # https://lists.mercurial-scm.org/pipermail/mercurial/
@@ -17,7 +17,6 @@ PATCH_SITES=		https://foss.heptapod.net/
 PATCHFILES=		8ec80fb4b0ce4247b61051014a4fb891bf327a89.diff \
 			0144bd9214df0457a966177eb7217e2b2991965a.diff \
 			1c1cd671da5c3c547184b0b13dbb59b8c848d09c.diff
-PATCH_DIST_STRIP=	-p1
 
 TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools>=78:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-mercurial>=5.4nb1:../../devel/py-mercurial

Index: pkgsrc/devel/syncdir/Makefile
diff -u pkgsrc/devel/syncdir/Makefile:1.19 pkgsrc/devel/syncdir/Makefile:1.20
--- pkgsrc/devel/syncdir/Makefile:1.19	Tue Mar  1 17:49:46 2022
+++ pkgsrc/devel/syncdir/Makefile	Mon Aug  3 13:12:24 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/03/01 17:49:46 schmonz Exp $
+# $NetBSD: Makefile,v 1.20 2026/08/03 13:12:24 wiz Exp $
 #
 
 DISTNAME=		syncdir-1.1
@@ -20,6 +20,8 @@ DLSYM_PATCH=		syncdir-1.0-libtoolize-201
 PATCHFILES+=		${DLSYM_PATCH}
 SITES.${DLSYM_PATCH}=	https://schmonz.com/qmail/syncdirdlsym/
 
+PATCH_DIST_STRIP=	-p0
+
 INSTALLATION_DIRS=	lib
 
 SUBST_CLASSES+=		space

Index: pkgsrc/devel/tvision/Makefile
diff -u pkgsrc/devel/tvision/Makefile:1.27 pkgsrc/devel/tvision/Makefile:1.28
--- pkgsrc/devel/tvision/Makefile:1.27	Wed Aug  2 19:20:19 2023
+++ pkgsrc/devel/tvision/Makefile	Mon Aug  3 13:12:25 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2023/08/02 19:20:19 nia Exp $
-#
+# $NetBSD: Makefile,v 1.28 2026/08/03 13:12:25 wiz Exp $
 
 DISTNAME=		tvision-0.8
 PKGREVISION=		3
@@ -7,7 +6,6 @@ CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=devel/lang/c++/}
 
 PATCHFILES=		tvision-0.8-freebsd-patches-20040910.diff.bz2
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		[email protected]
 HOMEPAGE=		http://www.sigala.it/sergio/tvision/

Index: pkgsrc/doc/guide/files/components.xml
diff -u pkgsrc/doc/guide/files/components.xml:1.68 pkgsrc/doc/guide/files/components.xml:1.69
--- pkgsrc/doc/guide/files/components.xml:1.68	Fri Apr 10 08:41:35 2026
+++ pkgsrc/doc/guide/files/components.xml	Mon Aug  3 13:12:25 2026
@@ -1,4 +1,4 @@
-<!-- $NetBSD: components.xml,v 1.68 2026/04/10 08:41:35 wiz Exp $ -->
+<!-- $NetBSD: components.xml,v 1.69 2026/08/03 13:12:25 wiz Exp $ -->
 
 <chapter id="components"> <?dbhtml filename="components.html"?>
 <title>Package components - files, directories and contents</title>
@@ -91,7 +91,7 @@ converters    games         mbone       
     <listitem><para><varname>PATCH_DIST_STRIP</varname>:
     an argument to &man.patch.1; that sets the pathname strip count to
     help find the correct files to patch. It defaults to
-    <command>-p0</command>.</para>
+    <command>-p1</command>.</para>
     </listitem>
   </itemizedlist></para>
   <para>The third section contains the following variables.

Index: pkgsrc/editors/beav/Makefile
diff -u pkgsrc/editors/beav/Makefile:1.17 pkgsrc/editors/beav/Makefile:1.18
--- pkgsrc/editors/beav/Makefile:1.17	Sat Jun  8 10:40:53 2019
+++ pkgsrc/editors/beav/Makefile	Mon Aug  3 13:12:25 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/06/08 10:40:53 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2026/08/03 13:12:25 wiz Exp $
 
 DISTNAME=	beav_1.40.orig
 PKGNAME=	beav-1.40.18
@@ -8,7 +8,6 @@ MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool
 
 PATCHFILES=		beav_1.40-18.diff.gz
 PATCH_SITES=		${MASTER_SITE_DEBIAN:=pool/main/b/beav/}
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 COMMENT=	Binary Editor And Viewer, a full featured binary file editor

Index: pkgsrc/editors/emacs20/Makefile
diff -u pkgsrc/editors/emacs20/Makefile:1.66 pkgsrc/editors/emacs20/Makefile:1.67
--- pkgsrc/editors/emacs20/Makefile:1.66	Mon Sep 25 20:08:32 2023
+++ pkgsrc/editors/emacs20/Makefile	Mon Aug  3 13:12:25 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2023/09/25 20:08:32 gdt Exp $
+# $NetBSD: Makefile,v 1.67 2026/08/03 13:12:25 wiz Exp $
 
 DISTNAME=	emacs-20.7
 PKGNAME=	${DISTNAME:S/emacs/emacs20/}
@@ -24,8 +24,6 @@ PATCHFILES+=		emacs20-jumbo-patch-201707
 SITES.emacs20-jumbo-patch-20170723.gz= \
 			http://www.NetBSD.org/~dholland/patchkits/emacs20/
 
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://www.gnu.org/software/emacs/emacs.html
 COMMENT=	GNU editing macros (editor)

Index: pkgsrc/editors/ng/Makefile
diff -u pkgsrc/editors/ng/Makefile:1.28 pkgsrc/editors/ng/Makefile:1.29
--- pkgsrc/editors/ng/Makefile:1.28	Sat Jul  4 08:27:41 2026
+++ pkgsrc/editors/ng/Makefile	Mon Aug  3 13:12:25 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2026/07/04 08:27:41 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2026/08/03 13:12:25 wiz Exp $
 
 DISTNAME=	ng-1.4.4
 PKGREVISION=	1
@@ -7,6 +7,7 @@ MASTER_SITES=	http://tt.sakura.ne.jp/~am
 
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	ng-1.4.4-replace_bug.patch
+PATCH_DIST_STRIP=       -p0
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	http://tt.sakura.ne.jp/~amura/ng/

Index: pkgsrc/editors/nvi-m17n/Makefile
diff -u pkgsrc/editors/nvi-m17n/Makefile:1.63 pkgsrc/editors/nvi-m17n/Makefile:1.64
--- pkgsrc/editors/nvi-m17n/Makefile:1.63	Sat Jul  4 08:27:42 2026
+++ pkgsrc/editors/nvi-m17n/Makefile	Mon Aug  3 13:12:25 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2026/07/04 08:27:42 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2026/08/03 13:12:25 wiz Exp $
 
 DISTNAME=	nvi-1.79
 PKGNAME=	nvi-m17n-1.79.20040608
@@ -8,6 +8,7 @@ MASTER_SITES=	http://www.bostic.com/file
 
 #PATCH_SITES=	ftp://ftp.itojun.org/pub/nvi/
 PATCHFILES=	nvi-m17n-1.79-20040608.diff.gz
+PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=	[email protected]
 COMMENT=	Clone of vi/ex, with multilingual patch

Index: pkgsrc/emulators/xnp2/Makefile
diff -u pkgsrc/emulators/xnp2/Makefile:1.59 pkgsrc/emulators/xnp2/Makefile:1.60
--- pkgsrc/emulators/xnp2/Makefile:1.59	Mon Jul 13 04:35:41 2026
+++ pkgsrc/emulators/xnp2/Makefile	Mon Aug  3 13:12:25 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2026/07/13 04:35:41 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2026/08/03 13:12:25 wiz Exp $
 
 DISTNAME=		xnp2-0.86
 PKGREVISION=		35
@@ -9,6 +9,7 @@ EXTRACT_SUFX=		.tar.bz2
 PATCHFILES=		xnp2-r2805.patch
 PATCHFILES+=		xnp2-r2846.patch
 #PATCH_SITES=		https://www.nonakap.org/np2/
+PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=		[email protected]
 #HOMEPAGE=		https://www.nonakap.org/np2/

Index: pkgsrc/games/craft/Makefile
diff -u pkgsrc/games/craft/Makefile:1.35 pkgsrc/games/craft/Makefile:1.36
--- pkgsrc/games/craft/Makefile:1.35	Sun Nov 29 03:11:54 2020
+++ pkgsrc/games/craft/Makefile	Mon Aug  3 13:12:25 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2020/11/29 03:11:54 dholland Exp $
+# $NetBSD: Makefile,v 1.36 2026/08/03 13:12:25 wiz Exp $
 
 DISTNAME=	craftcc35
 PKGNAME=	craft-3.5
@@ -9,7 +9,6 @@ EXTRACT_SUFX=	.tar.Z
 
 PATCH_SITES=		http://www.NetBSD.org/~dholland/patchkits/craft/
 PATCHFILES=		craft-jumbo-patch-20140913.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 # Gone as of 20130120, no obvious replacement

Index: pkgsrc/games/finalbattle/Makefile
diff -u pkgsrc/games/finalbattle/Makefile:1.22 pkgsrc/games/finalbattle/Makefile:1.23
--- pkgsrc/games/finalbattle/Makefile:1.22	Wed Apr 21 15:44:25 2021
+++ pkgsrc/games/finalbattle/Makefile	Mon Aug  3 13:12:25 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/04/21 15:44:25 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2026/08/03 13:12:25 wiz Exp $
 
 DISTNAME=	finalbattle.0.0
 PKGNAME=	finalbattle-0.0
@@ -8,7 +8,6 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB:=ga
 
 PATCH_SITES=		http://www.NetBSD.org/~dholland/patchkits/finalbattle/
 PATCHFILES=		finalbattle-jumbo-patch-20161210.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 #HOMEPAGE=	http://web.archive.org/web/2/http://www.newbreedsoftware.com/finalbattle/

Index: pkgsrc/games/fkiss/Makefile
diff -u pkgsrc/games/fkiss/Makefile:1.30 pkgsrc/games/fkiss/Makefile:1.31
--- pkgsrc/games/fkiss/Makefile:1.30	Fri Dec 22 19:41:42 2023
+++ pkgsrc/games/fkiss/Makefile	Mon Aug  3 13:12:26 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2023/12/22 19:41:42 zafer Exp $
-#
+# $NetBSD: Makefile,v 1.31 2026/08/03 13:12:26 wiz Exp $
 
 DISTNAME=		fkiss-0.33
 PKGNAME=		fkiss-0.33a
@@ -13,7 +12,6 @@ COMMENT=		Kisekae viewer
 
 PATCH_SITES=		${MASTER_SITES}
 PATCHFILES=		fkiss-0.33a.diff
-PATCH_DIST_STRIP=	-p1
 
 DEPENDS+=		lha-[0-9]*:../../archivers/lha
 

Index: pkgsrc/games/netris/Makefile
diff -u pkgsrc/games/netris/Makefile:1.21 pkgsrc/games/netris/Makefile:1.22
--- pkgsrc/games/netris/Makefile:1.21	Wed Nov 15 22:15:16 2017
+++ pkgsrc/games/netris/Makefile	Mon Aug  3 13:12:26 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/11/15 22:15:16 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2026/08/03 13:12:26 wiz Exp $
 
 DISTNAME=		netris-0.52
 PKGREVISION=		4
@@ -8,7 +8,6 @@ CATEGORIES=		games
 PATCH_SITES=		ftp://ftp2.v6.linux.or.jp/pub/Linux/IPv6-2/netris/ \
 			http://ftp2.v6.linux.or.jp/pub/Linux/IPv6-2/netris/
 PATCHFILES=		netris-0.5-v6-19991206a.diff.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		[email protected]
 #HOMEPAGE=		https://www.netris.org/

Index: pkgsrc/games/nighthawk/Makefile
diff -u pkgsrc/games/nighthawk/Makefile:1.41 pkgsrc/games/nighthawk/Makefile:1.42
--- pkgsrc/games/nighthawk/Makefile:1.41	Sun Sep  3 08:36:54 2017
+++ pkgsrc/games/nighthawk/Makefile	Mon Aug  3 13:12:26 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2017/09/03 08:36:54 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.42 2026/08/03 13:12:26 wiz Exp $
 
 DISTNAME=		nighthawk-2.1
 PKGREVISION=		5
@@ -9,7 +8,6 @@ EXTRACT_SUFX=		.tgz
 
 PATCH_SITES=		${MASTER_SITES}
 PATCHFILES=		nighthawk-2.1a.patch
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		[email protected]
 #HOMEPAGE=		http://jsno.arafuraconnect.com.au/proj_linux/nighthawk.html

Index: pkgsrc/games/xemeraldia/Makefile
diff -u pkgsrc/games/xemeraldia/Makefile:1.22 pkgsrc/games/xemeraldia/Makefile:1.23
--- pkgsrc/games/xemeraldia/Makefile:1.22	Wed Apr 21 15:33:55 2021
+++ pkgsrc/games/xemeraldia/Makefile	Mon Aug  3 13:12:26 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/04/21 15:33:55 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2026/08/03 13:12:26 wiz Exp $
 
 DISTNAME=	xemeraldia-0.3
 PKGNAME=	xemeraldia-0.31
@@ -8,7 +8,6 @@ CATEGORIES=	games
 
 #PATCH_SITES=		ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1995/apr/
 PATCHFILES=		xemeraldia-0.3to0.31.patch.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 COMMENT=	Game of breaking blocks

Index: pkgsrc/graphics/cpia2view/Makefile
diff -u pkgsrc/graphics/cpia2view/Makefile:1.36 pkgsrc/graphics/cpia2view/Makefile:1.37
--- pkgsrc/graphics/cpia2view/Makefile:1.36	Mon Dec  1 09:15:49 2025
+++ pkgsrc/graphics/cpia2view/Makefile	Mon Aug  3 13:12:26 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2025/12/01 09:15:49 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2026/08/03 13:12:26 wiz Exp $
 
 DISTNAME=	cpia2_driver-1.0
 PKGNAME=	cpia2view-0.03
@@ -9,7 +9,6 @@ EXTRACT_SUFX=	.tgz
 
 PATCH_SITES=		http://home.384.jp/takam/bsd/
 PATCHFILES=		cpia2_driver-1.0-bsd-0.03.patch.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://sourceforge.net/projects/cpia2/

Index: pkgsrc/graphics/p5-GD-SecurityImage/Makefile
diff -u pkgsrc/graphics/p5-GD-SecurityImage/Makefile:1.27 pkgsrc/graphics/p5-GD-SecurityImage/Makefile:1.28
--- pkgsrc/graphics/p5-GD-SecurityImage/Makefile:1.27	Fri Jul 17 15:48:44 2026
+++ pkgsrc/graphics/p5-GD-SecurityImage/Makefile	Mon Aug  3 13:12:26 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2026/07/17 15:48:44 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2026/08/03 13:12:26 wiz Exp $
 
 DISTNAME=	GD-SecurityImage-1.75
 PKGNAME=	p5-${DISTNAME}
@@ -8,7 +8,6 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=G
 
 PATCHFILES+=		CVE-2026-13082-r1.patch
 PATCH_SITES+=		https://security.metacpan.org/patches/G/GD-SecurityImage/1.75/
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 COMMENT=	Perl5 security image (CAPTCHA) generator

Index: pkgsrc/graphics/pixmap/Makefile
diff -u pkgsrc/graphics/pixmap/Makefile:1.37 pkgsrc/graphics/pixmap/Makefile:1.38
--- pkgsrc/graphics/pixmap/Makefile:1.37	Wed Dec  4 10:40:37 2024
+++ pkgsrc/graphics/pixmap/Makefile	Mon Aug  3 13:12:26 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2024/12/04 10:40:37 nros Exp $
+# $NetBSD: Makefile,v 1.38 2026/08/03 13:12:26 wiz Exp $
 
 DISTNAME=		pixmap2.6
 PKGNAME=		pixmap-2.6.4
@@ -12,6 +12,7 @@ PATCHFILES=		pixmap_2.6.patch1.gz \
 			pixmap_2.6.patch2.gz \
 			pixmap_2.6.patch3.gz \
 			pixmap_2.6.patch4.gz
+PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=		[email protected]
 COMMENT=		Pixmap editor based on XPM library

Index: pkgsrc/graphics/png/options.mk
diff -u pkgsrc/graphics/png/options.mk:1.5 pkgsrc/graphics/png/options.mk:1.6
--- pkgsrc/graphics/png/options.mk:1.5	Sun May 17 13:45:31 2026
+++ pkgsrc/graphics/png/options.mk	Mon Aug  3 13:12:26 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2026/05/17 13:45:31 tnn Exp $
+# $NetBSD: options.mk,v 1.6 2026/08/03 13:12:26 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.png
 PKG_SUPPORTED_OPTIONS=	apng
@@ -11,5 +11,4 @@ APNGPATCHVERSION=		1.6.58
 APNGPATCH=			libpng-${APNGPATCHVERSION}-apng.patch.gz
 PATCHFILES+=			${APNGPATCH}
 SITES.${APNGPATCH}=		${MASTER_SITE_SOURCEFORGE:=libpng-apng/libpng16/${APNGPATCHVERSION}/}
-PATCH_DIST_STRIP.${APNGPATCH}=	-p1
 .endif

Index: pkgsrc/graphics/urt/Makefile
diff -u pkgsrc/graphics/urt/Makefile:1.71 pkgsrc/graphics/urt/Makefile:1.72
--- pkgsrc/graphics/urt/Makefile:1.71	Sun Feb 15 09:15:02 2026
+++ pkgsrc/graphics/urt/Makefile	Mon Aug  3 13:12:26 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2026/02/15 09:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2026/08/03 13:12:26 wiz Exp $
 
 DISTNAME=	urt
 PKGNAME=	urt-3.1b1
@@ -9,7 +9,6 @@ DISTFILES=	urt-3.1b.tar.Z urt-doc.tar.Z 
 
 PATCH_SITES=		http://www.funet.fi/pub/graphics/packages/urt/rel2/
 PATCHFILES=		urt-3.1b-3.1b1.patch
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 #HOMEPAGE=	https://www.cs.utah.edu/gdc/projects/urt/

Index: pkgsrc/graphics/xv/Makefile
diff -u pkgsrc/graphics/xv/Makefile:1.108 pkgsrc/graphics/xv/Makefile:1.109
--- pkgsrc/graphics/xv/Makefile:1.108	Fri Mar 27 18:13:03 2026
+++ pkgsrc/graphics/xv/Makefile	Mon Aug  3 13:12:27 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2026/03/27 18:13:03 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2026/08/03 13:12:27 wiz Exp $
 
 DISTNAME=	xv-3.10a
 PKGREVISION=	33
@@ -13,6 +13,7 @@ PATCH_DIST_STRIP.${JUMBO_PATCHES}=	-p1
 SITES.${JUMBO_PATCHES}=			${MASTER_SITE_SOURCEFORGE:=png-mng/}
 PATCHFILES+=				xv-3.10a-enhancements.20070520-20081216.diff
 PATCH_SITES=				http://www.gregroelofs.com/code/
+PATCH_DIST_STRIP=			-p0
 
 MAINTAINER=	[email protected]
 #HOMEPAGE=	http://www.trilon.com/xv/

Index: pkgsrc/inputmethod/kinput2/Makefile
diff -u pkgsrc/inputmethod/kinput2/Makefile:1.27 pkgsrc/inputmethod/kinput2/Makefile:1.28
--- pkgsrc/inputmethod/kinput2/Makefile:1.27	Sat Jul 25 12:57:02 2026
+++ pkgsrc/inputmethod/kinput2/Makefile	Mon Aug  3 13:12:27 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2026/07/25 12:57:02 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2026/08/03 13:12:27 wiz Exp $
 
 DISTNAME=	kinput2-v3.1
 PKGNAME=	kinput2-3.1
@@ -8,7 +8,6 @@ MASTER_SITES=	ftp://ftp.sra.co.jp/pub/x1
 
 PATCH_SITES=		http://canna.osdn.jp/canna37patches/
 PATCHFILES=		kinput2-v3.1-canna37.diff
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 COMMENT=	Input server of Japanese text

Index: pkgsrc/lang/gcc12/Makefile.common
diff -u pkgsrc/lang/gcc12/Makefile.common:1.15 pkgsrc/lang/gcc12/Makefile.common:1.16
--- pkgsrc/lang/gcc12/Makefile.common:1.15	Fri Feb 20 21:41:15 2026
+++ pkgsrc/lang/gcc12/Makefile.common	Mon Aug  3 13:12:27 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2026/02/20 21:41:15 triaxx Exp $
+# $NetBSD: Makefile.common,v 1.16 2026/08/03 13:12:27 wiz Exp $
 # used by lang/gcc12-libjit/Makefile
 
 GCC_PKGNAME=		gcc12
@@ -61,7 +61,6 @@ PATCHFILES=		gcc-12.5.0-1.diff
 PATCH_SITES=		https://ftp.NetBSD.org/pub/pkgsrc/misc/triaxx/
 #PATCH_SITES=		https://ftp.netbsd.org/pub/pkgsrc/misc/maya/
 #PATCH_SITES=		https://raw.githubusercontent.com/Homebrew/formula-patches/ca7047dad38f16fb02eb63bd4447e17d0b68b3bb/gcc/
-PATCH_DIST_STRIP=	-p1
 .endif
 
 ## For graphite support.

Index: pkgsrc/lang/gcc13/Makefile.common
diff -u pkgsrc/lang/gcc13/Makefile.common:1.11 pkgsrc/lang/gcc13/Makefile.common:1.12
--- pkgsrc/lang/gcc13/Makefile.common:1.11	Mon Apr 21 20:26:50 2025
+++ pkgsrc/lang/gcc13/Makefile.common	Mon Aug  3 13:12:27 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2025/04/21 20:26:50 wiz Exp $
+# $NetBSD: Makefile.common,v 1.12 2026/08/03 13:12:27 wiz Exp $
 # used by lang/gcc13-libjit/Makefile
 
 GCC_PKGNAME=		gcc13
@@ -59,7 +59,6 @@ BUILDLINK_TRANSFORM+=	rm:-nodefaultrpath
 CONFIGURE_ARGS+=	--disable-darwin-at-rpath
 PATCHFILES=		gcc-13.3.0.diff
 PATCH_SITES=		https://raw.githubusercontent.com/Homebrew/formula-patches/bda0fad/gcc/
-PATCH_DIST_STRIP=	-p1
 .endif
 
 ## For graphite support.

Index: pkgsrc/lang/gcc15/Makefile.common
diff -u pkgsrc/lang/gcc15/Makefile.common:1.3 pkgsrc/lang/gcc15/Makefile.common:1.4
--- pkgsrc/lang/gcc15/Makefile.common:1.3	Sun Jul 19 11:17:41 2026
+++ pkgsrc/lang/gcc15/Makefile.common	Mon Aug  3 13:12:27 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2026/07/19 11:17:41 adam Exp $
+# $NetBSD: Makefile.common,v 1.4 2026/08/03 13:12:27 wiz Exp $
 # used by lang/gcc15-libjit/Makefile
 
 GCC_PKGNAME=	gcc15
@@ -60,7 +60,6 @@ CONFIGURE_ARGS+=	--disable-darwin-at-rpa
 # This has to be done manually to avoid conflicts.
 #PATCHFILES=		gcc-15.3.0.diff
 #PATCH_SITES=		https://raw.githubusercontent.com/Homebrew/homebrew-core/6e8384b/Patches/gcc/
-#PATCH_DIST_STRIP=	-p1
 
 ## For graphite support.
 .if !empty(PKG_OPTIONS:Mgcc-graphite)

Index: pkgsrc/lang/gcc2/Makefile
diff -u pkgsrc/lang/gcc2/Makefile:1.4 pkgsrc/lang/gcc2/Makefile:1.5
--- pkgsrc/lang/gcc2/Makefile:1.4	Mon Apr 21 20:26:51 2025
+++ pkgsrc/lang/gcc2/Makefile	Mon Aug  3 13:12:27 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2025/04/21 20:26:51 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2026/08/03 13:12:27 wiz Exp $
 
 DISTNAME=		gcc-2.95.3
 PKGNAME=		${DISTNAME:S/gcc/gcc2/}
@@ -8,6 +8,7 @@ MASTER_SITES=		${MASTER_SITE_GNU:=gcc/}
 
 PATCH_SITES=		${MASTER_SITE_LOCAL}
 PATCHFILES=		gcc-2.95.3-diff-2002-08-29.gz
+PATCH_DIST_STRIP=	-p0
 
 #
 # Synced from patches against main source tree as of 2002-03-28

Index: pkgsrc/lang/go123/Makefile
diff -u pkgsrc/lang/go123/Makefile:1.9 pkgsrc/lang/go123/Makefile:1.10
--- pkgsrc/lang/go123/Makefile:1.9	Sat May 30 15:13:14 2026
+++ pkgsrc/lang/go123/Makefile	Mon Aug  3 13:12:27 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2026/05/30 15:13:14 gdt Exp $
+# $NetBSD: Makefile,v 1.10 2026/08/03 13:12:27 wiz Exp $
 
 .include "../../lang/go/version.mk"
 GO_BOOTSTRAP_REQD=	120
@@ -22,7 +22,6 @@ USE_TOOLS+=	bash perl pax
 # Patch to stop requiring /proc to be mounted on NetBSD
 PATCH_SITES=		https://github.com/golang/go/commit/
 PATCHFILES=		80344887818a2321296ce7fa71cca8ca2520611d.diff
-PATCH_DIST_STRIP=	-p1
 
 # cgo compiles under TMPDIR
 TMPDIR?=	/tmp

Index: pkgsrc/lang/go125/Makefile
diff -u pkgsrc/lang/go125/Makefile:1.5 pkgsrc/lang/go125/Makefile:1.6
--- pkgsrc/lang/go125/Makefile:1.5	Sat May 30 15:13:14 2026
+++ pkgsrc/lang/go125/Makefile	Mon Aug  3 13:12:27 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2026/05/30 15:13:14 gdt Exp $
+# $NetBSD: Makefile,v 1.6 2026/08/03 13:12:27 wiz Exp $
 
 .include "../../lang/go/version.mk"
 GO_BOOTSTRAP_REQD=	122
@@ -22,7 +22,6 @@ USE_TOOLS+=	bash perl pax
 # Patch to fix linker errors on i386
 PATCH_SITES=		https://github.com/golang/go/commit/
 PATCHFILES=		9ba0948172cbb05308fb2a9db823a720f8ffb9ad.patch
-PATCH_DIST_STRIP=	-p1
 
 # cgo compiles under TMPDIR
 TMPDIR?=	/tmp

Index: pkgsrc/lang/gpc/Makefile
diff -u pkgsrc/lang/gpc/Makefile:1.43 pkgsrc/lang/gpc/Makefile:1.44
--- pkgsrc/lang/gpc/Makefile:1.43	Mon Apr 21 20:27:29 2025
+++ pkgsrc/lang/gpc/Makefile	Mon Aug  3 13:12:28 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2025/04/21 20:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2026/08/03 13:12:28 wiz Exp $
 
 DISTNAME=		gpc-2.1
 PKGREVISION=		5
@@ -14,6 +14,7 @@ COMMENT=		GNU Pascal Compiler
 
 PATCH_SITES=		${MASTER_SITE_LOCAL}
 PATCHFILES=		gcc-2.95.3-diff-2002-08-29.gz
+PATCH_DIST_STRIP=	-p0
 
 NOT_FOR_PLATFORM+=	Darwin-*-* *-*-x86_64 *-*-aarch64
 

Index: pkgsrc/lang/ja-gawk/Makefile
diff -u pkgsrc/lang/ja-gawk/Makefile:1.13 pkgsrc/lang/ja-gawk/Makefile:1.14
--- pkgsrc/lang/ja-gawk/Makefile:1.13	Sat Jan 18 23:32:44 2020
+++ pkgsrc/lang/ja-gawk/Makefile	Mon Aug  3 13:12:28 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/01/18 23:32:44 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2026/08/03 13:12:28 wiz Exp $
 
 DISTNAME=	gawk-3.0.6
 PKGNAME=	ja-${DISTNAME}
@@ -7,7 +7,6 @@ MASTER_SITES=	${MASTER_SITE_GNU:=gawk/}
 
 PATCH_SITES=		http://www.hinadori.atnifty.com/~wills/program/
 PATCHFILES=		gawkmb115.diff.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://www.gnu.org/software/gawk/gawk.html

Index: pkgsrc/lang/php56/options.mk
diff -u pkgsrc/lang/php56/options.mk:1.3 pkgsrc/lang/php56/options.mk:1.4
--- pkgsrc/lang/php56/options.mk:1.3	Sat Feb  8 02:57:59 2025
+++ pkgsrc/lang/php56/options.mk	Mon Aug  3 13:12:28 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2025/02/08 02:57:59 taca Exp $
+# $NetBSD: options.mk,v 1.4 2026/08/03 13:12:28 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.php56
 PKG_SUPPORTED_OPTIONS+=	inet6 ssl maintainer-zts readline disable-filter-url php-embed
@@ -26,7 +26,6 @@ CONFIGURE_ARGS+=	--with-openssl=${BUILDL
 .  endif
 PATCH_SITES+=		http://zettasystem.com/
 PATCHFILES+=		PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch
-PATCH_DIST_STRIP=	-p1
 .else
 CONFIGURE_ARGS+=	--without-openssl
 .endif

Index: pkgsrc/lang/pict/Makefile
diff -u pkgsrc/lang/pict/Makefile:1.26 pkgsrc/lang/pict/Makefile:1.27
--- pkgsrc/lang/pict/Makefile:1.26	Sun Mar  1 12:38:35 2026
+++ pkgsrc/lang/pict/Makefile	Mon Aug  3 13:12:28 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2026/03/01 12:38:35 gdt Exp $
+# $NetBSD: Makefile,v 1.27 2026/08/03 13:12:28 wiz Exp $
 
 DISTNAME=	pict-4.1
 PKGREVISION=	20
@@ -7,7 +7,6 @@ MASTER_SITES=	http://www.cis.upenn.edu/~
 
 PATCH_SITES=		http://www.NetBSD.org/~dholland/patchkits/pict/
 PATCHFILES=		pict-jumbo-patch-20180316.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://www.cis.upenn.edu/~bcpierce/papers/pict/Html/Pict.html

Index: pkgsrc/mail/alpine/Makefile
diff -u pkgsrc/mail/alpine/Makefile:1.64 pkgsrc/mail/alpine/Makefile:1.65
--- pkgsrc/mail/alpine/Makefile:1.64	Sun Dec 14 11:50:30 2025
+++ pkgsrc/mail/alpine/Makefile	Mon Aug  3 13:12:28 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2025/12/14 11:50:30 vins Exp $
+# $NetBSD: Makefile,v 1.65 2026/08/03 13:12:28 wiz Exp $
 
 DISTNAME=	alpine-2.26
 PKGREVISION=	6
@@ -22,7 +22,6 @@ PATCHFILES+=		outgoing.patch.gz
 PATCHFILES+=		WrtAcc.patch.gz
 # Additional compose subcommands
 PATCHFILES+=		compose.patch.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://alpineapp.email/

Index: pkgsrc/mail/cucipop/Makefile
diff -u pkgsrc/mail/cucipop/Makefile:1.38 pkgsrc/mail/cucipop/Makefile:1.39
--- pkgsrc/mail/cucipop/Makefile:1.38	Sun Mar 30 21:10:45 2025
+++ pkgsrc/mail/cucipop/Makefile	Mon Aug  3 13:12:28 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2025/03/30 21:10:45 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2026/08/03 13:12:28 wiz Exp $
 
 DISTNAME=	cucipop-1.31
 PKGREVISION=	3
@@ -7,7 +7,6 @@ MASTER_SITES=	ftp://ftp.informatik.rwth-
 
 PATCH_SITES=		ftp://ftp.kame.net/pub/kame/misc/
 PATCHFILES=		cucipop-1.31-v6-20010223.diff.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 COMMENT=	The Cubic Circle POP3 mail server

Index: pkgsrc/mail/distribute/Makefile
diff -u pkgsrc/mail/distribute/Makefile:1.40 pkgsrc/mail/distribute/Makefile:1.41
--- pkgsrc/mail/distribute/Makefile:1.40	Tue Jun 28 11:34:20 2022
+++ pkgsrc/mail/distribute/Makefile	Mon Aug  3 13:12:28 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2022/06/28 11:34:20 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2026/08/03 13:12:28 wiz Exp $
 
 DISTNAME=	distribute-2.1-pl19
 PKGNAME=	distribute-2.1.26
@@ -24,7 +24,6 @@ USE_TOOLS+=	perl:run
 
 MAN1=			distribute.1
 DIST_SUBDIR=		distribute
-PATCH_DIST_STRIP=	-p1
 
 # customize below if you would like to
 # this needs to be the same as majordomo uses

Index: pkgsrc/mail/ja-mh/Makefile
diff -u pkgsrc/mail/ja-mh/Makefile:1.16 pkgsrc/mail/ja-mh/Makefile:1.17
--- pkgsrc/mail/ja-mh/Makefile:1.16	Sat Apr 24 08:31:29 2021
+++ pkgsrc/mail/ja-mh/Makefile	Mon Aug  3 13:12:28 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/04/24 08:31:29 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2026/08/03 13:12:28 wiz Exp $
 
 DISTNAME=	mh-6.8.4-JP-3.05
 PKGNAME=	ja-mh6-3.05
@@ -11,6 +11,7 @@ PATCHFILES=	mh-6.8.4-JP-3.05-20030114.pa
 		mh-6.8.4-JP-3.05-20030326.patch.gz \
 		mh-6.8.4-JP-3.05-20031023.patch.gz \
 		mh-6.8.4-JP-3.05-20031106.patch.gz
+PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	http://media.laic.u-hyogo.ac.jp/%7Ehayashi/internet/mh-plus.html

Index: pkgsrc/mail/mess822/Makefile
diff -u pkgsrc/mail/mess822/Makefile:1.38 pkgsrc/mail/mess822/Makefile:1.39
--- pkgsrc/mail/mess822/Makefile:1.38	Thu May 22 04:51:28 2025
+++ pkgsrc/mail/mess822/Makefile	Mon Aug  3 13:12:28 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2025/05/22 04:51:28 schmonz Exp $
+# $NetBSD: Makefile,v 1.39 2026/08/03 13:12:28 wiz Exp $
 
 DISTNAME=		mess822-0.58
 PKGREVISION=		8
@@ -25,6 +25,7 @@ SUBST_VARS.paths=	PKGMANDIR
 MESS822PATCHES=			qmailqueue:${QMAILQUEUE_PATCH}
 QMAILQUEUE_PATCH=		mess822-0.58-qmailqueue-20170527.patch
 PATCHFILES+=			${QMAILQUEUE_PATCH}
+PATCH_DIST_STRIP=		-p0
 SITES.${QMAILQUEUE_PATCH}=	https://schmonz.com/qmail/mess822qmailqueue/
 
 BUILD_DEFS+=		MESS822PATCHES

Index: pkgsrc/mail/poppassd/Makefile
diff -u pkgsrc/mail/poppassd/Makefile:1.30 pkgsrc/mail/poppassd/Makefile:1.31
--- pkgsrc/mail/poppassd/Makefile:1.30	Sat Nov  2 16:25:26 2019
+++ pkgsrc/mail/poppassd/Makefile	Mon Aug  3 13:12:29 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/11/02 16:25:26 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.31 2026/08/03 13:12:29 wiz Exp $
 
 DISTNAME=		qpopper${VERSION}
 PKGNAME=		poppassd-${VERSION}
@@ -8,7 +7,6 @@ MASTER_SITES=		${QPOPPER_MASTER_SITES}
 
 PATCH_SITES=		${QPOPPER_PATCHSITES}
 PATCHFILES=		${QPOPPER_PATCHFILES}
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		[email protected]
 HOMEPAGE=		${QPOPPER_HOMEPAGE}

Index: pkgsrc/mail/pymsgauth/Makefile
diff -u pkgsrc/mail/pymsgauth/Makefile:1.23 pkgsrc/mail/pymsgauth/Makefile:1.24
--- pkgsrc/mail/pymsgauth/Makefile:1.23	Mon Aug 14 05:24:48 2023
+++ pkgsrc/mail/pymsgauth/Makefile	Mon Aug  3 13:12:29 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2023/08/14 05:24:48 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.24 2026/08/03 13:12:29 wiz Exp $
 
 DISTNAME=		pymsgauth-2.1.0
 PKGREVISION=		16
@@ -13,6 +12,7 @@ LICENSE=		gnu-gpl-v2
 
 FILTER3_PATCH+=		pymsgauth-2.1.0-filter3-20180806.patch
 PATCHFILES+=		${FILTER3_PATCH}
+PATCH_DIST_STRIP=	-p0
 SITES.${FILTER3_PATCH}=	https://schmonz.com/qmail/pymsgauthfilter/
 
 PYMSGAUTH_PROGRAMS=	pymsgauth-*

Index: pkgsrc/mail/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.130 pkgsrc/mail/qmail/Makefile:1.131
--- pkgsrc/mail/qmail/Makefile:1.130	Thu Nov 16 23:13:16 2023
+++ pkgsrc/mail/qmail/Makefile	Mon Aug  3 13:12:29 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2023/11/16 23:13:16 schmonz Exp $
+# $NetBSD: Makefile,v 1.131 2026/08/03 13:12:29 wiz Exp $
 
 DISTNAME=		notqmail-1.08
 PKGNAME=		qmail-1.03
@@ -132,6 +132,8 @@ PKG_HOME.${QMAIL_ALIAS_USER}=	${QMAILDIR
 
 READMES=		README.pkgsrc
 
+PATCH_DIST_STRIP=		-p0
+
 # Record all patches applied, starting with the non-optional ones:
 QMAILPATCHES=			notqmail:${DEFAULT_DISTFILES}
 

Index: pkgsrc/mail/qmail/options.mk
diff -u pkgsrc/mail/qmail/options.mk:1.72 pkgsrc/mail/qmail/options.mk:1.73
--- pkgsrc/mail/qmail/options.mk:1.72	Thu Nov 16 23:13:16 2023
+++ pkgsrc/mail/qmail/options.mk	Mon Aug  3 13:12:29 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.72 2023/11/16 23:13:16 schmonz Exp $
+# $NetBSD: options.mk,v 1.73 2026/08/03 13:12:29 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=		eai pam syncdir tai-system-clock tls
@@ -13,6 +13,7 @@ PKG_SUGGESTED_OPTIONS+=		qmail-customerr
 QMAILPATCHES+=			eai:${EAI_PATCH}
 EAI_PATCH=			netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181109.patch
 PATCHFILES+=			${EAI_PATCH}
+PATCH_DIST_STRIP=		-p0
 SITES.${EAI_PATCH}=		https://schmonz.com/software/eai/
 CPPFLAGS+=			-DEHLO=1
 .endif

Index: pkgsrc/mail/qmail-acceptutils/Makefile
diff -u pkgsrc/mail/qmail-acceptutils/Makefile:1.18 pkgsrc/mail/qmail-acceptutils/Makefile:1.19
--- pkgsrc/mail/qmail-acceptutils/Makefile:1.18	Thu May 11 17:49:29 2023
+++ pkgsrc/mail/qmail-acceptutils/Makefile	Mon Aug  3 13:12:29 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/05/11 17:49:29 schmonz Exp $
+# $NetBSD: Makefile,v 1.19 2026/08/03 13:12:29 wiz Exp $
 
 DISTNAME=		netqmail-1.06
 PKGNAME=		qmail-acceptutils-${ACPATCHVERSION}
@@ -13,6 +13,7 @@ LICENSE=		public-domain
 ACPATCHVERSION=		20230511
 ACPATCH=		${DISTNAME}-acceptutils-${ACPATCHVERSION}.patch
 PATCHFILES+=		${ACPATCH}
+PATCH_DIST_STRIP=	-p0
 SITES.${ACPATCH}=	${HOMEPAGE}
 
 DEPENDS+=		mess822-[0-9]*:../../mail/mess822

Index: pkgsrc/mail/qmail-rejectutils/Makefile
diff -u pkgsrc/mail/qmail-rejectutils/Makefile:1.12 pkgsrc/mail/qmail-rejectutils/Makefile:1.13
--- pkgsrc/mail/qmail-rejectutils/Makefile:1.12	Mon Apr 24 00:38:00 2023
+++ pkgsrc/mail/qmail-rejectutils/Makefile	Mon Aug  3 13:12:29 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/04/24 00:38:00 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2026/08/03 13:12:29 wiz Exp $
 
 DISTNAME=		netqmail-1.06
 PKGNAME=		qmail-rejectutils-${RJPATCHVERSION}
@@ -14,6 +14,7 @@ LICENSE=		public-domain
 RJPATCHVERSION=		20201215
 RJPATCH=		${DISTNAME}-rejectutils-${RJPATCHVERSION}.patch
 PATCHFILES+=		${RJPATCH}
+PATCH_DIST_STRIP=	-p0
 SITES.${RJPATCH}=	${HOMEPAGE}
 
 CONFLICTS+=		qmail<=1.03nb32

Index: pkgsrc/mail/qpopper/Makefile
diff -u pkgsrc/mail/qpopper/Makefile:1.72 pkgsrc/mail/qpopper/Makefile:1.73
--- pkgsrc/mail/qpopper/Makefile:1.72	Tue Oct 24 22:09:49 2023
+++ pkgsrc/mail/qpopper/Makefile	Mon Aug  3 13:12:29 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2023/10/24 22:09:49 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.73 2026/08/03 13:12:29 wiz Exp $
 
 DISTNAME=		qpopper${VERSION}
 PKGNAME=		qpopper-${VERSION}
@@ -9,7 +8,6 @@ MASTER_SITES=		${QPOPPER_MASTER_SITES}
 
 PATCH_SITES=		${QPOPPER_PATCHSITES}
 PATCHFILES=		${QPOPPER_PATCHFILES}
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		[email protected]
 HOMEPAGE=		${QPOPPER_HOMEPAGE}

Index: pkgsrc/mail/queue-repair/Makefile
diff -u pkgsrc/mail/queue-repair/Makefile:1.17 pkgsrc/mail/queue-repair/Makefile:1.18
--- pkgsrc/mail/queue-repair/Makefile:1.17	Mon Aug 14 05:24:48 2023
+++ pkgsrc/mail/queue-repair/Makefile	Mon Aug  3 13:12:29 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2023/08/14 05:24:48 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.18 2026/08/03 13:12:29 wiz Exp $
 
 DISTNAME=		queue-repair-0.9.0
 PKGREVISION=		11
@@ -13,6 +12,7 @@ LICENSE=		gnu-gpl-v2
 
 SYMLINK3_PATCH=		queue-repair-0.9.0-symlink3-20180724.patch
 PATCHFILES+=		${SYMLINK3_PATCH}
+PATCH_DIST_STRIP=	-p0
 SITES.${SYMLINK3_PATCH}= https://schmonz.com/qmail/queuerepairsymlink3/
 
 REPLACE_PYTHON=		queue_repair.py

Index: pkgsrc/mbone/vic/Makefile
diff -u pkgsrc/mbone/vic/Makefile:1.53 pkgsrc/mbone/vic/Makefile:1.54
--- pkgsrc/mbone/vic/Makefile:1.53	Sun Nov 12 13:22:41 2023
+++ pkgsrc/mbone/vic/Makefile	Mon Aug  3 13:12:30 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2023/11/12 13:22:41 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2026/08/03 13:12:30 wiz Exp $
 
 DISTNAME=	vicsrc-2.8
 PKGNAME=	${DISTNAME:S/src//}
@@ -13,6 +13,7 @@ MAKE_JOBS_SAFE=		no
 .if ${OPSYS} == "NetBSD"
 PATCH_SITES=	ftp://tink.ims.ac.jp/pub/NetBSD/vic/
 PATCHFILES=	vic-2.8_ov511p0.diff.gz
+PATCH_DIST_STRIP=	-p0
 .endif
 
 MAINTAINER=	[email protected]

Index: pkgsrc/mbone/vic-devel/Makefile
diff -u pkgsrc/mbone/vic-devel/Makefile:1.32 pkgsrc/mbone/vic-devel/Makefile:1.33
--- pkgsrc/mbone/vic-devel/Makefile:1.32	Sat Apr 26 18:25:14 2025
+++ pkgsrc/mbone/vic-devel/Makefile	Mon Aug  3 13:12:29 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2025/04/26 18:25:14 he Exp $
+# $NetBSD: Makefile,v 1.33 2026/08/03 13:12:29 wiz Exp $
 
 DISTNAME=	vic-2.8ucl1.4.0beta-4337
 PKGNAME=	vic-devel-2.8.1.4.0beta.4337
@@ -15,6 +15,7 @@ MAKE_JOBS_SAFE=	no
 .if ${OPSYS} == "NetBSD"
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	vic-2.8ucl1.4.0_ov511.diff.gz
+PATCH_DIST_STRIP=	-p0
 .endif
 
 MAINTAINER=	[email protected]

Index: pkgsrc/misc/ja-less/Makefile
diff -u pkgsrc/misc/ja-less/Makefile:1.16 pkgsrc/misc/ja-less/Makefile:1.17
--- pkgsrc/misc/ja-less/Makefile:1.16	Thu Feb 10 10:49:42 2022
+++ pkgsrc/misc/ja-less/Makefile	Mon Aug  3 13:12:30 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2022/02/10 10:49:42 pin Exp $
+# $NetBSD: Makefile,v 1.17 2026/08/03 13:12:30 wiz Exp $
 
 DISTNAME=	less-382
 PKGNAME=	ja-${DISTNAME}.262.03
@@ -12,7 +12,6 @@ PATCHFILES+=		less-382-iso259-260.patch.
 PATCHFILES+=		less-382-iso260-261.patch.gz
 PATCHFILES+=		less-382-iso261-262.patch.gz
 PATCHFILES+=		less-382-iso262.ext03.patch.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 # HOMEPAGE is gone.

Index: pkgsrc/misc/xjdic/options.mk
diff -u pkgsrc/misc/xjdic/options.mk:1.2 pkgsrc/misc/xjdic/options.mk:1.3
--- pkgsrc/misc/xjdic/options.mk:1.2	Tue Nov 10 13:37:10 2009
+++ pkgsrc/misc/xjdic/options.mk	Mon Aug  3 13:12:30 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2009/11/10 13:37:10 dogcow Exp $
+# $NetBSD: options.mk,v 1.3 2026/08/03 13:12:30 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xjdic
 PKG_SUPPORTED_OPTIONS=	xjdic-locale
@@ -9,4 +9,5 @@ PKG_SUGGESTED_OPTIONS=	xjdic-locale
 .if !empty(PKG_OPTIONS:Mxjdic-locale)
 PATCH_SITES=	http://www.tzone.org/~vandry/xjdic/
 PATCHFILES+=	xjdic-24.locale.patch
+PATCH_DIST_STRIP=	-p0
 .endif

Index: pkgsrc/mk/patch/patch.mk
diff -u pkgsrc/mk/patch/patch.mk:1.20 pkgsrc/mk/patch/patch.mk:1.21
--- pkgsrc/mk/patch/patch.mk:1.20	Sun Jan 11 16:12:49 2026
+++ pkgsrc/mk/patch/patch.mk	Mon Aug  3 13:12:30 2026
@@ -1,4 +1,4 @@
-# $NetBSD: patch.mk,v 1.20 2026/01/11 16:12:49 wiz Exp $
+# $NetBSD: patch.mk,v 1.21 2026/08/03 13:12:30 wiz Exp $
 #
 # The following variables may be set in a package Makefile and control
 # how pkgsrc patches are applied.
@@ -16,7 +16,7 @@
 #
 #    PATCH_DIST_STRIP is a patch(1) argument that sets the pathname
 #	strip count to help find the correct files to patch.  See the
-#	patch(1) man page for more details.  Defaults to "-p0".
+#	patch(1) man page for more details.  Defaults to "-p1".
 #
 #    PATCH_DIST_ARGS is the base set of arguments passed to patch(1).
 #	The default set of arguments will apply the patches to the
@@ -207,7 +207,7 @@ fi; exit 1
 # may be set, i.e. PATCH_DIST_STRIP.<patch>, PATCH_DIST_ARGS.<patch>,
 # PATCH_DIST_CAT.<patch>.
 #
-PATCH_DIST_STRIP?=		-p0
+PATCH_DIST_STRIP?=		-p1
 .for i in ${PATCHFILES}
 PATCH_DIST_STRIP.${i:S/=/--/}?=	${PATCH_DIST_STRIP}
 .  if defined(PATCH_DIST_ARGS)

Index: pkgsrc/net/nbtscan/Makefile
diff -u pkgsrc/net/nbtscan/Makefile:1.17 pkgsrc/net/nbtscan/Makefile:1.18
--- pkgsrc/net/nbtscan/Makefile:1.17	Sun Nov  3 11:45:43 2019
+++ pkgsrc/net/nbtscan/Makefile	Mon Aug  3 13:12:30 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/11/03 11:45:43 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.18 2026/08/03 13:12:30 wiz Exp $
 
 DISTNAME=	nbtscan-1.5.1
 PKGREVISION=	2
@@ -8,7 +7,6 @@ MASTER_SITES=	http://www.inetcat.net/sof
 
 PATCHFILES=		nbtscan-jumbo-patch-20141122.gz
 PATCH_SITES=		http://www.NetBSD.org/~dholland/patchkits/nbtscan/
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 #HOMEPAGE=	http://www.inetcat.net/software/nbtscan.html

Index: pkgsrc/net/omniNotify/Makefile
diff -u pkgsrc/net/omniNotify/Makefile:1.8 pkgsrc/net/omniNotify/Makefile:1.9
--- pkgsrc/net/omniNotify/Makefile:1.8	Mon Nov 17 11:01:15 2025
+++ pkgsrc/net/omniNotify/Makefile	Mon Aug  3 13:12:30 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2025/11/17 11:01:15 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.9 2026/08/03 13:12:30 wiz Exp $
 
 DISTNAME=	omniNotify-2.1
 PKGREVISION=	1
@@ -8,7 +7,6 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:
 
 PATCH_SITES=		http://www.NetBSD.org/~dholland/patchkits/omniNotify/
 PATCHFILES=		omniNotify-jumbo-patch-20151224.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://omninotify.sourceforge.net/

Index: pkgsrc/net/proftpd/Makefile.common
diff -u pkgsrc/net/proftpd/Makefile.common:1.18 pkgsrc/net/proftpd/Makefile.common:1.19
--- pkgsrc/net/proftpd/Makefile.common:1.18	Mon Jun 15 07:36:25 2026
+++ pkgsrc/net/proftpd/Makefile.common	Mon Aug  3 13:12:30 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2026/06/15 07:36:25 nia Exp $
+# $NetBSD: Makefile.common,v 1.19 2026/08/03 13:12:30 wiz Exp $
 
 # used by net/proftpd/Makefile
 # used by net/proftpd/Makefile.module
@@ -8,7 +8,6 @@ CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/
 
 #PATCH_SITES=		https://github.com/proftpd/proftpd/commit/
-#PATCH_DIST_STRIP=	-p1
 # For CVE-2017-7418
 #PATCHFILES=		ecff21e0d0e84f35c299ef91d7fda088e516d4ed.patch
 

Index: pkgsrc/net/tinyfugue/Makefile
diff -u pkgsrc/net/tinyfugue/Makefile:1.40 pkgsrc/net/tinyfugue/Makefile:1.41
--- pkgsrc/net/tinyfugue/Makefile:1.40	Mon Nov 17 11:01:17 2025
+++ pkgsrc/net/tinyfugue/Makefile	Mon Aug  3 13:12:30 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2025/11/17 11:01:17 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2026/08/03 13:12:30 wiz Exp $
 
 DISTNAME=	tf-40s1
 PKGNAME=	tf-4.0s1
@@ -17,7 +17,6 @@ MAKE_ENV+=	TFVER=${DISTNAME:S/^tf-//}
 
 PATCH_SITES=		http://discworld.imaginary.com/external/taffyd/
 PATCHFILES=		tf-40s1-mccp-patch.gz
-PATCH_DIST_STRIP=	-p1
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 

Index: pkgsrc/net/traceroute-nanog/Makefile
diff -u pkgsrc/net/traceroute-nanog/Makefile:1.14 pkgsrc/net/traceroute-nanog/Makefile:1.15
--- pkgsrc/net/traceroute-nanog/Makefile:1.14	Wed Aug 21 19:23:53 2024
+++ pkgsrc/net/traceroute-nanog/Makefile	Mon Aug  3 13:12:30 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2024/08/21 19:23:53 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2026/08/03 13:12:30 wiz Exp $
 
 DISTNAME=	traceroute-nanog_6.4.2.orig
 PKGNAME=	${DISTNAME:S/.orig//:S/_/-/}
@@ -9,6 +9,7 @@ MASTER_SITES=	http://archive.debian.org/
 # for the man page:
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	traceroute-nanog_6.4.2-1.diff.gz
+PATCH_DIST_STRIP=	-p0
 
 COMMENT=	Traceroute implementation with extended features
 MAINTAINER=	[email protected]

Index: pkgsrc/net/ucspi-tcp/Makefile
diff -u pkgsrc/net/ucspi-tcp/Makefile:1.49 pkgsrc/net/ucspi-tcp/Makefile:1.50
--- pkgsrc/net/ucspi-tcp/Makefile:1.49	Thu May 22 04:51:28 2025
+++ pkgsrc/net/ucspi-tcp/Makefile	Mon Aug  3 13:12:31 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2025/05/22 04:51:28 schmonz Exp $
+# $NetBSD: Makefile,v 1.50 2026/08/03 13:12:31 wiz Exp $
 
 DISTNAME=		ucspi-tcp-0.88
 PKGREVISION=		6
@@ -13,6 +13,7 @@ LICENSE=		public-domain
 
 DESTDIR_PATCH=		ucspi-tcp-0.88-destdir-20180725.patch
 PATCHFILES+=		${DESTDIR_PATCH}
+PATCH_DIST_STRIP=	-p0
 SITES.${DESTDIR_PATCH}=	https://schmonz.com/qmail/ucspitcpdestdir/
 
 MANPAGES=		${DISTNAME}-man-20020317.tar.gz

Index: pkgsrc/net/vnc/Makefile
diff -u pkgsrc/net/vnc/Makefile:1.65 pkgsrc/net/vnc/Makefile:1.66
--- pkgsrc/net/vnc/Makefile:1.65	Tue Jun 28 11:35:22 2022
+++ pkgsrc/net/vnc/Makefile	Mon Aug  3 13:12:31 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2022/06/28 11:35:22 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2026/08/03 13:12:31 wiz Exp $
 
 DISTNAME=		vnc-3.3.3r2
 PKGNAME=		vnc-3.3.3.2
@@ -35,7 +35,6 @@ PKG_SUGGESTED_OPTIONS=	inet6
 .if !empty(PKG_OPTIONS:Minet6)
 PATCH_SITES=		ftp://ftp.kame.net/pub/kame/misc/
 PATCHFILES=		vnc-3.3.3r2-v6-20010421.diff.gz
-PATCH_DIST_STRIP=	-p1
 USE_TOOLS+=		patch
 post-patch: patch-sockets
 .PHONY: patch-sockets

Index: pkgsrc/security/mhash/Makefile
diff -u pkgsrc/security/mhash/Makefile:1.41 pkgsrc/security/mhash/Makefile:1.42
--- pkgsrc/security/mhash/Makefile:1.41	Mon Nov 17 11:01:22 2025
+++ pkgsrc/security/mhash/Makefile	Mon Aug  3 13:12:31 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2025/11/17 11:01:22 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2026/08/03 13:12:31 wiz Exp $
 
 DISTNAME=	mhash-0.9.9
 PKGREVISION=	14
@@ -8,6 +8,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 PATCHFILES+=	mhash-freebsd-patches-20081108.diff.gz
 PATCH_SITES=	${MASTER_SITE_LOCAL}
+PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://mhash.sourceforge.net/

Index: pkgsrc/security/openssh/options.mk
diff -u pkgsrc/security/openssh/options.mk:1.50 pkgsrc/security/openssh/options.mk:1.51
--- pkgsrc/security/openssh/options.mk:1.50	Tue Jul 23 06:38:22 2024
+++ pkgsrc/security/openssh/options.mk	Mon Aug  3 13:12:31 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.50 2024/07/23 06:38:22 wiz Exp $
+# $NetBSD: options.mk,v 1.51 2026/08/03 13:12:31 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openssh
 PKG_SUPPORTED_OPTIONS=	editline fido kerberos openssl pam openssh-legacymodsz
@@ -43,7 +43,6 @@ CONFIGURE_ARGS+=	CPPFLAGS="${CPPFLAGS} -
 #.if !empty(PKG_OPTIONS:Mhpn-patch)
 #PATCHFILES=		openssh-7.1p1-hpn-20150822.diff.bz2
 #PATCH_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/misc/openssh/
-#PATCH_DIST_STRIP=	-p1
 #.endif
 
 PLIST_VARS+=	pam

Index: pkgsrc/security/pks/Makefile
diff -u pkgsrc/security/pks/Makefile:1.36 pkgsrc/security/pks/Makefile:1.37
--- pkgsrc/security/pks/Makefile:1.36	Mon Nov  4 21:12:58 2019
+++ pkgsrc/security/pks/Makefile	Mon Aug  3 13:12:31 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/11/04 21:12:58 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2026/08/03 13:12:31 wiz Exp $
 
 DISTNAME=		pks-0.9.4
 PKGREVISION=		5
@@ -8,7 +8,6 @@ MASTER_SITES+=		${MASTER_SITE_SOURCEFORG
 #PATCH_SITES=		http://www.mit.edu/people/marc/pks/
 PATCHFILES=		pks094-patch2 \
 			pks094-patch3
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 #HOMEPAGE=	http://www.mit.edu/people/marc/pks/

Index: pkgsrc/shells/bash/Makefile
diff -u pkgsrc/shells/bash/Makefile:1.126 pkgsrc/shells/bash/Makefile:1.127
--- pkgsrc/shells/bash/Makefile:1.126	Wed Jun 10 16:58:38 2026
+++ pkgsrc/shells/bash/Makefile	Mon Aug  3 13:12:31 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.126 2026/06/10 16:58:38 kre Exp $
+# $NetBSD: Makefile,v 1.127 2026/08/03 13:12:31 wiz Exp $
 
 BASH_VERSION=		5.3
 BASH_PATCHLEVEL=	15
@@ -11,6 +11,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=bash/}
 DIST_SUBDIR=	${DISTNAME}
 
 PATCH_SITES=	${MASTER_SITES:=bash-5.3-patches/}
+PATCH_DIST_STRIP=	-p0
 PATCHFILES+=	bash53-001 bash53-002 bash53-003 bash53-004 bash53-005
 PATCHFILES+=	bash53-006 bash53-007 bash53-008 bash53-009 bash53-010
 PATCHFILES+=	bash53-011 bash53-012 bash53-013 bash53-014 bash53-015

Index: pkgsrc/shells/bash2/Makefile
diff -u pkgsrc/shells/bash2/Makefile:1.94 pkgsrc/shells/bash2/Makefile:1.95
--- pkgsrc/shells/bash2/Makefile:1.94	Mon Apr 21 21:18:08 2025
+++ pkgsrc/shells/bash2/Makefile	Mon Aug  3 13:12:31 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2025/04/21 21:18:08 wiz Exp $
+# $NetBSD: Makefile,v 1.95 2026/08/03 13:12:31 wiz Exp $
 
 DISTNAME=	bash-2.05b
 PKGNAME=	bash-2.05.2.13
@@ -7,6 +7,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=bash/}
 MASTER_SITES+=	ftp://ftp.cwru.edu/pub/bash/
 
 PATCH_SITES=	${MASTER_SITES:=bash-2.05b-patches/}
+PATCH_DIST_STRIP=	-p0
 PATCHFILES=	bash205b-001 bash205b-002 bash205b-003 bash205b-004 \
 		bash205b-005 bash205b-006 bash205b-007 bash205b-008 \
 		bash205b-009 bash205b-010 bash205b-011 bash205b-012 \

Index: pkgsrc/sysutils/daemontools/options.mk
diff -u pkgsrc/sysutils/daemontools/options.mk:1.2 pkgsrc/sysutils/daemontools/options.mk:1.3
--- pkgsrc/sysutils/daemontools/options.mk:1.2	Mon Nov  4 21:28:43 2019
+++ pkgsrc/sysutils/daemontools/options.mk	Mon Aug  3 13:12:31 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/11/04 21:28:43 rillig Exp $
+# $NetBSD: options.mk,v 1.3 2026/08/03 13:12:31 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.daemontools
 PKG_SUPPORTED_OPTIONS+=		daemontools-moresignals
@@ -10,5 +10,4 @@ PKG_SUGGESTED_OPTIONS+=		daemontools-mor
 MORESIGNALS_PATCH=			daemontools-0.76.sigq12.patch
 PATCHFILES+=				${MORESIGNALS_PATCH}
 SITES.${MORESIGNALS_PATCH}=		http://thedjbway.b0llix.net/patches/
-PATCH_DIST_STRIP.${MORESIGNALS_PATCH}=	-p1
 .endif

Index: pkgsrc/sysutils/fsviewer/Makefile
diff -u pkgsrc/sysutils/fsviewer/Makefile:1.65 pkgsrc/sysutils/fsviewer/Makefile:1.66
--- pkgsrc/sysutils/fsviewer/Makefile:1.65	Tue Jan 27 08:40:33 2026
+++ pkgsrc/sysutils/fsviewer/Makefile	Mon Aug  3 13:12:31 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2026/01/27 08:40:33 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2026/08/03 13:12:31 wiz Exp $
 
 DISTNAME=	FSViewer.app-0.2.5
 PKGNAME=	FSViewer-0.2.5
@@ -8,7 +8,6 @@ CATEGORIES=	sysutils x11 windowmaker
 
 #PATCH_SITES=		#http://www.bayernline.de/~gscholz/linux/fsviewer/
 PATCHFILES=		FSViewer.app-0.2.5-WM-0.81.0.patch.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 #HOMEPAGE=	http://www.bayernline.de/~gscholz/linux/fsviewer/

Index: pkgsrc/sysutils/xdu/Makefile
diff -u pkgsrc/sysutils/xdu/Makefile:1.21 pkgsrc/sysutils/xdu/Makefile:1.22
--- pkgsrc/sysutils/xdu/Makefile:1.21	Wed Sep  6 10:40:33 2017
+++ pkgsrc/sysutils/xdu/Makefile	Mon Aug  3 13:12:32 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/09/06 10:40:33 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.22 2026/08/03 13:12:32 wiz Exp $
 
 DISTNAME=	xdu-3.0
 PKGREVISION=	8
@@ -10,6 +9,7 @@ EXTRACT_SUFX=	.tar.Z
 PATCH_SITES=	http://www.nn.iij4u.or.jp/~tutimura/xdu/
 PATCHFILES+=	xdu-3.0.dirname.patch \
 		xdu-3.0.i18n.patch
+PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=	[email protected]
 #HOMEPAGE=	http://sd.wareonearth.com/~phil/xdu/

Index: pkgsrc/sysutils/xfm/Makefile
diff -u pkgsrc/sysutils/xfm/Makefile:1.26 pkgsrc/sysutils/xfm/Makefile:1.27
--- pkgsrc/sysutils/xfm/Makefile:1.26	Mon Dec  2 08:02:33 2024
+++ pkgsrc/sysutils/xfm/Makefile	Mon Aug  3 13:12:32 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2024/12/02 08:02:33 nia Exp $
+# $NetBSD: Makefile,v 1.27 2026/08/03 13:12:32 wiz Exp $
 
 DISTNAME=	xfm-1.4.3
 PKGREVISION=	9
@@ -7,7 +7,6 @@ MASTER_SITES=	http://www.musikwissenscha
 
 PATCHFILES=		xfm-jumbo-patch-20181125.gz
 PATCH_SITES=		http://www.NetBSD.org/~dholland/patchkits/xfm/
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://www.musikinformatik.uni-mainz.de/ag/xfm/xfm.html

Index: pkgsrc/textproc/WordNet/Makefile
diff -u pkgsrc/textproc/WordNet/Makefile:1.19 pkgsrc/textproc/WordNet/Makefile:1.20
--- pkgsrc/textproc/WordNet/Makefile:1.19	Sun Nov 12 13:23:40 2023
+++ pkgsrc/textproc/WordNet/Makefile	Mon Aug  3 13:12:32 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2023/11/12 13:23:40 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.20 2026/08/03 13:12:32 wiz Exp $
 
 DISTNAME=		WordNet-3.0
 PKGREVISION=		11
@@ -8,7 +7,6 @@ MASTER_SITES=		https://wordnetcode.princ
 
 PATCHFILES=		wordnet.patch.2
 PATCH_SITES=		http://www.ocert.org/analysis/2008-014/
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		[email protected]
 HOMEPAGE=		https://wordnet.princeton.edu/

Index: pkgsrc/textproc/ja-grep/Makefile
diff -u pkgsrc/textproc/ja-grep/Makefile:1.15 pkgsrc/textproc/ja-grep/Makefile:1.16
--- pkgsrc/textproc/ja-grep/Makefile:1.15	Sat Jan 18 23:35:28 2020
+++ pkgsrc/textproc/ja-grep/Makefile	Mon Aug  3 13:12:32 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/01/18 23:35:28 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2026/08/03 13:12:32 wiz Exp $
 
 DISTNAME=	grep-2.4.2
 PKGNAME=	ja-grep-2.4.2
@@ -8,7 +8,6 @@ MASTER_SITES=	${MASTER_SITE_GNU:=grep/}
 
 PATCH_SITES=		http://www.hinadori.atnifty.com/~wills/program/
 PATCHFILES=		grep-2.4.2-mlb2.patch.gz
-PATCH_DIST_STRIP=	-p1
 
 CONFLICTS+=	grep-[0-9]*
 

Index: pkgsrc/textproc/ja-groff/Makefile
diff -u pkgsrc/textproc/ja-groff/Makefile:1.31 pkgsrc/textproc/ja-groff/Makefile:1.32
--- pkgsrc/textproc/ja-groff/Makefile:1.31	Wed Aug  2 19:21:57 2023
+++ pkgsrc/textproc/ja-groff/Makefile	Mon Aug  3 13:12:32 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2023/08/02 19:21:57 nia Exp $
+# $NetBSD: Makefile,v 1.32 2026/08/03 13:12:32 wiz Exp $
 
 DISTNAME=	groff-1.10
 PKGNAME=	ja-groff-0.99
@@ -8,7 +8,6 @@ MASTER_SITES=	${MASTER_SITE_GNU:=groff/}
 
 PATCH_SITES=		ftp://ftp.ae.keio.ac.jp/pub/GNU/
 PATCHFILES=		jgroff-0.99.diff.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://www.gnu.org/software/groff/groff.html

Index: pkgsrc/textproc/ja-sed/Makefile
diff -u pkgsrc/textproc/ja-sed/Makefile:1.16 pkgsrc/textproc/ja-sed/Makefile:1.17
--- pkgsrc/textproc/ja-sed/Makefile:1.16	Sat Jan 18 23:35:28 2020
+++ pkgsrc/textproc/ja-sed/Makefile	Mon Aug  3 13:12:32 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/01/18 23:35:28 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2026/08/03 13:12:32 wiz Exp $
 
 DISTNAME=	sed-3.02
 PKGNAME=	ja-sed-3.02
@@ -8,7 +8,6 @@ MASTER_SITES=	${MASTER_SITE_GNU:=sed/}
 
 PATCH_SITES=		http://www.hinadori.atnifty.com/~wills/program/
 PATCHFILES=		sedmb109.diff.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://www.gnu.org/software/sed/sed.html

Index: pkgsrc/textproc/p5-XML-Bare/Makefile
diff -u pkgsrc/textproc/p5-XML-Bare/Makefile:1.23 pkgsrc/textproc/p5-XML-Bare/Makefile:1.24
--- pkgsrc/textproc/p5-XML-Bare/Makefile:1.23	Thu Jul 16 19:05:22 2026
+++ pkgsrc/textproc/p5-XML-Bare/Makefile	Mon Aug  3 13:12:32 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2026/07/16 19:05:22 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2026/08/03 13:12:32 wiz Exp $
 
 DISTNAME=	XML-Bare-0.53
 PKGNAME=	p5-${DISTNAME}
@@ -8,7 +8,6 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=X
 
 PATCHFILES+=		CVE-2026-13401-r1.patch
 PATCH_SITES+=		https://security.metacpan.org/patches/X/XML-Bare/0.53/
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://metacpan.org/release/XML-Bare

Index: pkgsrc/textproc/rtf-tools/Makefile
diff -u pkgsrc/textproc/rtf-tools/Makefile:1.27 pkgsrc/textproc/rtf-tools/Makefile:1.28
--- pkgsrc/textproc/rtf-tools/Makefile:1.27	Sat Dec 13 12:46:24 2025
+++ pkgsrc/textproc/rtf-tools/Makefile	Mon Aug  3 13:12:32 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2025/12/13 12:46:24 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2026/08/03 13:12:32 wiz Exp $
 
 DISTNAME=		RTF-1.10
 PKGNAME=		rtf-tools-1.10
@@ -9,7 +9,6 @@ EXTRACT_SUFX=		.tar.Z
 
 PATCH_SITES=		http://www.NetBSD.org/~dholland/patchkits/rtf-tools/
 PATCHFILES=		rtf-tools-jumbo-patch-20111006.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		[email protected]
 #HOMEPAGE=		${MASTER_SITES}

Index: pkgsrc/textproc/unroff/Makefile
diff -u pkgsrc/textproc/unroff/Makefile:1.33 pkgsrc/textproc/unroff/Makefile:1.34
--- pkgsrc/textproc/unroff/Makefile:1.33	Sun Feb 15 09:13:41 2026
+++ pkgsrc/textproc/unroff/Makefile	Mon Aug  3 13:12:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2026/02/15 09:13:41 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2026/08/03 13:12:33 wiz Exp $
 
 DISTNAME=		unroff-1.0
 PKGNAME=		unroff-1.0.2
@@ -7,7 +7,6 @@ CATEGORIES=		textproc
 #MASTER_SITES=		http://www-rn.informatik.uni-bremen.de/software/unroff/dist/
 
 PATCHFILES=		me-misc-patch misc-patch-2
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		[email protected]
 #HOMEPAGE=		https://www-rn.informatik.uni-bremen.de/software/unroff/

Index: pkgsrc/www/ap2-limitipconn/Makefile
diff -u pkgsrc/www/ap2-limitipconn/Makefile:1.2 pkgsrc/www/ap2-limitipconn/Makefile:1.3
--- pkgsrc/www/ap2-limitipconn/Makefile:1.2	Mon Jun 24 10:36:51 2019
+++ pkgsrc/www/ap2-limitipconn/Makefile	Mon Aug  3 13:12:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/06/24 10:36:51 nia Exp $
+# $NetBSD: Makefile,v 1.3 2026/08/03 13:12:33 wiz Exp $
 #
 #        * APACHE_PKG_PREFIX = ap24
 #        * PKG_APACHE = apache24
@@ -16,6 +16,7 @@ LICENSE=		apache-2.0
 
 PATCH_SITES=		http://dominia.org/djao/limit/contrib/dg/
 PATCHFILES=		mod_limitipconn_local_IP_patch_2.diff
+PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=		[email protected]
 HOMEPAGE=		https://dominia.org/djao/limitipconn2.html

Index: pkgsrc/www/squid4/Makefile
diff -u pkgsrc/www/squid4/Makefile:1.42 pkgsrc/www/squid4/Makefile:1.43
--- pkgsrc/www/squid4/Makefile:1.42	Thu May 14 16:42:24 2026
+++ pkgsrc/www/squid4/Makefile	Mon Aug  3 13:12:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2026/05/14 16:42:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2026/08/03 13:12:33 wiz Exp $
 
 DISTNAME=	squid-4.17
 PKGREVISION=	19
@@ -8,7 +8,6 @@ EXTRACT_SUFX=	.tar.xz
 
 PATCH_SITES=		http://www.squid-cache.org/Versions/v4/changesets/
 PATCHFILES=		SQUID-2022_1.patch SQUID-2022_2.patch
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	http://www.squid-cache.org/

Index: pkgsrc/www/squidGuard/Makefile
diff -u pkgsrc/www/squidGuard/Makefile:1.45 pkgsrc/www/squidGuard/Makefile:1.46
--- pkgsrc/www/squidGuard/Makefile:1.45	Tue Feb 10 08:06:34 2026
+++ pkgsrc/www/squidGuard/Makefile	Mon Aug  3 13:12:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2026/02/10 08:06:34 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2026/08/03 13:12:33 wiz Exp $
 
 DISTNAME=		squidGuard-1.4
 PKGREVISION=		18
@@ -10,7 +10,6 @@ DISTFILES=		${DEFAULT_DISTFILES} \
 # http://bugs.squid-cache.org/show_bug.cgi?id=3978
 PATCH_SITES=		-http://bugs.squid-cache.org/attachment.cgi?id=2988
 PATCHFILES=		squidGuard-1.4_upgrade.patch
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 #HOMEPAGE=	http://www.squidguard.org/

Index: pkgsrc/x11/blt/Makefile
diff -u pkgsrc/x11/blt/Makefile:1.42 pkgsrc/x11/blt/Makefile:1.43
--- pkgsrc/x11/blt/Makefile:1.42	Sun Jun 14 15:46:14 2026
+++ pkgsrc/x11/blt/Makefile	Mon Aug  3 13:12:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2026/06/14 15:46:14 nia Exp $
+# $NetBSD: Makefile,v 1.43 2026/08/03 13:12:33 wiz Exp $
 
 DISTNAME=	BLT2.4z
 PKGNAME=	blt-2.4z
@@ -8,7 +8,6 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:
 
 PATCH_SITES=		${MASTER_SITES}
 PATCHFILES=		blt2.4z-patch-2
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://blt.sourceforge.net/

Index: pkgsrc/x11/kterm/Makefile
diff -u pkgsrc/x11/kterm/Makefile:1.64 pkgsrc/x11/kterm/Makefile:1.65
--- pkgsrc/x11/kterm/Makefile:1.64	Sun Nov  3 09:14:09 2019
+++ pkgsrc/x11/kterm/Makefile	Mon Aug  3 13:12:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2019/11/03 09:14:09 rillig Exp $
+# $NetBSD: Makefile,v 1.65 2026/08/03 13:12:33 wiz Exp $
 
 DISTNAME=	kterm-6.2.0
 PKGREVISION=	24
@@ -11,7 +11,6 @@ PATCHFILES=		kterm-6.2.0-termios-wd0.2.p
 			kterm-6.2.0-scroll-wd0.2.patch \
 			kterm-6.2.0.NFS-xauth.patch \
 			kterm-6.2.0.ext06.patch.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	# none

Index: pkgsrc/x11/mrxvt/Makefile
diff -u pkgsrc/x11/mrxvt/Makefile:1.44 pkgsrc/x11/mrxvt/Makefile:1.45
--- pkgsrc/x11/mrxvt/Makefile:1.44	Thu Apr 24 14:16:23 2025
+++ pkgsrc/x11/mrxvt/Makefile	Mon Aug  3 13:12:33 2026
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2025/04/24 14:16:23 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.45 2026/08/03 13:12:33 wiz Exp $
 
 DISTNAME=	mrxvt-0.5.4
 PKGREVISION=	18
@@ -8,6 +7,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:
 
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch
+PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	https://code.google.com/p/mrxvt/

Index: pkgsrc/x11/oneko/Makefile
diff -u pkgsrc/x11/oneko/Makefile:1.13 pkgsrc/x11/oneko/Makefile:1.14
--- pkgsrc/x11/oneko/Makefile:1.13	Mon Jan 27 18:59:08 2025
+++ pkgsrc/x11/oneko/Makefile	Mon Aug  3 13:12:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2025/01/27 18:59:08 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2026/08/03 13:12:33 wiz Exp $
 
 DISTNAME=		oneko-1.1b
 PKGNAME=		oneko-1.2
@@ -9,7 +9,6 @@ EXTRACT_SUFX=		.tar.Z
 
 PATCH_SITES=		http://www.bsddiary.net/oneko/
 PATCHFILES=		oneko-1.2.diff.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		[email protected]
 COMMENT=		Like xneko except on the desktop and with other animals

Index: pkgsrc/x11/xdm3d/Makefile
diff -u pkgsrc/x11/xdm3d/Makefile:1.32 pkgsrc/x11/xdm3d/Makefile:1.33
--- pkgsrc/x11/xdm3d/Makefile:1.32	Wed Feb 18 08:06:21 2026
+++ pkgsrc/x11/xdm3d/Makefile	Mon Aug  3 13:12:33 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2026/02/18 08:06:21 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2026/08/03 13:12:33 wiz Exp $
 
 DISTNAME=		xdm3d-1.0
 PKGREVISION=		7
@@ -7,7 +7,6 @@ MASTER_SITES=		${MASTER_SITE_LOCAL}
 
 PATCH_SITES=		http://www.NetBSD.org/~dholland/patchkits/xdm3d/
 PATCHFILES=		xdm3d-jumbo-patch-20130616.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		[email protected]
 #HOMEPAGE=		http://www.hijinks.com/~spade/linux/XBanner/

Index: pkgsrc/x11/xmx/Makefile
diff -u pkgsrc/x11/xmx/Makefile:1.22 pkgsrc/x11/xmx/Makefile:1.23
--- pkgsrc/x11/xmx/Makefile:1.22	Mon Jan 27 18:59:09 2025
+++ pkgsrc/x11/xmx/Makefile	Mon Aug  3 13:12:34 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2025/01/27 18:59:09 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2026/08/03 13:12:34 wiz Exp $
 
 DISTNAME=	xmx-2.1alpha.pl7
 PKGNAME=	xmx-2.1a7
@@ -8,7 +8,6 @@ MASTER_SITES=	ftp://ftp.cs.brown.edu/pub
 
 PATCH_SITES=		http://www.NetBSD.org/~dholland/patchkits/xmx/
 PATCHFILES=		xmx-jumbo-patch-20140912.gz
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	http://www.cs.brown.edu/software/xmx/


--_----------=_1785762755120090--