diff --git a/graphics/tkimg/Portfile b/graphics/tkimg/Portfile index e69a3941339cb..c89847164e1ab 100644 --- a/graphics/tkimg/Portfile +++ b/graphics/tkimg/Portfile @@ -1,7 +1,6 @@ # -*- 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 -PortGroup active_variants 1.1 name tkimg version 1.4.16 @@ -13,8 +12,6 @@ homepage https://tkimg.sourceforge.net description adds a lot of image formats to Tcl/Tk long_description The \"Img\" package adds a lot of image formats to Tcl/Tk. -platforms darwin - master_sites sourceforge:tkimg/tkimg/[join [lrange [split ${version} .] 0 1] .]/tkimg%20${version} distname Img-${version}-Source extract.rename yes @@ -39,20 +36,20 @@ patchfiles-append patch-quartz.diff depends_build-append port:tcllib depends_lib-append port:tcl \ - port:tk \ port:zlib -configure.args-append --with-tcl=${prefix}/lib \ - --with-tk=${prefix}/lib +configure.args-append --with-tcl=${prefix}/lib destroot.destdir INSTALL_ROOT=${destroot} variant quartz conflicts x11 { - require_active_variants tk quartz + depends_lib-append port:tk-quartz + configure.args-append --with-tk=${prefix}/lib/tk-quartz } variant x11 conflicts quartz { - require_active_variants tk x11 + depends_lib-append port:tk-x11 + configure.args-append --with-tk=${prefix}/lib/tk-x11 } if {![variant_isset x11] && ![variant_isset quartz]} { diff --git a/math/R/Portfile b/math/R/Portfile index a077524ef3369..8f6883d4f822c 100644 --- a/math/R/Portfile +++ b/math/R/Portfile @@ -255,12 +255,17 @@ variant latex description {build with LaTeX support and docs in PDF} { } variant tcltk description {enable use of tcltk} { - depends_lib-append port:tcl \ - port:tk + depends_lib-append port:tcl + if {[variant_isset quartz]} { + depends_lib-append port:tk-quartz + configure.args-append --with-tk-config=${prefix}/lib/tk-quartz/tkConfig.sh + } else { + depends_lib-append port:tk-x11 + configure.args-append --with-tk-config=${prefix}/lib/tk-x11/tkConfig.sh + } configure.args-delete --without-tcltk configure.args-append --with-tcltk \ - --with-tcl-config=${prefix}/lib/tclConfig.sh \ - --with-tk-config=${prefix}/lib/tkConfig.sh + --with-tcl-config=${prefix}/lib/tclConfig.sh } variant tests description {include tests of R installation} { @@ -268,7 +273,6 @@ variant tests description {include tests of R installation} { } variant x11 conflicts quartz { - require_active_variants tk x11 depends_lib-append port:xorg-libice \ port:xorg-libsm \ port:xorg-libX11 \ @@ -285,7 +289,6 @@ variant aqua description {Enable native macOS graphics support, needed by R.app } variant quartz requires aqua conflicts x11 { - require_active_variants tk quartz notes-append " Note that R with quartz variant will not work with R.app because\ of conflicts over the macOS menu." diff --git a/math/netgen/Portfile b/math/netgen/Portfile index d61c967c46708..1afd0929d62a5 100644 --- a/math/netgen/Portfile +++ b/math/netgen/Portfile @@ -60,7 +60,6 @@ patchfiles-append patch-no-external.diff \ depends_lib-append port:zlib \ port:tcl \ - port:tk \ port:tkdnd \ port:Togl \ path:lib/libavcodec.dylib:ffmpeg \ @@ -70,7 +69,6 @@ configure.args-append -DUSE_NATIVE_ARCH=OFF \ -DUSE_PYTHON=OFF \ -DPREFER_SYSTEM_PYBIND11=ON \ -DTCL_INCLUDE_PATH:PATH=${prefix}/include \ - -DTK_INCLUDE_PATH:PATH=${prefix}/include \ -DOPENGL_glu_LIBRARY="" \ -DNETGEN_VERSION_GIT="v${version}" \ -DUSE_JPEG=ON \ @@ -134,7 +132,7 @@ foreach pdv ${pythonversions} { } variant quartz conflicts x11 { - require_active_variants tk quartz + depends_lib-append port:tk-quartz require_active_variants tkdnd quartz require_active_variants Togl quartz @@ -145,10 +143,14 @@ variant quartz conflicts x11 { reinplace "s|MACPORTS_NO_X11|TRUE|g" \ ${worksrcpath}/CMakeLists.txt } + configure.args-append -DTK_INCLUDE_PATH:PATH=${prefix}/include/tk-quartz \ + -DTK_WISH:PATH=${prefix}/libexec/tk-quartz/wish \ + -DTK_STUB_LIBRARY:PATH=${prefix}/lib/tk-quartz/libtkstub8.6.a \ + -DTK_LIBRARY:PATH=${prefix}/lib/tk-quartz/libtk.dylib } variant x11 conflicts quartz { - require_active_variants tk x11 + depends_lib-append port:tk-x11 require_active_variants tkdnd x11 require_active_variants Togl x11 depends_lib-append port:xorg-libX11 \ @@ -159,7 +161,11 @@ variant x11 conflicts quartz { # Use appropriate headers: patchfiles-append patch-x11-gl.diff - configure.args-append -DOPENGL_gl_LIBRARY=${prefix}/lib/libGL.dylib + configure.args-append -DOPENGL_gl_LIBRARY=${prefix}/lib/libGL.dylib \ + -DTK_INCLUDE_PATH:PATH=${prefix}/include/tk-x11 \ + -DTK_WISH:PATH=${prefix}/libexec/tk-x11/wish \ + -DTK_STUB_LIBRARY:PATH=${prefix}/lib/tk-x11/libtkstub8.6.a \ + -DTK_LIBRARY:PATH=${prefix}/lib/tk-x11/libtk.dylib } if {![variant_isset quartz] && ![variant_isset x11]} { diff --git a/science/gvemod-labeler/Portfile b/science/gvemod-labeler/Portfile index 8fed0a703a9c0..cdbb4ec0b03ff 100644 --- a/science/gvemod-labeler/Portfile +++ b/science/gvemod-labeler/Portfile @@ -1,7 +1,6 @@ # -*- 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 -PortGroup active_variants 1.1 name gvemod-labeler version 0.4 @@ -16,7 +15,6 @@ long_description This is the Labeler emodule, an interactive tool \ interactive 3d viewing program). homepage http://www.geomview.org/ license LGPL-2+ -platforms darwin master_sites sourceforge:project/geomview/${name}:current \ sourceforge:project/geomview/${name}/0.2:old @@ -35,9 +33,7 @@ checksums ${distname}${extract.suffix} \ size 254354 depends_lib port:geomview \ - port:tk - -require_active_variants tk x11 + port:tk-x11 # Use the Tcl script from version 0.2 and delete the "Labler" binary. # Work around case-insensitivity "Labeler" Tcl script <-> "labeler" module @@ -48,6 +44,9 @@ post-extract { ${worksrcpath}/src/Makefile.in } +configure.args --with-tk-lib=${prefix}/lib/tk-x11 \ + --with-tk-headers=${prefix}/include/tk-x11 + post-destroot { move ${destroot}${prefix}/libexec/geomview/tcl/Labeler.tc \ ${destroot}${prefix}/libexec/geomview/tcl/Labeler diff --git a/science/magic/Portfile b/science/magic/Portfile index 031df7d92238e..bc256a81c6c98 100644 --- a/science/magic/Portfile +++ b/science/magic/Portfile @@ -1,7 +1,6 @@ # -*- 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 -PortGroup active_variants 1.1 PortGroup conflicts_build 1.0 name magic @@ -35,14 +34,12 @@ depends_lib port:blt \ port:libGLU \ port:mesa \ port:tcl \ - port:tk \ + port:tk-x11 \ port:xorg-libice \ port:xorg-libXi \ port:xorg-libXmu \ port:zlib -require_active_variants tk x11 - universal_variant no conflicts_build gnome-keyring @@ -61,7 +58,8 @@ if {${os.platform} eq "darwin" && ${os.major} < 19} { } configure.args-append \ - ac_cv_path_PYTHON3=${configure.python} + ac_cv_path_PYTHON3=${configure.python} \ + --with-tk=${prefix}/lib/tk-x11 use_parallel_build no diff --git a/science/xcrysden/Portfile b/science/xcrysden/Portfile index 8200f979c2271..8c81fb8e2aae0 100644 --- a/science/xcrysden/Portfile +++ b/science/xcrysden/Portfile @@ -1,13 +1,11 @@ # -*- 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 -PortGroup active_variants 1.1 PortGroup compilers 1.0 name xcrysden version 1.6.2 categories science -platforms darwin license GPL-2+ # depends on mesa->py27-xml2->python27->openssl, but nothing from openssl is actually used in XCrySDen @@ -32,9 +30,7 @@ checksums rmd160 76d689c50dfc2207cf814b2edc4df36b2921e80b \ compilers.choose fc compilers.setup require_fortran -require_active_variants tk x11 - -depends_lib port:fftw-3 port:mesa port:libGLU port:tcl port:tk port:Togl-2.0 \ +depends_lib port:fftw-3 port:mesa port:libGLU port:tcl port:tk-x11 port:Togl-2.0 \ port:xorg-libXmu port:xorg-libX11 port:xorg-libXext depends_run port:BWidget @@ -85,7 +81,8 @@ COMPILE_FFTW=no COMPILE_TOGL=no FFTW3_LIB=${prefix}/lib/libfftw3.dylib X_LIB=${prefix}/lib/libXmu.dylib ${prefix}/lib/libX11.dylib ${prefix}/lib/libXext.dylib -TK_LIB=${prefix}/lib/libtk.dylib +TK_INCDIR=${prefix}/include/tk-x11 +TK_LIB=${prefix}/lib/tk-x11/libtk.dylib TCL_LIB=${prefix}/lib/libtcl.dylib GL_LIB=${prefix}/lib/libGL.dylib GLU_LIB=${prefix}/lib/libGLU.dylib diff --git a/x11/Togl/Portfile b/x11/Togl/Portfile index 5130b4443fcfe..99fb9a3ac7d2e 100644 --- a/x11/Togl/Portfile +++ b/x11/Togl/Portfile @@ -1,7 +1,6 @@ # -*- 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 -PortGroup active_variants 1.1 PortGroup github 1.0 name Togl @@ -31,19 +30,18 @@ worksrcdir ${worksrcdir}/ng/Togl${version} conflicts Togl-2.0 -depends_lib-append port:tcl \ - port:tk +depends_lib-append port:tcl # It does not build with Xcode gcc. compiler.blacklist-append *gcc-4.0 *gcc-4.2 -configure.args-append --with-tcl=${prefix}/lib \ - --with-tk=${prefix}/lib +configure.args-append --with-tcl=${prefix}/lib configure.universal_args-delete --disable-dependency-tracking variant quartz conflicts x11 { - require_active_variants tk quartz + depends_lib-append port:tk-quartz + configure.args-append --with-tk=${prefix}/lib/tk-quartz # 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 @@ -51,11 +49,12 @@ variant quartz conflicts x11 { } variant x11 conflicts quartz { - require_active_variants tk x11 - depends_lib-append port:xorg-libX11 \ + depends_lib-append port:tk-x11 \ + port:xorg-libX11 \ port:xorg-libXmu \ port:mesa - configure.args-append --with-Xmu + configure.args-append --with-tk=${prefix}/lib/tk-x11 \ + --with-Xmu # see https://github.com/NGSolve/netgen/blob/master/CMakeLists.txt#L252 configure.cppflags-append -DTOGL_X11 } diff --git a/x11/blt/Portfile b/x11/blt/Portfile index cdc0ef776c1e2..99767294c6fb8 100644 --- a/x11/blt/Portfile +++ b/x11/blt/Portfile @@ -1,7 +1,6 @@ #-*- 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 -PortGroup active_variants 1.1 name blt version 2.5.3 @@ -12,10 +11,9 @@ maintainers nomaintainer description BLT is an extension to the Tk toolkit, adding new widgets, \ geometry managers, and miscellaneous commands. -long_description ${description} +long_description {*}${description} homepage http://blt.sourceforge.net/ -platforms darwin master_sites sourceforge:wize use_zip yes @@ -27,15 +25,13 @@ checksums rmd160 a0e0882e19003bbdb8a89d7c3d410bd32b12b685 \ size 2724036 depends_build port:tcl \ - port:tk \ + port:tk-x11 \ port:xorg-libX11 -require_active_variants tk x11 - use_parallel_build no configure.args-append --with-tcl=${prefix}/lib \ - --with-tk=${prefix}/lib + --with-tk=${prefix}/lib/tk-x11 # prevent having to modify all of Debian patches patch.pre_args-replace -p0 -p1 diff --git a/x11/tix/Portfile b/x11/tix/Portfile index 385a0c4d3fa82..3ae517441f426 100644 --- a/x11/tix/Portfile +++ b/x11/tix/Portfile @@ -1,12 +1,10 @@ # -*- 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 -PortGroup active_variants 1.1 name tix version 8.4.3 revision 5 -platforms darwin categories x11 license BSD maintainers {gmx.us:chrischavez @chrstphrchvz} openmaintainer @@ -30,8 +28,7 @@ checksums rmd160 99249c4d7a19fcb8c27f11ab1b3ef6102911409d \ sha256 562f040ff7657e10b5cffc2c41935f1a53c6402eb3d5f3189113d734fd6c03cb \ size 1831503 -depends_lib port:tcl \ - port:tk +depends_lib port:tcl patchfiles patch-generic-tixGrSort.c.diff \ patch-tk_x11.diff \ patch-dyld_variable.diff \ @@ -42,20 +39,22 @@ patchfiles-append patch-missing-headers.diff \ panic.patch configure.args --mandir=${prefix}/share/man \ - --with-tcl=${prefix}/lib \ - --with-tk=${prefix}/lib + --with-tcl=${prefix}/lib variant quartz conflicts x11 { - require_active_variants tk quartz + depends_lib-append port:tk-quartz + configure.args-append \ + --with-tk=${prefix}/lib/tk-quartz } variant x11 conflicts quartz { - require_active_variants tk x11 + depends_lib-append port:tk-x11 configure.args-append \ --with-x \ --x-includes=${prefix}/include \ - --x-libraries=${prefix}/lib + --x-libraries=${prefix}/lib \ + --with-tk=${prefix}/lib/tk-x11 } if {![variant_isset quartz]} { diff --git a/x11/tkdnd/Portfile b/x11/tkdnd/Portfile index 70be19867f2ea..8c6f3fc9f3b61 100644 --- a/x11/tkdnd/Portfile +++ b/x11/tkdnd/Portfile @@ -2,12 +2,10 @@ PortSystem 1.0 PortGroup cmake 1.1 -PortGroup active_variants 1.1 PortGroup github 1.0 PortGroup compiler_blacklist_versions 1.0 github.setup petasis tkdnd 2.9.4 tkdnd-release-test-v -platforms darwin categories x11 license BSD maintainers {mcalhoun @MarcusCalhoun-Lopez} {gmx.us:chrischavez @chrstphrchvz} openmaintainer @@ -28,14 +26,17 @@ cmake.install_prefix ${prefix}/lib patchfiles-append patch-CMakeLists.txt.diff configure.args-append \ - -DTCL_INCLUDE_PATH:PATH=${prefix}/include \ - -DTK_INCLUDE_PATH:PATH=${prefix}/include + -DTCL_INCLUDE_PATH:PATH=${prefix}/include -depends_lib-append port:tcl \ - port:tk +depends_lib-append port:tcl variant quartz conflicts x11 { - require_active_variants tk quartz + depends_lib-append port:tk-quartz + configure.args-append \ + -DTK_INCLUDE_PATH:PATH=${prefix}/include/tk-quartz \ + -DTK_WISH:PATH=${prefix}/libexec/tk-quartz/wish \ + -DTK_STUB_LIBRARY:PATH=${prefix}/lib/tk-quartz/libtkstub8.6.a \ + -DTK_LIBRARY:PATH=${prefix}/lib/tk-quartz/libtk.dylib # 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 @@ -59,12 +60,18 @@ variant quartz conflicts x11 { } variant x11 conflicts quartz { - require_active_variants tk x11 depends_lib-append \ + port:tk-x11 \ port:xorg-libX11 \ port:xorg-libXext \ port:xorg-libice \ port:xorg-libsm + + configure.args-append \ + -DTK_INCLUDE_PATH:PATH=${prefix}/include/tk-x11 \ + -DTK_WISH:PATH=${prefix}/libexec/tk-x11/wish \ + -DTK_STUB_LIBRARY:PATH=${prefix}/lib/tk-x11/libtkstub8.6.a \ + -DTK_LIBRARY:PATH=${prefix}/lib/tk-x11/libtk.dylib } if {![variant_isset quartz] && ![variant_isset x11]} { diff --git a/x11/tktable/Portfile b/x11/tktable/Portfile index 04d0e1b44a2c6..3c3bfc77fd00d 100644 --- a/x11/tktable/Portfile +++ b/x11/tktable/Portfile @@ -1,7 +1,6 @@ # -*- 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 -PortGroup active_variants 1.1 name tktable version 2.11 @@ -10,9 +9,8 @@ categories x11 license Tcl/Tk maintainers {gmx.us:chrischavez @chrstphrchvz} openmaintainer description A table/matrix widget extension to Tk/Tcl -long_description ${description} +long_description {*}${description} homepage http://tktable.sourceforge.net/ -platforms darwin # TkTable 2.11 was never posted to SourceForge. # A copy of the TkTable repository, owned by a Tcl/Tk developer, @@ -36,23 +34,23 @@ patchfiles-append patch-dyld_variable.diff \ patch-quartz.diff \ panic.patch -depends_build port:tcl \ - port:tk +depends_build port:tcl variant universal {} configure.args --with-tcl=${prefix}/lib \ - --with-tk=${prefix}/lib \ CPPFLAGS="${configure.cppflags}" \ CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" variant quartz conflicts x11 { - require_active_variants tk quartz + depends_build-append port:tk-quartz + configure.args-append --with-tk=${prefix}/lib/tk-quartz } variant x11 conflicts quartz { - require_active_variants tk x11 + depends_build-append port:tk-x11 + configure.args-append --with-tk=${prefix}/lib/tk-x11 } if {![variant_isset quartz]} { diff --git a/x11/xcircuit/Portfile b/x11/xcircuit/Portfile index cffbb0542636e..7d20d028dc576 100644 --- a/x11/xcircuit/Portfile +++ b/x11/xcircuit/Portfile @@ -39,11 +39,10 @@ depends_build port:autoconf \ depends_lib path:lib/pkgconfig/cairo.pc:cairo \ port:ghostscript \ - port:tk \ + port:tk-x11 \ port:xpm -# Currently, xcircuit crashes upon start if tk is built without +x11 -require_active_variants tk x11 quartz +# Currently, xcircuit crashes upon start if tk is built without x11 require_active_variants cairo x11 @@ -56,7 +55,7 @@ patchfiles-append patch-xcircuit-implicit-udrawxat.diff configure.cflags-append -Wno-return-type configure.args --with-tcl=${prefix}/lib \ - --with-tk=${prefix}/lib \ + --with-tk=${prefix}/lib/tk-x11 \ --with-gs=${prefix}/bin/gs \ --x-includes=${prefix}/include \ --x-libraries=${prefix}/lib