Fresh patches.
Drop MODTCL_CONFIG and MODTK_CONFIG.
Replace with equivalents in the only ports affected:
math/graphviz and math/R.
Tcl/Tk-dependent ports normally need the location,
not the full path to the config files.
Stu
Index: tcl.port.mk
===================================================================
RCS file: /cvs/ports/lang/tcl/tcl.port.mk,v
diff -u -p -u -p -r1.18 tcl.port.mk
--- tcl.port.mk 11 Mar 2022 19:29:17 -0000 1.18
+++ tcl.port.mk 6 Nov 2025 09:50:54 -0000
@@ -15,7 +15,6 @@ MODTCL_INCDIR ?= ${LOCALBASE}/include/tc
MODTCL_TCLDIR ?= ${LOCALBASE}/lib/tcl
MODTCL_MODDIR ?= ${LOCALBASE}/lib/tcl/modules
MODTCL_LIBDIR ?= ${MODTCL_TCLDIR}/tcl${MODTCL_VERSION}
-MODTCL_CONFIG ?= ${MODTCL_LIBDIR}/tclConfig.sh
MODTCL_BUILD_DEPENDS ?= ${_MODTCL_SPEC}:lang/tcl/${MODTCL_VERSION}
MODTCL_RUN_DEPENDS ?= ${_MODTCL_SPEC}:lang/tcl/${MODTCL_VERSION}
Index: tk.port.mk
===================================================================
RCS file: /cvs/ports/x11/tk/tk.port.mk,v
diff -u -p -u -p -r1.15 tk.port.mk
--- tk.port.mk 11 Mar 2022 20:17:26 -0000 1.15
+++ tk.port.mk 6 Nov 2025 09:51:10 -0000
@@ -18,7 +18,6 @@ MODTK_LIB ?= tk86
MODTK_BIN ?= ${LOCALBASE}/bin/wish${MODTK_VERSION}
MODTK_INCDIR ?= ${LOCALBASE}/include/tk${MODTK_VERSION}
MODTK_LIBDIR ?= ${MODTCL_TCLDIR}/tk${MODTK_VERSION}
-MODTK_CONFIG ?= ${MODTK_LIBDIR}/tkConfig.sh
SUBST_VARS += MODTK_VERSION MODTK_BIN
Index: port-modules.5
===================================================================
RCS file: /cvs/src/share/man/man5/port-modules.5,v
diff -u -p -u -p -r1.276 port-modules.5
--- port-modules.5 17 Aug 2025 11:05:22 -0000 1.276
+++ port-modules.5 6 Nov 2025 09:49:42 -0000
@@ -1028,10 +1028,9 @@ Sets
.Ev MODTCL_LIBDIR ,
.Ev MODTCL_BUILD_DEPENDS ,
.Ev MODTCL_RUN_DEPENDS ,
-.Ev MODTCL_LIB ,
.Ev MODTCL_LIB_DEPENDS ,
and
-.Ev MODTCL_CONFIG .
+.Ev MODTCL_LIB .
.Ev MODTCL_VERSION
is the default version used by all Tcl ports and may be overridden.
Provides
@@ -1263,10 +1262,9 @@ Sets
.Ev MODTK_LIBDIR ,
.Ev MODTK_BUILD_DEPENDS ,
.Ev MODTK_RUN_DEPENDS ,
-.Ev MODTK_LIB ,
.Ev MODTK_LIB_DEPENDS ,
and
-.Ev MODTK_CONFIG .
+.Ev MODTK_LIB .
.Ev MODTK_VERSION
is the default version used by all Tk ports and
may be overridden.
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/graphviz/Makefile,v
diff -u -p -u -p -r1.90 Makefile
--- Makefile 2 Nov 2025 19:21:12 -0000 1.90
+++ Makefile 6 Nov 2025 09:50:23 -0000
@@ -120,7 +120,7 @@ CONFIGURE_ARGS+= --with-tclsh=${MODTCL_B
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
- TCLCONFIG=${MODTCL_CONFIG} \
+ TCLCONFIG=${MODTCL_LIBDIR}/tclConfig.sh \
GUILE=guile2.2 \
GUILE_CONFIG=guile-config2.2
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/R/Makefile,v
diff -u -p -u -p -r1.135 Makefile
--- Makefile 30 Jun 2025 17:54:58 -0000 1.135
+++ Makefile 6 Nov 2025 09:50:10 -0000
@@ -75,8 +75,8 @@ CONFIGURE_ARGS= --disable-java \
--disable-openmp \
--enable-BLAS-shlib \
--enable-R-shlib \
- --with-tcl-config=${MODTCL_CONFIG} \
- --with-tk-config=${MODTK_CONFIG}
+ --with-tcl-config=${MODTCL_LIBDIR}/tclConfig.sh \
+ --with-tk-config=${MODTK_LIBDIR}/tkConfig.sh
CONFIGURE_ENV= FC="${MODFORTRAN_COMPILER}" \
FFLAGS="${FFLAGS}" \
On Sat, 18 Jan 2025, Stuart Cassoff wrote:
> Before the Tcl9 changes, I'd like to do this bit of cleanup first.
>
>
> This applies to MODTK_CONFIG as well.
>
> MODTCL_CONFIG isn't that useful.
> Tcl extensions normally need the directory where tclConfig.sh is located, not
> the full path to the file itself.
>
> Only two ports are affected: math/graphviz and math/R.
>
> I propose to drop MODTCL_CONFIG.
> Ports requiring the full path can use ${MODTCL_LIBDIR}/tclConfig.sh.
>
> (MODTCL_LIBDIR could perhaps be better called MODTCL_CFGDIR but that's a
> discussion for another time)
>
