<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/944808e55e9d08ee887160bfd7bf59c429f15157">https://github.com/macports/macports-ports/commit/944808e55e9d08ee887160bfd7bf59c429f15157</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 944808e55e9d08ee887160bfd7bf59c429f15157
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Dec 28 23:27:37 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> tk dependents: use tk-quartz and tk-x11 as needed
</span>---
graphics/tkimg/Portfile | 15 ++++++---------
math/R/Portfile | 15 +++++++++------
math/netgen/Portfile | 18 ++++++++++++------
science/gvemod-labeler/Portfile | 10 +++++-----
science/magic/Portfile | 13 +++++++------
science/xcrysden/Portfile | 10 ++++------
science/xcrysden/files/patch-C-Makefile.diff | 13 +++++++++++--
x11/Togl/Portfile | 21 +++++++++++----------
x11/blt/Portfile | 14 ++++++--------
x11/tix/Portfile | 21 +++++++++++----------
x11/tkdnd/Portfile | 24 ++++++++++++++++--------
x11/tktable/Portfile | 16 +++++++---------
x11/xcircuit/Portfile | 9 ++++-----
13 files changed, 109 insertions(+), 90 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tkimg/Portfile b/graphics/tkimg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e69a3941339..f66d02f9a66 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/tkimg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tkimg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span>
name tkimg
version 1.4.16
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories graphics
license Tcl/Tk
maintainers {mcalhoun @MarcusCalhoun-Lopez} {gmx.us:chrischavez @chrstphrchvz} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,8 +12,6 @@ homepage https://tkimg.sourceforge.net
</span> description adds a lot of image formats to Tcl/Tk
long_description The \"Img\" package adds a lot of image formats to Tcl/Tk.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> master_sites sourceforge:tkimg/tkimg/[join [lrange [split ${version} .] 0 1] .]/tkimg%20${version}
distname Img-${version}-Source
extract.rename yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,20 +36,20 @@ patchfiles-append patch-quartz.diff
</span> depends_build-append port:tcllib
depends_lib-append port:tcl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tk \
</span> port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --with-tcl=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tk=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-tcl=${prefix}/lib
</span>
destroot.destdir INSTALL_ROOT=${destroot}
variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants tk quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tk-quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-tk=${prefix}/lib/tk-quartz
</span> }
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants tk x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tk-x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-tk=${prefix}/lib/tk-x11
</span> }
if {![variant_isset x11] && ![variant_isset quartz]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/R/Portfile b/math/R/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a077524ef33..8f6883d4f82 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/R/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/R/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -255,12 +255,17 @@ variant latex description {build with LaTeX support and docs in PDF} {
</span> }
variant tcltk description {enable use of tcltk} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:tcl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tcl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tk-quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-tk-config=${prefix}/lib/tk-quartz/tkConfig.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tk-x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-tk-config=${prefix}/lib/tk-x11/tkConfig.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> configure.args-delete --without-tcltk
configure.args-append --with-tcltk \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tcl-config=${prefix}/lib/tclConfig.sh \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tk-config=${prefix}/lib/tkConfig.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tcl-config=${prefix}/lib/tclConfig.sh
</span> }
variant tests description {include tests of R installation} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,7 +273,6 @@ variant tests description {include tests of R installation} {
</span> }
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants tk x11
</span> depends_lib-append port:xorg-libice \
port:xorg-libsm \
port:xorg-libX11 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -285,7 +289,6 @@ variant aqua description {Enable native macOS graphics support, needed by R.app
</span> }
variant quartz requires aqua conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants tk quartz
</span> notes-append "
Note that R with quartz variant will not work with R.app because\
of conflicts over the macOS menu."
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/netgen/Portfile b/math/netgen/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d61c967c467..d1949c028f1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/netgen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/netgen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup github 1.0
</span> PortGroup legacysupport 1.1
github.setup NGSolve netgen 6.2.2307 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories math
license LGPL-2
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,6 @@ patchfiles-append patch-no-external.diff \
</span>
depends_lib-append port:zlib \
port:tcl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tk \
</span> port:tkdnd \
port:Togl \
path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +69,6 @@ configure.args-append -DUSE_NATIVE_ARCH=OFF \
</span> -DUSE_PYTHON=OFF \
-DPREFER_SYSTEM_PYBIND11=ON \
-DTCL_INCLUDE_PATH:PATH=${prefix}/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DTK_INCLUDE_PATH:PATH=${prefix}/include \
</span> -DOPENGL_glu_LIBRARY="" \
-DNETGEN_VERSION_GIT="v${version}" \
-DUSE_JPEG=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +132,7 @@ foreach pdv ${pythonversions} {
</span> }
variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants tk quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tk-quartz
</span> require_active_variants tkdnd quartz
require_active_variants Togl quartz
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,10 +143,14 @@ variant quartz conflicts x11 {
</span> reinplace "s|MACPORTS_NO_X11|TRUE|g" \
${worksrcpath}/CMakeLists.txt
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DTK_INCLUDE_PATH:PATH=${prefix}/include/tk-quartz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_WISH:PATH=${prefix}/libexec/tk-quartz/wish \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_STUB_LIBRARY:PATH=${prefix}/lib/tk-quartz/libtkstub8.6.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_LIBRARY:PATH=${prefix}/lib/tk-quartz/libtk.dylib
</span> }
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants tk x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tk-x11
</span> require_active_variants tkdnd x11
require_active_variants Togl x11
depends_lib-append port:xorg-libX11 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,7 +161,11 @@ variant x11 conflicts quartz {
</span> # Use appropriate headers:
patchfiles-append patch-x11-gl.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DOPENGL_gl_LIBRARY=${prefix}/lib/libGL.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DOPENGL_gl_LIBRARY=${prefix}/lib/libGL.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_INCLUDE_PATH:PATH=${prefix}/include/tk-x11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_WISH:PATH=${prefix}/libexec/tk-x11/wish \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_STUB_LIBRARY:PATH=${prefix}/lib/tk-x11/libtkstub8.6.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_LIBRARY:PATH=${prefix}/lib/tk-x11/libtk.dylib
</span> }
if {![variant_isset quartz] && ![variant_isset x11]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gvemod-labeler/Portfile b/science/gvemod-labeler/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fed0a703a9..351a16935e7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gvemod-labeler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gvemod-labeler/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span>
name gvemod-labeler
version 0.4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories science graphics x11
maintainers {raphael @raphael-st} openmaintainer
description An interactive tool for generating \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,6 @@ long_description This is the Labeler emodule, an interactive tool \
</span> interactive 3d viewing program).
homepage http://www.geomview.org/
license LGPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> master_sites sourceforge:project/geomview/${name}:current \
sourceforge:project/geomview/${name}/0.2:old
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +34,7 @@ checksums ${distname}${extract.suffix} \
</span> size 254354
depends_lib port:geomview \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants tk x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tk-x11
</span>
# Use the Tcl script from version 0.2 and delete the "Labler" binary.
# Work around case-insensitivity "Labeler" Tcl script <-> "labeler" module
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +45,9 @@ post-extract {
</span> ${worksrcpath}/src/Makefile.in
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-tk-lib=${prefix}/lib/tk-x11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tk-headers=${prefix}/include/tk-x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
move ${destroot}${prefix}/libexec/geomview/tcl/Labeler.tc \
${destroot}${prefix}/libexec/geomview/tcl/Labeler
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/magic/Portfile b/science/magic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a1b06c000d3..b7a6a3e3c90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/magic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/magic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span> PortGroup conflicts_build 1.0
name magic
version 8.3.508
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 f034a75cb02e22b72cf0f5748029bb06e570a259 \
sha256 efd23c5b6de4da25868964f1f1e6e4e2229d8ee82f1bfa795e6c2cbfb48e46ab \
size 3762537
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,14 +34,12 @@ depends_lib port:blt \
</span> port:libGLU \
port:mesa \
port:tcl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tk-x11 \
</span> port:xorg-libice \
port:xorg-libXi \
port:xorg-libXmu \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants tk x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> universal_variant no
conflicts_build gnome-keyring
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +58,11 @@ if {${os.platform} eq "darwin" && ${os.major} < 19} {
</span> }
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_path_PYTHON3=${configure.python}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_path_PYTHON3=${configure.python} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tk=${prefix}/lib/tk-x11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tkincls=${prefix}/include/tk-x11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tklibs=${prefix}/lib/tk-x11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-wish=${prefix}/libexec/tk-x11/wish
</span>
use_parallel_build no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/xcrysden/Portfile b/science/xcrysden/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8200f979c22..2a9d94d1247 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/xcrysden/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/xcrysden/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span> PortGroup compilers 1.0
name xcrysden
version 1.6.2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories science
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license GPL-2+
# depends on mesa->py27-xml2->python27->openssl, but nothing from openssl is actually used in XCrySDen
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +31,7 @@ checksums rmd160 76d689c50dfc2207cf814b2edc4df36b2921e80b \
</span> compilers.choose fc
compilers.setup require_fortran
<span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants tk x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:fftw-3 port:mesa port:libGLU port:tcl port:tk port:Togl-2.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:fftw-3 port:mesa port:libGLU port:tcl port:tk-x11 port:Togl-2.0 \
</span> port:xorg-libXmu port:xorg-libX11 port:xorg-libXext
depends_run port:BWidget
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +82,8 @@ COMPILE_FFTW=no
</span> COMPILE_TOGL=no
FFTW3_LIB=${prefix}/lib/libfftw3.dylib
X_LIB=${prefix}/lib/libXmu.dylib ${prefix}/lib/libX11.dylib ${prefix}/lib/libXext.dylib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-TK_LIB=${prefix}/lib/libtk.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+TK_INCDIR=-I${prefix}/include/tk-x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+TK_LIB=${prefix}/lib/tk-x11/libtk.dylib
</span> TCL_LIB=${prefix}/lib/libtcl.dylib
GL_LIB=${prefix}/lib/libGL.dylib
GLU_LIB=${prefix}/lib/libGLU.dylib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/xcrysden/files/patch-C-Makefile.diff b/science/xcrysden/files/patch-C-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2ee6f0f954b..66966d95195 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/xcrysden/files/patch-C-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/xcrysden/files/patch-C-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- C/Makefile.orig 2020-06-05 21:44:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ C/Makefile 2020-06-05 21:45:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- C/Makefile.orig 2019-10-29 22:37:45
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ C/Makefile 2024-12-29 15:10:54
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,7 +6,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # don't touch below this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INCS = $(FFTW3_INCDIR) $(MESCHACH_INCDIR) $(TCL_INCDIR) $(TK_INCDIR) $(GL_INCDIR) $(X_INCDIR) $(EXTERNAL_INCDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INCS = $(TK_INCDIR) $(FFTW3_INCDIR) $(MESCHACH_INCDIR) $(TCL_INCDIR) $(GL_INCDIR) $(X_INCDIR) $(EXTERNAL_INCDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include make-objects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> @@ -38,7 +38,7 @@
$(CC) $(CFLAGS) $(XFS_OBJS) -o xsf2xsf $(MATH) $(LDLIB)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/Togl/Portfile b/x11/Togl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5130b4443fc..7103ed32633 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/Togl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/Togl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,6 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span> PortGroup github 1.0
name Togl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +10,7 @@ name Togl
</span> # See https://github.com/NGSolve/netgen/tree/master/ng.
github.setup NGSolve netgen 6.2.2307 v
version 2.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> categories x11
license permissive
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,19 +30,19 @@ worksrcdir ${worksrcdir}/ng/Togl${version}
</span>
conflicts Togl-2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:tcl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:tcl
</span>
# It does not build with Xcode gcc.
compiler.blacklist-append *gcc-4.0 *gcc-4.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --with-tcl=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tk=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-tcl=${prefix}/lib
</span>
configure.universal_args-delete --disable-dependency-tracking
variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants tk quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tk-quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-tk=${prefix}/lib/tk-quartz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tkinclude=${prefix}/include/tk-quartz
</span> # see https://github.com/NGSolve/netgen/blob/master/CMakeLists.txt#L250
configure.cppflags-append -DTOGL_NSOPENGL
# see https://github.com/NGSolve/netgen/blob/master/CMakeLists.txt#L221
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,11 +50,13 @@ variant quartz conflicts x11 {
</span> }
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants tk x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tk-x11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11 \
</span> port:xorg-libXmu \
port:mesa
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-Xmu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-tk=${prefix}/lib/tk-x11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tkinclude=${prefix}/include/tk-x11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-Xmu
</span> # see https://github.com/NGSolve/netgen/blob/master/CMakeLists.txt#L252
configure.cppflags-append -DTOGL_X11
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/blt/Portfile b/x11/blt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cdc0ef776c1..827edfd6e8f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/blt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/blt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,19 @@
</span> #-*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span>
name blt
version 2.5.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories x11
license MIT
maintainers nomaintainer
description BLT is an extension to the Tk toolkit, adding new widgets, \
geometry managers, and miscellaneous commands.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span>
homepage http://blt.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
master_sites sourceforge:wize
use_zip yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,15 +25,15 @@ checksums rmd160 a0e0882e19003bbdb8a89d7c3d410bd32b12b685 \
</span> size 2724036
depends_build port:tcl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tk-x11 \
</span> port:xorg-libX11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants tk x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_parallel_build no
configure.args-append --with-tcl=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tk=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tk=${prefix}/lib/tk-x11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tkincls=${prefix}/include/tk-x11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tklibs=${prefix}/lib/tk-x11
</span>
# prevent having to modify all of Debian patches
patch.pre_args-replace -p0 -p1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tix/Portfile b/x11/tix/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 385a0c4d3fa..79c924ef8d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span>
name tix
version 8.4.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> categories x11
license BSD
maintainers {gmx.us:chrischavez @chrstphrchvz} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,8 +28,7 @@ checksums rmd160 99249c4d7a19fcb8c27f11ab1b3ef6102911409d \
</span> sha256 562f040ff7657e10b5cffc2c41935f1a53c6402eb3d5f3189113d734fd6c03cb \
size 1831503
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:tcl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:tcl
</span> patchfiles patch-generic-tixGrSort.c.diff \
patch-tk_x11.diff \
patch-dyld_variable.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,20 +39,24 @@ patchfiles-append patch-missing-headers.diff \
</span> panic.patch
configure.args --mandir=${prefix}/share/man \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tcl=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tk=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tcl=${prefix}/lib
</span>
variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants tk quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tk-quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tk=${prefix}/lib/tk-quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-prepend -I${prefix}/include/tk-quartz
</span> }
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants tk x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tk-x11
</span>
configure.args-append \
--with-x \
--x-includes=${prefix}/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-libraries=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --x-libraries=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tk=${prefix}/lib/tk-x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-prepend -I${prefix}/include/tk-x11
</span> }
if {![variant_isset quartz]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tkdnd/Portfile b/x11/tkdnd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 70be19867f2..416a2fbcd9c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tkdnd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tkdnd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,11 @@
</span>
PortSystem 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span> PortGroup github 1.0
PortGroup compiler_blacklist_versions 1.0
github.setup petasis tkdnd 2.9.4 tkdnd-release-test-v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories x11
license BSD
maintainers {mcalhoun @MarcusCalhoun-Lopez} {gmx.us:chrischavez @chrstphrchvz} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,14 +27,17 @@ cmake.install_prefix ${prefix}/lib
</span> patchfiles-append patch-CMakeLists.txt.diff
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DTCL_INCLUDE_PATH:PATH=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DTK_INCLUDE_PATH:PATH=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTCL_INCLUDE_PATH:PATH=${prefix}/include
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:tcl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:tcl
</span>
variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants tk quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:tk-quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_INCLUDE_PATH:PATH=${prefix}/include/tk-quartz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_WISH:PATH=${prefix}/libexec/tk-quartz/wish \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_STUB_LIBRARY:PATH=${prefix}/lib/tk-quartz/libtkstub8.6.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_LIBRARY:PATH=${prefix}/lib/tk-quartz/libtk.dylib
</span> # garbage collection is still available for ${os.major} < 16
# ARC is available for ${os.major} > 10
# in Xcode < 10, ARC forbids Objective-C objects in struct
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,12 +61,18 @@ variant quartz conflicts x11 {
</span> }
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants tk x11
</span> depends_lib-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tk-x11 \
</span> port:xorg-libX11 \
port:xorg-libXext \
port:xorg-libice \
port:xorg-libsm
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_INCLUDE_PATH:PATH=${prefix}/include/tk-x11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_WISH:PATH=${prefix}/libexec/tk-x11/wish \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_STUB_LIBRARY:PATH=${prefix}/lib/tk-x11/libtkstub8.6.a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTK_LIBRARY:PATH=${prefix}/lib/tk-x11/libtk.dylib
</span> }
if {![variant_isset quartz] && ![variant_isset x11]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tktable/Portfile b/x11/tktable/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 04d0e1b44a2..f05ee1e0858 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tktable/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tktable/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,16 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span>
name tktable
version 2.11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories x11
license Tcl/Tk
maintainers {gmx.us:chrischavez @chrstphrchvz} openmaintainer
description A table/matrix widget extension to Tk/Tcl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span> homepage http://tktable.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span>
# TkTable 2.11 was never posted to SourceForge.
# A copy of the TkTable repository, owned by a Tcl/Tk developer,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,23 +34,23 @@ patchfiles-append patch-dyld_variable.diff \
</span> patch-quartz.diff \
panic.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:tcl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:tcl
</span>
variant universal {}
configure.args --with-tcl=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tk=${prefix}/lib \
</span> CPPFLAGS="${configure.cppflags}" \
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants tk quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:tk-quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-tk=${prefix}/lib/tk-quartz
</span> }
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants tk x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:tk-x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-tk=${prefix}/lib/tk-x11
</span> }
if {![variant_isset quartz]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xcircuit/Portfile b/x11/xcircuit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cffbb054263..cf6da59af73 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xcircuit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xcircuit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup active_variants 1.1
</span>
name xcircuit
version 3.10.30
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories x11 cad
maintainers {khindenburg @kurthindenburg} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,11 +39,10 @@ depends_build port:autoconf \
</span>
depends_lib path:lib/pkgconfig/cairo.pc:cairo \
port:ghostscript \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tk-x11 \
</span> port:xpm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Currently, xcircuit crashes upon start if tk is built without +x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants tk x11 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Currently, xcircuit crashes upon start if tk is built without x11
</span>
require_active_variants cairo x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +55,7 @@ patchfiles-append patch-xcircuit-implicit-udrawxat.diff
</span> configure.cflags-append -Wno-return-type
configure.args --with-tcl=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-tk=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tk=${prefix}/lib/tk-x11 \
</span> --with-gs=${prefix}/bin/gs \
--x-includes=${prefix}/include \
--x-libraries=${prefix}/lib
</pre><pre style='margin:0'>
</pre>