mlterm: misc improvements, revbump

barracuda156 · Dec 11, 2024 · b89ea68 · b89ea68
1 parent ba74bb2
commit b89ea68
Show file tree

Hide file tree

Showing 2 changed files with 1,042 additions and 5 deletions.
diff --git a/x11/mlterm/Portfile b/x11/mlterm/Portfile
@@ -1,10 +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           openssl 1.0
 
 name                mlterm
 version             3.9.3
-revision            1
+revision            2
 checksums           rmd160  baa6d8db248019df2da5d846797151322c517629 \
                     sha256  b5b76721391de134bd64afb7de6b4256805cf2fc883a2bf2e5d29602ac1b50d9 \
                     size    4272090
@@ -30,14 +31,42 @@ long_description    ${name} is a multi-lingual terminal emulator written \
 homepage            https://mlterm.sourceforge.net
 master_sites        sourceforge:project/mlterm/01release/mlterm-${version}
 
+patch.pre_args-replace \
+                    -p0 -p1
+
+# Upstream patch:
+# https://github.com/arakiken/mlterm/issues/20
+patchfiles-append   patch-clipboard.diff
+
+post-patch {
+    # Prefix is hardcoded in a lot of files,
+    # it is implactical to patch every instance.
+    fs-traverse f ${worksrcpath} {
+        reinplace -q "s|/usr/local|${prefix}|g" ${f}
+    }
+}
+
 depends_build-append \
+                    port:gettext \
                     path:bin/pkg-config:pkgconfig
 
-depends_lib-append  port:libssh2 \
+depends_lib-append  port:fontconfig \
+                    port:freetype \
+                    path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
+                    port:gettext-runtime \
+                    path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
+                    port:libsixel \
+                    port:libssh2 \
                     port:Xft2 \
-                    port:xorg-libsm
+                    port:xorg-libsm \
+                    port:xorg-libX11
 
 configure.args-append \
+                    --disable-fribidi \
+                    --enable-compact-truecolor \
+                    --enable-fontconfig \
+                    --enable-image \
+                    --enable-otl \
                     --enable-ssh2 \
                     --with-gui=xlib \
                     --with-imagelib=gdk-pixbuf \
@@ -51,7 +80,7 @@ post-destroot {
 
 variant bidi description {Enable bidirectional support} {
     depends_lib-append      port:fribidi
-    configure.args-append   --enable-fribidi
+    configure.args-replace  --disable-fribidi --enable-fribidi
 }
 
 variant gtk2 conflicts gtk3 description {Build with GTK2} {
@@ -60,7 +89,8 @@ variant gtk2 conflicts gtk3 description {Build with GTK2} {
 }
 
 variant gtk3 conflicts gtk2 description {Build with GTK3} {
-    depends_lib-append      path:lib/pkgconfig/gtk+-3.0.pc:gtk3
+    depends_lib-append      path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
+                            port:vte
     configure.args-append   --with-gtk=3.0
 }
 
@@ -70,6 +100,7 @@ variant sdl2 description {Use SDL2 GUI} {
     configure.args-replace  --with-gui=xlib --with-gui=sdl2
 }
 
+# Upstream default is gtk3
 if {![variant_isset gtk2] && ![variant_isset gtk3]} {
     default_variants        +gtk3
 }