From 9a7ca7330ba789d752c3753b4e3fe75a45c5b9d0 Mon Sep 17 00:00:00 2001
From: stu <stu@openbsd.org>
Date: Mon, 24 Nov 2025 21:06:25 +0000
Subject: [PATCH] Use MODTCL_WISH_ADJ; drop a patch.

MODTK_VERSION=8.6

ok sthen@
---
 geo/gpsbabel/Makefile               |  7 ++++++-
 geo/gpsbabel/patches/patch-guibabel | 10 ----------
 2 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 geo/gpsbabel/patches/patch-guibabel

diff --git a/geo/gpsbabel/Makefile b/geo/gpsbabel/Makefile
index a25d6750263..00490534968 100644
--- a/geo/gpsbabel/Makefile
+++ b/geo/gpsbabel/Makefile
@@ -14,6 +14,9 @@ DISTNAME=		gpsbabel-${VERSION}
 PKGNAME-main=		gpsbabel-${VERSION}
 PKGNAME-tk=		gpsbabel-tk-${VERSION}
 PKGNAME-qt=		gpsbabel-qt-${VERSION}
+
+REVISION-tk=		0
+
 CATEGORIES=		geo
 
 HOMEPAGE=		https://www.gpsbabel.org/
@@ -37,6 +40,8 @@ MODULES=		devel/cmake \
 			x11/tk \
 			x11/qt6
 
+MODTK_VERSION=		8.6
+
 # gpsbabel (from the -main subpackage) is linked against Qt6Core
 LIB_DEPENDS-main=	devel/libusb1 \
 			devel/shapelib \
@@ -60,7 +65,7 @@ CXXFLAGS +=		-I${LOCALBASE}/include
 MODCMAKE_LDFLAGS=	-L${LOCALBASE}/lib -lshp
 
 pre-configure:
-	${SUBST_CMD} ${WRKSRC}/guibabel
+	@${MODTCL_WISH_ADJ} ${WRKSRC}/guibabel
 	@perl -pi -e 's/gpsbabelfe-bin/guibabel-qt/' \
 		${WRKSRC}/gui/gpsbabel.desktop
 
diff --git a/geo/gpsbabel/patches/patch-guibabel b/geo/gpsbabel/patches/patch-guibabel
deleted file mode 100644
index 91cd2c4816f..00000000000
--- a/geo/gpsbabel/patches/patch-guibabel
+++ /dev/null
@@ -1,10 +0,0 @@
---- guibabel.orig	Thu Oct 12 19:37:40 2006
-+++ guibabel	Thu Oct 12 19:37:51 2006
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # the next line restarts using wish \
--exec wish "$0" "$@"
-+exec wish${MODTK_VERSION} "$0" "$@"
- 
- # 
- # This was largely cribbed from the TCL demo code.  My TCL skills weren't