<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c7e4995ed91fd965d1623eeae27bef1a58b264a3">https://github.com/macports/macports-ports/commit/c7e4995ed91fd965d1623eeae27bef1a58b264a3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c7e4995ed91fd965d1623eeae27bef1a58b264a3
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Jan 17 09:11:15 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> Togl: refactor code
</span>---
x11/Togl/Portfile | 84 ++++++++++++++++++++++++++-----------------------------
1 file changed, 39 insertions(+), 45 deletions(-)
<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 3be053869e4..dbc5f947032 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,65 +1,59 @@
</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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+name Togl
</span> # The last release of Togl was 2008 (version 2.0).
# The last CVS commit was 2010 (see http://togl.cvs.sourceforge.net).
# The developers of Netgen seem to be updating a local copy and calling it version 2.1.
# See https://github.com/NGSolve/netgen/tree/master/ng.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup NGSolve netgen 6.2.2204 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name Togl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license permissive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description A Tcl/Tk widget for OpenGL rendering
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Togl is a Tk widget for OpenGL rendering. Togl was \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- originally based on OGLTK, written by Benjamin Bederson \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- at the University of New Mexico.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://togl.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir netgen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup NGSolve netgen 6.2.2204 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin any}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license permissive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description A Tcl/Tk widget for OpenGL rendering
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Togl is a Tk widget for OpenGL rendering. Togl was \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ originally based on OGLTK, written by Benjamin Bederson \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ at the University of New Mexico.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://togl.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir netgen
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2dec1f2fc90f11fca6ad5ab28622f2b5fdc37e72 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ae1dd9e0b9e2946ba9390b222e33dc9227ddfc1ef2f1528c64edbfdc25ec3587 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3395435
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2dec1f2fc90f11fca6ad5ab28622f2b5fdc37e72 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ae1dd9e0b9e2946ba9390b222e33dc9227ddfc1ef2f1528c64edbfdc25ec3587 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3395435
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${worksrcdir}/ng/Togl${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${worksrcdir}/ng/Togl${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts Togl-2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts Togl-2.0
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tk
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><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;'>+configure.args-append --with-tcl=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-tk=${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;'>+ require_active_variants tk quartz
</span> # see https://github.com/NGSolve/netgen/blob/master/CMakeLists.txt#L250
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DTOGL_NSOPENGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append -DTOGL_NSOPENGL
</span> # see https://github.com/NGSolve/netgen/blob/master/CMakeLists.txt#L221
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -undefined dynamic_lookup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -undefined dynamic_lookup
</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 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mesa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-Xmu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants tk x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mesa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-Xmu
</span> # see https://github.com/NGSolve/netgen/blob/master/CMakeLists.txt#L252
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DTOGL_X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append -DTOGL_X11
</span> }
if {![variant_isset quartz]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,9 +67,9 @@ pre-configure {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set libpath ${prefix}/lib/Togl${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -W ${destroot}${libpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "install_name_tool -id ${prefix}/lib/libTogl.dylib ${destroot}${libpath}/libTogl${version}.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s Togl${version}/libTogl${version}.dylib ${destroot}${prefix}/lib/libTogl.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libpath ${prefix}/lib/Togl${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${destroot}${libpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "install_name_tool -id ${prefix}/lib/libTogl.dylib ${destroot}${libpath}/libTogl${version}.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s Togl${version}/libTogl${version}.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib/libTogl.dylib
</span> }
</pre><pre style='margin:0'>
</pre>