From 9fa61825deaf07ef70d5ec1f211612f508abda76 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Mon, 8 Jul 2024 11:55:53 +0000
Subject: [PATCH] use ${PATCHORIG}; no pkg change

---
 databases/p5-Rose-DB/Makefile | 2 +-
 devel/p5-Log-Any/Makefile     | 2 +-
 games/corsixth/Makefile       | 4 ++--
 games/scid/Makefile           | 2 +-
 graphics/feh/Makefile         | 2 +-
 lang/v/Makefile               | 2 +-
 mail/p5-Mail-SPF/Makefile     | 2 +-
 textproc/sp/Makefile          | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/databases/p5-Rose-DB/Makefile b/databases/p5-Rose-DB/Makefile
index 76aad6d22a1..8b34a97b0b8 100644
--- a/databases/p5-Rose-DB/Makefile
+++ b/databases/p5-Rose-DB/Makefile
@@ -35,6 +35,6 @@ TEST_FLAGS =		AUTOMATED_TESTING=1
 PKG_ARCH =		*
 
 post-build:
-		find ${WRKBUILD}/blib -type f -name '*.orig.port' -delete
+		find ${WRKBUILD}/blib -type f -name '*${PATCHORIG}' -delete
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Log-Any/Makefile b/devel/p5-Log-Any/Makefile
index defe1b0762a..75b8b7a1b86 100644
--- a/devel/p5-Log-Any/Makefile
+++ b/devel/p5-Log-Any/Makefile
@@ -17,6 +17,6 @@ TEST_DEPENDS =		devel/p5-Devel-StackTrace>=2.00 \
 PKG_ARCH =		*
 
 pre-configure:
-			find ${WRKSRC} -name "*.orig.port" -delete
+			find ${WRKSRC} -name "*${PATCHORIG}" -delete
 
 .include <bsd.port.mk>
diff --git a/games/corsixth/Makefile b/games/corsixth/Makefile
index ea673841800..8a2e55d924c 100644
--- a/games/corsixth/Makefile
+++ b/games/corsixth/Makefile
@@ -34,8 +34,8 @@ RUN_DEPENDS =	audio/timidity \
 
 NO_TEST =	Yes
 
-# Remove the .orig.port file
+# Remove the ${PATCHORIG} file
 post-install:
-	@rm -f ${PREFIX}/share/corsix-th/Lua/app.lua.orig.port
+	@rm -f ${PREFIX}/share/corsix-th/Lua/app.lua${PATCHORIG}
 
 .include <bsd.port.mk>
diff --git a/games/scid/Makefile b/games/scid/Makefile
index aa89e085411..cf6d430b005 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -56,6 +56,6 @@ post-configure:
 	@${MODTCL_TCLSH_ADJ} ${WRKSRC}/tcl/lang/removetoken.tcl
 
 post-install:
-	rm -f ${PREFIX}/share/scid/tcl/utils/tooltip.tcl.orig.port
+	rm -f ${PREFIX}/share/scid/tcl/utils/tooltip.tcl${PATCHORIG}
 
 .include <bsd.port.mk>
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index f30f21dec5b..59b07a76433 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -40,6 +40,6 @@ pre-configure:
 	    ${WRKSRC}/src/{events,keyevents,options}.c
 
 post-install:
-	rm -f ${PREFIX}/share/examples/feh/themes.orig.port
+	rm -f ${PREFIX}/share/examples/feh/themes${PATCHORIG}
 
 .include <bsd.port.mk>
diff --git a/lang/v/Makefile b/lang/v/Makefile
index 9cf365bc97a..8068d2415ce 100644
--- a/lang/v/Makefile
+++ b/lang/v/Makefile
@@ -49,7 +49,7 @@ do-install:
 	cd ${WRKSRC} && pax -rw cmd thirdparty vlib v.mod ${PREFIX}/lib/vlang
 	${INSTALL_PROGRAM} ${WRKSRC}/v ${PREFIX}/lib/vlang
 	${SUBST_CMD} -c -m 755 ${FILESDIR}/v ${PREFIX}/bin/v
-	find ${PREFIX} -type f -name \*.orig.port -delete
+	find ${PREFIX} -type f -name \*${PATCHORIG} -delete
 
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} HOME=${PORTHOME} ./v test-all
diff --git a/mail/p5-Mail-SPF/Makefile b/mail/p5-Mail-SPF/Makefile
index 8b8b354e65c..e3080a741be 100644
--- a/mail/p5-Mail-SPF/Makefile
+++ b/mail/p5-Mail-SPF/Makefile
@@ -23,6 +23,6 @@ MAKE_ENV =		TEST_POD=Yes
 CONFIGURE_ARGS =	install_path=sbin="${PREFIX}/sbin"
 
 post-build:
-	find ${WRKBUILD}/blib -type f -name '*.orig.port' -delete
+	find ${WRKBUILD}/blib -type f -name '*${PATCHORIG}' -delete
 
 .include <bsd.port.mk>
diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile
index a3b45c65f6c..13cb77337f7 100644
--- a/textproc/sp/Makefile
+++ b/textproc/sp/Makefile
@@ -33,6 +33,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/sp
 	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/sp
 	${INSTALL_DATA} ${WRKSRC}/generic/* ${PREFIX}/include/sp
-	rm ${PREFIX}/include/sp/{Attribute,config}.h.orig.port
+	rm ${PREFIX}/include/sp/{Attribute,config}.h${PATCHORIG}
 
 .include <bsd.port.mk>