<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/00e2073e8dd136ef0f2780bd8c85f26778861fe4">https://github.com/macports/macports-ports/commit/00e2073e8dd136ef0f2780bd8c85f26778861fe4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 00e2073e8dd136ef0f2780bd8c85f26778861fe4
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Mon Sep 30 00:51:18 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> mldonkey: update to 3.2.1, fix build
</span>---
net/mldonkey/Portfile | 90 +++++++++++++++++++++++++++++------
net/mldonkey/files/patch-lablgtk.diff | 32 +++++++++++++
2 files changed, 107 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/mldonkey/Portfile b/net/mldonkey/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f0917eb1b28..ba0f775ea3b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/mldonkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/mldonkey/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,13 @@
</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 github 1.0
</span> PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ygrek mldonkey 3-1-6 release-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ygrek mldonkey 3-2-1 release-
</span> version [string map {- .} ${github.version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories net
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories net p2p
</span> maintainers nomaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,31 +23,92 @@ long_description MLdonkey is a multi-platform multi-network peer-to-peer \
</span> only downloaded from one network, but from multiple \
clients concurrently.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://mldonkey.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://mldonkey.sourceforge.net
</span> github.tarball_from releases
distname ${name}-${version}
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 92f39c3dcdf31bf61aba71e14109eb4262237988 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1b36b57c05a83c2e363c085bf8e80630884c6c92ecdeffc1ad5e1c39a98e043d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 768ba12324b04604169f0c3a142f607aaa599cb9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9c0be397ab2193256f52f7bafaf210bf29c93bb4758bb1818f4633763b996bc7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2839613
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:ocaml \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:lablgtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:bzip2 \
</span> port:expat \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bzip2 \
</span> port:file \
port:fontconfig \
port:freetype \
port:gd2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lablgtk2 \
</span> port:libiconv \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmagic \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:librsvg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:miniupnpc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ocaml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ocaml-camlp4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ocaml-num \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libX11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
require_active_variants lablgtk2 rsvg
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# The patch can be dropped once upstream fixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# finding lablgtk2 via ocamlfind.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/ygrek/mldonkey/issues/107
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-lablgtk.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *gcc-4.0 *gcc-4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/ygrek/mldonkey/issues/117
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++98
</span><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;'>+ --enable-multinet \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-upnp-natpmp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libiconv-prefix=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Until this is fixed: https://github.com/ygrek/mldonkey/issues/108
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-gnutella2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# FIXME: Need to disable GTK GUI for now due to:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/ygrek/mldonkey/issues/111
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Web-based GUI works though.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-gui=newgui2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {(${os.platform} eq "darwin" && ${os.major} < 11) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ || ${os.platform} ne "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.cmd ${prefix}/bin/gmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # ocaml is not universal
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-gui=newgui2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Do not build this in parallel.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Error: Unbound module CommonOptions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# There is no install target.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Can be adjusted, depending on which archs OCaml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # supports only in bytecode.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.build_arch} in [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/mlnet.byte ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/mlnet ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set docdir ${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/docs ${destroot}${docdir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} CHANGES.md Copying.txt Developers.txt README.md ${destroot}${docdir}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/mldonkey/files/patch-lablgtk.diff b/net/mldonkey/files/patch-lablgtk.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3b980cc0a82
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/mldonkey/files/patch-lablgtk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config/configure 2024-08-20 11:14:48.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config/configure 2024-09-29 22:49:13.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11440,9 +11440,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for native code $LABLGTK_NAME" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf %s "checking for native code $LABLGTK_NAME... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -f $OCAMLLIB/$LABLGTK_NAME/lablgtk.$OCAMLLIB_EXT; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test -f $OCAMLLIB/site-lib/$LABLGTK_NAME/lablgtk.$OCAMLLIB_EXT; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$GUI" = "newgui2"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -f $OCAMLLIB/$LABLGTK_NAME/lablrsvg.$OCAMLLIB_EXT; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test -f $OCAMLLIB/site-lib/$LABLGTK_NAME/lablrsvg.$OCAMLLIB_EXT; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s\n" "yes" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LABLGTK_CONFIG=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11450,7 +11450,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s\n" "no" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LABLGTK_CONFIG=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -f $OCAMLLIB/$LABLGTK_NAME/lablrsvg.cma; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test -f $OCAMLLIB/site-lib/$LABLGTK_NAME/lablrsvg.cma; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "---------------------------------------------------------"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "lablrsvg is not installed properly. See the INSTALL.txt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "file of mldonkey to see how to compile $LABLGTK_NAME. You"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11473,7 +11473,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s\n" "no" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LABLGTK_CONFIG=no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -f $OCAMLLIB/$LABLGTK_NAME/lablgtk.cma; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test -f $OCAMLLIB/site-lib/$LABLGTK_NAME/lablgtk.cma; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "-------------------------------------------------------------"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "$LABLGTK_NAME is not installed properly. See the INSTALL.txt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "file of mldonkey to see how to compile $LABLGTK_NAME. You"
</span></pre><pre style='margin:0'>
</pre>