From nobody Tue Jun 18 10:20:22 2024
X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4W3N6t2p0sz5NWxm;
Tue, 18 Jun 2024 10:20:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4W3N6t25PRz43xd;
Tue, 18 Jun 2024 10:20:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1718706022;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=uwTY5SCkTX/PFS7n9CBfbxBiMaN/PqW9o3dDsb7RHNg=;
b=eOPp8VXdW2kBw60IpWrNavEfbwm7DGyFDJet0gWmi+B1I8b8z6Mxd79mp5+GAyTBE9WBc1
2JU+RyaXV8BWqSTWk0zDhlnvt9tEKFbCwWwbyrVPB05lnSNY/tUTUU18HfOn7R0dasOnHn
VHlmdwEUEhxf7mVFWQ6DxYeeyM8W1V5SGL5Ysm2/G8SyRv3MUjbO6jeJ99C+QU9kUH2lqm
qqbYqDAIl/EqitkN72jG/n2hae+wjpQoXSYBBUz1ChZX2hsheQD2WoMlwitbKWlTNCfJ2R
kFEF73+y4t62eb5dEhBfilZHRoeeDq517MwadbIuubiEvs7A8Freij7D2BM+mg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718706022; a=rsa-sha256; cv=none;
b=x0QLovOFtxp/qdbz+9oX6CTU+FfmQTSOd/T0VHnhyB182b2zl/amZyr7bpc/8ojo2rI3Sx
pDUodZD2GjoEVv1Aja4uEwwHBsd0uXUrId5VRjupaTGki4B6nexYk3d0iI0x4LfuCf8D2n
P3sYvymcW6hZ0DNCaa/zGgiBijBS6xQT0mVSfFkH9+KLQk3fH0xzlrcPPhAvd2fysqd8uB
dRGcDJsZcXFMfcOX2+EmSSnWQ8HMIyt23DqPcuBMlTPzDPZY/+8/k7tHQ34Zgy1ily99te
Llzc+zkQAxw33lNAaAyZpnLOl1T8svkpRZMpEk2dkOKt0Tf0wPVLPpMfxIonhg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1718706022;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=uwTY5SCkTX/PFS7n9CBfbxBiMaN/PqW9o3dDsb7RHNg=;
b=Y/JQjcRVvOBXiJiiR4dz8yeO+HExfI+b4ARymItvuMjucBfwfeL0hhnV3zh8f+fx6SIY5r
wIZViQdJm13pLrDukYxxRuoMPKwk8SnC9yGmF3usoxGGfKyNGF/2YDNJyby4mZsRIshrEu
VDMY4+jHBpQEwSMHoNOOSXCg9chJhj7lnD5aS6r7O/3bft+9c+pXegwluzACWSM8HR903t
4vTmDkT/QmaA1J/JkRM/16sXIqRRJT47loaGtdvMJTvVZ4Fi2VWfCfdvs/h8xtFhy+Vbjq
gB4BhnyAue6NNQLPP+9OUZ+2X26u/VZBCPibd+9sFb39YBJI6/aYqqREktXtfw==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4W3N6t16nzzvY4;
Tue, 18 Jun 2024 10:20:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45IAKMYP019718;
Tue, 18 Jun 2024 10:20:22 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IAKMYc019715;
Tue, 18 Jun 2024 10:20:22 GMT
(envelope-from git)
Date: Tue, 18 Jun 2024 10:20:22 GMT
Message-Id: <202406181020.45IAKMYc019715@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Dima Panov <fluffy@FreeBSD.org>
Subject: git: 39e60c16fa8e - main - x11-fm/doublecmd: update to
1.1.15 gamma release
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-ports-main@freebsd.org
Sender: owner-dev-commits-ports-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: fluffy
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 39e60c16fa8e8a7ab77b7c369590ac28471d74d2
Auto-Submitted: auto-generated
The branch main has been updated by fluffy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=39e60c16fa8e8a7ab77b7c369590ac28471d74d2
commit 39e60c16fa8e8a7ab77b7c369590ac28471d74d2
Author: Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2024-06-18 10:17:47 +0000
Commit: Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2024-06-18 10:20:13 +0000
x11-fm/doublecmd: update to 1.1.15 gamma release
---
x11-fm/doublecmd/Makefile | 28 +++++++++++++---------
x11-fm/doublecmd/distinfo | 10 ++++----
.../files/patch-src_platform_unix_upollthread.pas | 2 +-
x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas | 13 ++--------
4 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index 890e20f2743a..caa2503c911b 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -1,7 +1,6 @@
PORTNAME= doublecmd
-PORTVERSION= 1.1.8
+PORTVERSION= 1.1.15
DISTVERSIONPREFIX= v
-PORTREVISION= 4
CATEGORIES= x11-fm
PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX}
@@ -21,7 +20,7 @@ USES= desktop-file-utils dos2unix fpc gnome lazarus:flavors xorg
DOS2UNIX_FILES= components/multithreadprocs/mtpcpu.pas src/dmhelpmanager.pas
USE_GITHUB= yes
GH_PROJECT= doublecmd.github.io:help
-GH_TAGNAME= 1.0.10:help
+GH_TAGNAME= ${DISTVERSIONPREFIX}1.1.10:help
USE_GNOME= cairo glib20
USE_XORG= x11
@@ -49,8 +48,8 @@ OPTIONS_DEFAULT= DSX_LOCATE WCX_BASE64 WCX_CPIO WCX_DEB WCX_RPM WCX_UNRAR \
OPTIONS_GROUP= DSX WCX WDX WFX WLX
OPTIONS_GROUP_DSX= DSX_LOCATE
-OPTIONS_GROUP_WCX= WCX_BASE64 WCX_CPIO WCX_DEB WCX_RPM WCX_UNBZ2 WCX_UNRAR \
- WCX_ZIP
+OPTIONS_GROUP_WCX= WCX_BASE64 WCX_CPIO WCX_DEB WCX_RPM WCX_SEVENZIP \
+ WCX_TORRENT WCX_UNRAR WCX_ZIP
OPTIONS_GROUP_WDX= WDX_AUDIOINFO WDX_DEB WDX_RPM WDX_SCRIPTS WDX_TEXTLINE
OPTIONS_GROUP_WFX= WFX_FTP WFX_SAMBA
OPTIONS_GROUP_WLX= WLX_MPLAYER
@@ -63,7 +62,8 @@ WCX_CPIO_DESC= CPIO format support
WCX_DEB_DESC= Debian package archive support
WCX_DESC= Packer plugins to work with archives
WCX_RPM_DESC= Red Hat package archive support
-WCX_UNBZ2_DESC= BZIP2 format support
+WCX_SEVENZIP_DESC= 7z format support (broken yet)
+WCX_TORRENT_DESC= BitTorrent format support
WCX_UNRAR_DESC= RAR format support
WCX_ZIP_DESC= ZIP format support
@@ -85,6 +85,8 @@ WCX_UNRAR_LIB_DEPENDS= libunrar.so:archivers/libunrar
WFX_SAMBA_USES= samba:lib
WLX_MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer
+WCX_SEVENZIP_BROKEN= Not ready yet to use, require unit JwaWinBase
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDEBUG}
@@ -96,7 +98,7 @@ LAZARUS_PROJECT_FILES+= plugins/wfx/ftp/src/ftp.lpi
.endif
.if ${PORT_OPTIONS:MWCX_BASE64}
-LAZARUS_PROJECT_FILES+= plugins/wcx/base64/src/base64wcx.lpi
+LAZARUS_PROJECT_FILES+= plugins/wcx/base64/src/base64wcx.lpi
.endif
.if ${PORT_OPTIONS:MWCX_CPIO}
@@ -107,14 +109,18 @@ LAZARUS_PROJECT_FILES+= plugins/wcx/cpio/src/cpio.lpi
LAZARUS_PROJECT_FILES+= plugins/wcx/deb/src/deb.lpi
.endif
-.if ${PORT_OPTIONS:MWCX_UNBZ2}
-LAZARUS_PROJECT_FILES+= plugins/wcx/unbz2/src/unbz2.lpi
-.endif
-
.if ${PORT_OPTIONS:MWCX_RPM}
LAZARUS_PROJECT_FILES+= plugins/wcx/rpm/src/rpm.lpi
.endif
+.if ${PORT_OPTIONS:MWCX_SEVENZIP}
+LAZARUS_PROJECT_FILES+= plugins/wcx/sevenzip/src/SevenZipWcx.lpi
+.endif
+
+.if ${PORT_OPTIONS:MWCX_TORRENT}
+LAZARUS_PROJECT_FILES+= plugins/wcx/torrent/src/torrent.lpi
+.endif
+
.if ${PORT_OPTIONS:MWCX_UNRAR}
LAZARUS_PROJECT_FILES+= plugins/wcx/unrar/src/unrar.lpi
.endif
diff --git a/x11-fm/doublecmd/distinfo b/x11-fm/doublecmd/distinfo
index 064c48c3be79..646f6a88a9e2 100644
--- a/x11-fm/doublecmd/distinfo
+++ b/x11-fm/doublecmd/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1704384484
-SHA256 (doublecmd-doublecmd-v1.1.8_GH0.tar.gz) = 77de83ad2d76c7dda9b5c2a310198f6184ff0d68d5f01aa299ba77941fe11f72
-SIZE (doublecmd-doublecmd-v1.1.8_GH0.tar.gz) = 9072246
-SHA256 (doublecmd-doublecmd.github.io-1.0.10_GH0.tar.gz) = f13935373728d654e1b3e39be6156e5e3d878569dd9d64992f1684fc17f28eff
-SIZE (doublecmd-doublecmd.github.io-1.0.10_GH0.tar.gz) = 7605382
+TIMESTAMP = 1718700145
+SHA256 (doublecmd-doublecmd-v1.1.15_GH0.tar.gz) = 785351f1a444478b8804c59647b0d44e563091115869da4a835f9175c2fd45c9
+SIZE (doublecmd-doublecmd-v1.1.15_GH0.tar.gz) = 9609492
+SHA256 (doublecmd-doublecmd.github.io-v1.1.10_GH0.tar.gz) = 8175d082712beb757aa48136e6443f3532e950d437292f3e3de50f1baeef1ab1
+SIZE (doublecmd-doublecmd.github.io-v1.1.10_GH0.tar.gz) = 7947552
diff --git a/x11-fm/doublecmd/files/patch-src_platform_unix_upollthread.pas b/x11-fm/doublecmd/files/patch-src_platform_unix_upollthread.pas
index d7ec77137bdf..f378eb8b4f5a 100644
--- a/x11-fm/doublecmd/files/patch-src_platform_unix_upollthread.pas
+++ b/x11-fm/doublecmd/files/patch-src_platform_unix_upollthread.pas
@@ -5,7 +5,7 @@
FEventPipe[0] := -1;
FEventPipe[1] := -1;
- if fpPipe(FEventPipe) < 0 then
-+ if fpPipe(FEventPipe, 0) < 0 then
++ if fpPipe(FEventPipe, longint(0)) < 0 then
Print(SysErrorMessage(fpGetErrNo))
else begin
// Set both ends of pipe non blocking
diff --git a/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas b/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas
index 62d6eac7ed3a..c7cc83f548b4 100644
--- a/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas
+++ b/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas
@@ -1,6 +1,6 @@
---- src/uGlobsPaths.pas.orig 2024-01-04 17:03:35 UTC
+--- src/uGlobsPaths.pas.orig 2024-02-29 18:56:08 UTC
+++ src/uGlobsPaths.pas
-@@ -3,7 +3,7 @@ unit uGlobsPaths;
+@@ -3,7 +3,7 @@ var
interface
var
@@ -17,12 +17,3 @@
//Global Configuration Filename
const
-@@ -74,7 +75,7 @@ end;
-
- procedure Initialize;
- begin
-- gpExePath := ExtractFilePath(TryReadAllLinks(ParamStr(0)));
-+ //gpExePath := ExtractFilePath(TryReadAllLinks(ParamStr(0)));
- gpGlobalCfgDir := gpExePath + 'settings' + DirectorySeparator;
- end;
-