The changes to tcl.port.mk also remove MODTCL_CONFIG, so I'd have to adjust math/graphviz and math/R, as well.

Ok?


Stu



On Saturday, January 18, 2025 at 08:09:20 a.m. EST, Stuart Cassoff <exokoide@yahoo.ca> 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)

Patches here and attached for the .mk files, affected ports and man page.


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    16 Jan 2025 20:40:57 -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    16 Jan 2025 20:41:34 -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.270 port-modules.5
--- port-modules.5    11 Jul 2024 12:55:33 -0000    1.270
+++ port-modules.5    16 Jan 2025 20:34:58 -0000
@@ -1011,10 +1011,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
@@ -1232,10 +1231,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.85 Makefile
--- Makefile    29 Oct 2024 09:46:26 -0000    1.85
+++ Makefile    16 Jan 2025 20:43:22 -0000
@@ -123,7 +123,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

DOCBASE=    ${PREFIX}/share/doc/graphviz



Index: Makefile
===================================================================
RCS file: /cvs/ports/math/R/Makefile,v
diff -u -p -u -p -r1.133 Makefile
--- Makefile    10 Jan 2025 18:03:43 -0000    1.133
+++ Makefile    16 Jan 2025 20:43:35 -0000
@@ -76,8 +76,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}" \