From: Stuart Cassoff <exokoide@yahoo.ca>
Subject: sysutils/tkdvd: adjust
To: ports@openbsd.org
Date: Mon, 24 Nov 2025 13:29:29 -0500

Use MODTCL_TCLSH_ADJ and MODTCL_WISH_ADJ;
drop one patch, shorten another.
Tidy port. Take maintainer.

MODTK_VERSION=8.6
PKG_ARCH=*


diff -Nurp /usr/ports/sysutils/tkdvd/Makefile ./Makefile
--- /usr/ports/sysutils/tkdvd/Makefile	Thu Oct  5 10:53:40 2023
+++ ./Makefile	Thu Nov 20 14:29:25 2025
@@ -1,30 +1,33 @@
 COMMENT=		GUI to dvd+rw-tools and cdrecord
 
 DISTNAME=		tkdvd-4.0.9
-REVISION =		5
-CATEGORIES=		sysutils
+REVISION=		6
 
+CATEGORIES=		sysutils
 HOMEPAGE=		http://regis.damongeot.free.fr/tkdvd/
+MAINTAINER=		Stuart Cassoff <stwo@users.sourceforge.net>
 
 # GPLv2
-PERMIT_PACKAGE=	Yes
+PERMIT_PACKAGE=		Yes
 
 SITES=			${HOMEPAGE:=dl/}
 
-WRKDIST=		${WRKDIR}/tkdvd
-
 MODULES=		x11/tk
+MODTK_VERSION=		8.6
 
-BUILD_DEPENDS=		${MODTCL_RUN_DEPENDS}
+BUILD_DEPENDS=		${MODTCL_BUILD_DEPENDS}
 RUN_DEPENDS=		sysutils/cdrtools \
 			sysutils/dvd+rw-tools \
 			x11/gtk+4,-guic \
 			${MODTK_RUN_DEPENDS}
 
 NO_TEST=		Yes
+PKG_ARCH=		*
+WRKDIST=		${WRKDIR}/tkdvd
 
-pre-build:
-			${SUBST_CMD} ${WRKSRC}/{install.tcl,TkDVD.sh}
+pre-configure:
+	@${MODTCL_TCLSH_ADJ} ${WRKSRC}/install.tcl
+	@${MODTCL_WISH_ADJ}  ${WRKSRC}/TkDVD.sh
 
 do-build:
 	cd ${WRKDIST} && ./install.tcl
diff -Nurp /usr/ports/sysutils/tkdvd/patches/patch-TkDVD_sh ./patches/patch-TkDVD_sh
--- /usr/ports/sysutils/tkdvd/patches/patch-TkDVD_sh	Fri Mar 11 14:58:07 2022
+++ ./patches/patch-TkDVD_sh	Thu Nov 20 13:28:24 2025
@@ -1,13 +1,6 @@
---- TkDVD.sh.orig	Sat Aug 30 14:04:00 2008
-+++ TkDVD.sh	Sat Nov  7 15:47:06 2009
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # the next line restarts using wish \
--exec wish "$0" "$@"
-+exec ${MODTK_BIN} "$0" "$@"
- 
- #    Copyright 2003,2008 Regis Damongeot
- 
+Index: TkDVD.sh
+--- TkDVD.sh.orig
++++ TkDVD.sh
 @@ -25,7 +25,7 @@ wm geometry . 700x550
  wm protocol . WM_DELETE_WINDOW { save_options; destroy . }
  set burn_type "burn_dvd"
diff -Nurp /usr/ports/sysutils/tkdvd/patches/patch-install_tcl ./patches/patch-install_tcl
--- /usr/ports/sysutils/tkdvd/patches/patch-install_tcl	Fri Mar 11 14:58:07 2022
+++ ./patches/patch-install_tcl	Wed Dec 31 19:00:00 1969
@@ -1,10 +0,0 @@
---- install.tcl.orig	Thu Nov  3 20:09:57 2005
-+++ install.tcl	Mon Nov 10 19:49:55 2008
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # the next line restarts using wish \
--exec tclsh "$0" "$@"
-+exec ${MODTCL_BIN} "$0" "$@"
- 
- #    Copyright 2003 Regis Damongeot
-