<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/02bd7b549c4a9ec637ffe87cd21e47eb09af81a5">https://github.com/macports/macports-ports/commit/02bd7b549c4a9ec637ffe87cd21e47eb09af81a5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 02bd7b549c4 eiskaltdcpp: update to 2024.04.01, move qt4 and qt5 to variants
</span>02bd7b549c4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 02bd7b549c4a9ec637ffe87cd21e47eb09af81a5
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Wed Apr 3 19:14:58 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> eiskaltdcpp: update to 2024.04.01, move qt4 and qt5 to variants
</span>---
net/eiskaltdcpp/Portfile | 73 +++++++++++++---------
...01-Minor-fix-to-CLIENT_DATA_DIR-for-macOS.patch | 22 +++++++
.../{patch-mac-qt.diff => patch-mac-qt4.diff} | 0
3 files changed, 65 insertions(+), 30 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/eiskaltdcpp/Portfile b/net/eiskaltdcpp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a061ec6e28..1259ebb3726 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/eiskaltdcpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/eiskaltdcpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,48 +6,37 @@ PortGroup conflicts_build 1.0
</span> PortGroup github 1.0
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup eiskaltdcpp eiskaltdcpp 9cf2e0970ed62397b366e488fc2642a0b5cdcb56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2023.04.29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories net www
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup eiskaltdcpp eiskaltdcpp 34d416d9e32d4c1fd21e0438c1baa268b5cbf2df
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.4.2-github-2024.04.01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories net p2p www
</span> license GPL-3
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
description Direct Connect protocols file sharing
long_description EiskaltDC++ is a cross-platform program that uses the Direct Connect (DC aka NMDC) and Advanced Direct Connect (ADC) protocols. \
It is compatible with DC++, AirDC++, FlylinkDC++ and other DC clients. EiskaltDC++ also interoperates with all common DC hub software.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 59b9fd1ee58fba95f1ab7138af2a36c32151ba0e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b61082c76d217b567d5b4259073a4128550d814e92ff69de4b7add82c6dbd203 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5904219
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 20} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/eiskaltdcpp/eiskaltdcpp/issues/501
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-mac-qt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DUSE_QT=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUSE_QT5=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5.depends_component qtmultimedia qttools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DUSE_QT=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUSE_QT5=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d8807f1dc3a47c5d037d152e36ed487adc92930a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2f68f907653ea844e4dd73a356a07901a619ba6825e9b23b22b9890256983019 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5904769
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
patchfiles-append patch-CMakeLists.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/eiskaltdcpp/eiskaltdcpp/pull/511
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-Minor-fix-to-CLIENT_DATA_DIR-for-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append port:gettext \
port:git
depends_lib-append port:bzip2 \
port:gettext-runtime \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jsoncpp \
</span> port:libiconv \
port:libidn2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libnotify \
</span> port:miniupnpc \
path:lib/pkgconfig/pango.pc:pango \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pcre2 \
</span> port:sqlite3 \
port:zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,16 +47,15 @@ configure.args-append -DBUILD_STATIC=OFF \
</span> -DCHECK_GTK_DEPRECATED=OFF \
-DDBUS_NOTIFY=OFF \
-DENABLE_STACKTRACE=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DFREE_SPACE_BAR_C=ON \
</span> -DGETTEXT_SEARCH_PATH=${prefix}/bin \
-DHAIKU_PKG=OFF \
-DINSTALL_RUNTIME_PATH=ON \
-DJSONRPC_DAEMON=ON \
-DLOCAL_ASPELL_DATA=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLOCAL_JSONCPP=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLOCAL_JSONCPP=OFF \
</span> -DLUA_SCRIPT=OFF \
-DNO_UI_DAEMON=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPERL_REGEX=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPERL_REGEX=ON \
</span> -DUSE_ASPELL=OFF \
-DUSE_CCACHE=OFF \
-DUSE_CLI_JSONRPC=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,8 +69,9 @@ configure.args-append -DBUILD_STATIC=OFF \
</span> -DUSE_LIBNOTIFY=OFF \
-DUSE_MINIUPNP=ON \
-DUSE_PROGRESS_BARS=ON \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_QT=OFF \
</span> -DUSE_QT_QML=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DUSE_QT_SQLITE=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_QT5=OFF \
</span> -DUSE_XATTR=OFF \
-DWITH_DEV_FILES=ON \
-DWITH_DHT=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,8 +83,32 @@ configure.args-append -DBUILD_STATIC=OFF \
</span>
compiler.cxx_standard 2014
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt4 conflicts qt5 description "Build with Qt4 GUI" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/eiskaltdcpp/eiskaltdcpp/issues/501
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-mac-qt4.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DUSE_QT=OFF -DUSE_QT=ON
</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;'>+variant qt5 conflicts qt4 description "Build with Qt5 GUI" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_component qtmultimedia qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DUSE_QT5=OFF -DUSE_QT5=ON
</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;'>+if {${os.platform} eq "darwin" && ${os.major} < 20} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +qt4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
xinstall -d ${destroot}${applications_dir}/${name}
move ${destroot}${prefix}/${name}.app ${destroot}${applications_dir}/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/eiskaltdcpp-daemon.app ${destroot}${applications_dir}/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # FIXME: this builds fine but does not run:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # move ${destroot}${prefix}/eiskaltdcpp-daemon.app ${destroot}${applications_dir}/${name}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/eiskaltdcpp/files/0001-Minor-fix-to-CLIENT_DATA_DIR-for-macOS.patch b/net/eiskaltdcpp/files/0001-Minor-fix-to-CLIENT_DATA_DIR-for-macOS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c39e43a8a2d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/eiskaltdcpp/files/0001-Minor-fix-to-CLIENT_DATA_DIR-for-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d94892a0322fcb8f1a2a8b15acb701be9678be39 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 3 Apr 2024 08:31:44 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Minor fix to CLIENT_DATA_DIR for macOS
</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;'>+ CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f3eea016..ae08c726 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -194,7 +194,7 @@ if (NOT SHARE_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif (NOT SHARE_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set (CLIENT_DATA_DIR "${PROJECT_NAME_GLOBAL}.app/Contents/Resources/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set (CLIENT_DATA_DIR "${PROJECT_NAME_GLOBAL}.app/Contents/Resources")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set (CLIENT_DOCS_DIR "${CLIENT_DATA_DIR}/docs")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif (WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set (CLIENT_DATA_DIR "${SHARE_DIR}")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/eiskaltdcpp/files/patch-mac-qt.diff b/net/eiskaltdcpp/files/patch-mac-qt4.diff
</span>similarity index 100%
rename from net/eiskaltdcpp/files/patch-mac-qt.diff
rename to net/eiskaltdcpp/files/patch-mac-qt4.diff
</pre><pre style='margin:0'>
</pre>