Date: Sat, 6 Nov 2021 13:19:30 GMT From: Yasuhiro Kimura <yasu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 37e5d724fedb - main - x11-fm/doublecmd: Update to 1.0.1 Message-ID: <202111061319.1A6DJUOx057949@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=37e5d724fedb616b460f724d39365beced2331b7 commit 37e5d724fedb616b460f724d39365beced2331b7 Author: Beñat Gonzalez Etxepare <bbtruk@users.sourceforge.net> AuthorDate: 2021-11-06 12:38:27 +0000 Commit: Yasuhiro Kimura <yasu@FreeBSD.org> CommitDate: 2021-11-06 13:19:07 +0000 x11-fm/doublecmd: Update to 1.0.1 * Switch to use USE_GITHUB * Update WWW * Pet portlint and portclippy * Re-format Makefile with portfmt ChangeLog: https://github.com/doublecmd/doublecmd/wiki/Changes-in-version-1.0.0 PR: 259585 --- x11-fm/doublecmd/Makefile | 161 +++++++++------------ x11-fm/doublecmd/distinfo | 10 +- .../patch-components_multithreadprocs_mtpcpu.pas | 22 --- x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas | 24 +-- .../files/patch-src_platform_udefaultplugins.pas | 11 -- .../files/patch-src_platform_unix_upipeserver.pas | 44 ------ x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas | 2 +- x11-fm/doublecmd/pkg-descr | 2 +- 8 files changed, 88 insertions(+), 188 deletions(-) diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile index e7bebeb69a08..ee12959f8ee6 100644 --- a/x11-fm/doublecmd/Makefile +++ b/x11-fm/doublecmd/Makefile @@ -1,13 +1,10 @@ # Created by: Beñat Gonzalez Etxepare <bbtruk@users.sourceforge.net> PORTNAME= doublecmd -PORTVERSION= 0.9.10 -PORTREVISION= 4 +PORTVERSION= 1.0.1 +DISTVERSIONPREFIX= v CATEGORIES= x11-fm -MASTER_SITES= SF/${PORTNAME}/Double%20Commander%20Source PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} -DISTNAME= ${PORTNAME}-${PORTVERSION}-src -DISTFILES= ${DISTNAME}.tar.gz ${PORTNAME}-help-${HELPVERSION}-src.tar.gz MAINTAINER= bbtruk@users.sourceforge.net COMMENT= Total Commander like file manager for the X Window System @@ -19,93 +16,73 @@ ONLY_FOR_ARCHS= amd64 i386 gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt5 qt5_CONFLICTS_INSTALL= ${PORTNAME}-gtk2 -USES= dos2unix desktop-file-utils fpc gnome lazarus:flavors xorg -DOS2UNIX_FILES= src/dmhelpmanager.pas components/multithreadprocs/mtpcpu.pas - +USES= desktop-file-utils dos2unix fpc gnome lazarus:flavors xorg +DOS2UNIX_FILES= components/multithreadprocs/mtpcpu.pas src/dmhelpmanager.pas USE_FPC= cairo chm fcl-base fcl-db fcl-image fcl-json fcl-registry \ - fcl-xml iconvenc pasjpeg rtl-extra x11 regexpr + fcl-xml iconvenc pasjpeg rtl-extra x11 regexpr fcl-extra +USE_GITHUB= yes +GH_PROJECT= doublecmd.github.io:help +GH_TAGNAME= 1.0.0:help USE_GNOME= cairo glib20 USE_XORG= x11 -LAZARUS_PROJECT_FILES= components/chsdet/chsdet.lpk -LAZARUS_PROJECT_FILES+= components/CmdLine/cmdbox.lpk -LAZARUS_PROJECT_FILES+= components/multithreadprocs/multithreadprocslaz.lpk -LAZARUS_PROJECT_FILES+= components/dcpcrypt/dcpcrypt.lpk -LAZARUS_PROJECT_FILES+= components/doublecmd/doublecmd_common.lpk -LAZARUS_PROJECT_FILES+= components/KASToolBar/kascomp.lpk -LAZARUS_PROJECT_FILES+= components/viewer/viewerpackage.lpk -LAZARUS_PROJECT_FILES+= components/gifanim/pkg_gifanim.lpk -LAZARUS_PROJECT_FILES+= components/synunihighlighter/synuni.lpk - -LAZBUILD_ARGS= -d --pcp=${WRKSRC}/tmppcp +LAZARUS_PROJECT_FILES= components/chsdet/chsdet.lpk \ + components/CmdLine/cmdbox.lpk \ + components/multithreadprocs/multithreadprocslaz.lpk \ + components/dcpcrypt/dcpcrypt.lpk \ + components/doublecmd/doublecmd_common.lpk \ + components/KASToolBar/kascomp.lpk \ + components/viewer/viewerpackage.lpk \ + components/gifanim/pkg_gifanim.lpk \ + components/synunihighlighter/synuni.lpk +LAZBUILD_ARGS= --pcp=${WRKSRC}/tmppcp -d + MAKE_ENV+= LDVER=ld.bfd # for DragonFly -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST= ${WRKDIR}/pkg-plist PORTDOCS= * -OPTIONS_DEFINE= DOCS DEBUG -OPTIONS_DEFAULT= WCX_CPIO \ - WCX_DEB \ - WCX_RPM \ - WCX_UNRAR \ - WCX_ZIP \ - WDX_AUDIOINFO \ - WDX_RPM \ - WDX_DEB \ - WDX_SCRIPTS \ - WDX_TEXTLINE \ - WDX_XPI \ - WFX_FTP \ - WFX_SAMBA \ - DSX_LOCATE - -OPTIONS_GROUP= WCX WDX WFX WLX DSX +OPTIONS_DEFINE= DEBUG DOCS +OPTIONS_DEFAULT= DSX_LOCATE WCX_CPIO WCX_DEB WCX_RPM WCX_UNRAR WCX_ZIP \ + WDX_AUDIOINFO WDX_DEB WDX_RPM WDX_SCRIPTS WDX_TEXTLINE \ + WDX_XPI WFX_FTP WFX_SAMBA + +OPTIONS_GROUP= DSX WCX WDX WFX WLX OPTIONS_GROUP_DSX= DSX_LOCATE -OPTIONS_GROUP_WCX= WCX_CPIO \ - WCX_DEB \ - WCX_RPM \ - WCX_UNBZ2 \ - WCX_UNRAR \ - WCX_ZIP -OPTIONS_GROUP_WDX= WDX_AUDIOINFO \ - WDX_RPM \ - WDX_DEB \ - WDX_XPI \ - WDX_SCRIPTS \ - WDX_TEXTLINE -OPTIONS_GROUP_WFX= WFX_FTP \ - WFX_SAMBA +OPTIONS_GROUP_WCX= WCX_CPIO WCX_DEB WCX_RPM WCX_UNBZ2 WCX_UNRAR WCX_ZIP +OPTIONS_GROUP_WDX= WDX_AUDIOINFO WDX_DEB WDX_RPM WDX_SCRIPTS WDX_TEXTLINE \ + WDX_XPI +OPTIONS_GROUP_WFX= WFX_FTP WFX_SAMBA OPTIONS_GROUP_WLX= WLX_MPLAYER -WCX_DESC= Packer plugins to work with archives +DSX_DESC= Search plugins +DSX_LOCATE_DESC= Support locate command + 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_UNRAR_DESC= RAR format support WCX_ZIP_DESC= ZIP format support -WDX_DESC= Plugins to display and search extended file attributes WDX_AUDIOINFO_DESC= Information about audio files -WDX_DEB_DESC= Debian package file information -WDX_RPM_DESC= Red Hat package file information +WDX_DEB_DESC= Debian package file information +WDX_DESC= Plugins to display and search extended file attributes +WDX_RPM_DESC= Red Hat package file information WDX_SCRIPTS_DESC= Add support to use custom Lua scripts -WDX_XPI_DESC= Mozilla plugin file information WDX_TEXTLINE_DESC= Show and replace single lines in text files +WDX_XPI_DESC= Mozilla plugin file information WFX_DESC= File system plugins WFX_FTP_DESC= FTP protocol support WFX_SAMBA_DESC= SMB protocol support -WLX_DESC= Internal viewer plugins +WLX_DESC= Internal viewer plugins WLX_MPLAYER_DESC= Use MPlayer for multimedia files -DSX_DESC= Search plugins -DSX_LOCATE_DESC= Support locate command - -WCX_UNRAR_LIB_DEPENDS= libunrar.so.6:archivers/libunrar6 -WFX_SAMBA_USES= samba:lib +WCX_UNRAR_LIB_DEPENDS= libunrar.so.6:archivers/libunrar6 +WFX_SAMBA_USES= samba:lib WLX_MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer .include <bsd.port.options.mk> @@ -115,70 +92,67 @@ LAZBUILD_ARGS+= --bm="Debug" .endif .if ${PORT_OPTIONS:MWFX_FTP} -USE_FPC+= fcl-net -LAZARUS_PROJECT_FILES+= plugins/wfx/ftp/src/ftp.lpi +USE_FPC+= fcl-net +LAZARUS_PROJECT_FILES+= plugins/wfx/ftp/src/ftp.lpi .endif .if ${PORT_OPTIONS:MWCX_CPIO} -LAZARUS_PROJECT_FILES+= plugins/wcx/cpio/src/cpio.lpi +LAZARUS_PROJECT_FILES+= plugins/wcx/cpio/src/cpio.lpi .endif .if ${PORT_OPTIONS:MWCX_DEB} -LAZARUS_PROJECT_FILES+= plugins/wcx/deb/src/deb.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 +LAZARUS_PROJECT_FILES+= plugins/wcx/unbz2/src/unbz2.lpi .endif .if ${PORT_OPTIONS:MWCX_RPM} -LAZARUS_PROJECT_FILES+= plugins/wcx/rpm/src/rpm.lpi +LAZARUS_PROJECT_FILES+= plugins/wcx/rpm/src/rpm.lpi .endif .if ${PORT_OPTIONS:MWCX_UNRAR} -LAZARUS_PROJECT_FILES+= plugins/wcx/unrar/src/unrar.lpi +LAZARUS_PROJECT_FILES+= plugins/wcx/unrar/src/unrar.lpi .endif .if ${PORT_OPTIONS:MWCX_ZIP} -LAZARUS_PROJECT_FILES+= plugins/wcx/zip/src/Zip.lpi +LAZARUS_PROJECT_FILES+= plugins/wcx/zip/src/Zip.lpi .endif .if ${PORT_OPTIONS:MWDX_AUDIOINFO} -LAZARUS_PROJECT_FILES+= plugins/wdx/audioinfo/src/AudioInfo.lpi +LAZARUS_PROJECT_FILES+= plugins/wdx/audioinfo/src/AudioInfo.lpi .endif .if ${PORT_OPTIONS:MWDX_RPM} -LAZARUS_PROJECT_FILES+= plugins/wdx/rpm_wdx/src/rpm_wdx.lpi +LAZARUS_PROJECT_FILES+= plugins/wdx/rpm_wdx/src/rpm_wdx.lpi .endif .if ${PORT_OPTIONS:MWDX_DEB} -LAZARUS_PROJECT_FILES+= plugins/wdx/deb_wdx/src/deb_wdx.lpi +LAZARUS_PROJECT_FILES+= plugins/wdx/deb_wdx/src/deb_wdx.lpi .endif .if ${PORT_OPTIONS:MWDX_XPI} -LAZARUS_PROJECT_FILES+= plugins/wdx/xpi_wdx/src/xpi_wdx.lpi +LAZARUS_PROJECT_FILES+= plugins/wdx/xpi_wdx/src/xpi_wdx.lpi .endif .if ${PORT_OPTIONS:MWDX_TEXTLINE} -LAZARUS_PROJECT_FILES+= plugins/wdx/textline/src/TextLine.lpi +LAZARUS_PROJECT_FILES+= plugins/wdx/textline/src/TextLine.lpi .endif .if ${PORT_OPTIONS:MWFX_SAMBA} -LAZARUS_PROJECT_FILES+= plugins/wfx/samba/src/samba.lpi +LAZARUS_PROJECT_FILES+= plugins/wfx/samba/src/samba.lpi .endif .if ${PORT_OPTIONS:MWLX_MPLAYER} -LAZARUS_PROJECT_FILES+= plugins/wlx/WlxMplayer/src/wlxMplayer.lpi +LAZARUS_PROJECT_FILES+= plugins/wlx/WlxMplayer/src/wlxMplayer.lpi .endif .if ${PORT_OPTIONS:MDSX_LOCATE} -LAZARUS_PROJECT_FILES+= plugins/dsx/DSXLocate/src/DSXLocate.lpi +LAZARUS_PROJECT_FILES+= plugins/dsx/DSXLocate/src/DSXLocate.lpi .endif -LAZARUS_PROJECT_FILES+= src/doublecmd.lpi - -DOCSRC= ${WRKDIR}/${PORTNAME}-help-${HELPVERSION} -HELPVERSION= 0.6.0 +LAZARUS_PROJECT_FILES+= src/doublecmd.lpi pre-patch: ${TR} '\r' '\n' < ${WRKSRC}/src/uGlobsPaths.pas > ${WRKSRC}/src/uGlobsPaths.pas.unix @@ -270,7 +244,6 @@ pre-install: @cd ${WRKSRC}/pixmaps && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/pixmaps/|' >> ${PLIST} - @${ECHO_CMD} "@dir %%DATADIR%%/pixmaps/dctheme/20x20/apps" >> ${PLIST} @cd ${WRKSRC}/sdk && \ ${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/sdk/|' >> ${PLIST} @@ -285,15 +258,15 @@ do-install: @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/dsx .if ${PORT_OPTIONS:MWCX_CPIO} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/cpio - ${INSTALL_LIB} ${WRKSRC}/plugins/wcx/cpio/lib/cpio.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/cpio/ + ${INSTALL_LIB} ${WRKSRC}/plugins/wcx/cpio/cpio.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/cpio/ .endif .if ${PORT_OPTIONS:MWCX_DEB} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/deb - ${INSTALL_LIB} ${WRKSRC}/plugins/wcx/deb/lib/deb.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/deb/ + ${INSTALL_LIB} ${WRKSRC}/plugins/wcx/deb/deb.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/deb/ .endif .if ${PORT_OPTIONS:MWCX_RPM} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/rpm/ - ${INSTALL_LIB} ${WRKSRC}/plugins/wcx/rpm/lib/rpm.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/rpm/ + ${INSTALL_LIB} ${WRKSRC}/plugins/wcx/rpm/rpm.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/rpm/ .endif .if ${PORT_OPTIONS:MWCX_UNBZ2} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/unbz2/ @@ -301,7 +274,7 @@ do-install: .endif .if ${PORT_OPTIONS:MWCX_UNRAR} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/unrar/ - ${INSTALL_LIB} ${WRKSRC}/plugins/wcx/unrar/lib/unrar.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/unrar/ + ${INSTALL_LIB} ${WRKSRC}/plugins/wcx/unrar/unrar.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/unrar/ .endif .if ${PORT_OPTIONS:MWCX_ZIP} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/zip/ @@ -314,15 +287,15 @@ do-install: .endif .if ${PORT_OPTIONS:MWDX_RPM} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/rpm_wdx/ - ${INSTALL_LIB} ${WRKSRC}/plugins/wdx/rpm_wdx/lib/rpm_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/rpm_wdx/ + ${INSTALL_LIB} ${WRKSRC}/plugins/wdx/rpm_wdx/rpm_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/rpm_wdx/ .endif .if ${PORT_OPTIONS:MWDX_DEB} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/deb_wdx/ - ${INSTALL_LIB} ${WRKSRC}/plugins/wdx/deb_wdx/lib/deb_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/deb_wdx/ + ${INSTALL_LIB} ${WRKSRC}/plugins/wdx/deb_wdx/deb_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/deb_wdx/ .endif .if ${PORT_OPTIONS:MWDX_XPI} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/xpi_wdx/ - ${INSTALL_LIB} ${WRKSRC}/plugins/wdx/xpi_wdx/lib/xpi_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/xpi_wdx/ + ${INSTALL_LIB} ${WRKSRC}/plugins/wdx/xpi_wdx/xpi_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/xpi_wdx/ .endif .if ${PORT_OPTIONS:MWDX_SCRIPTS} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/scripts/ @@ -339,7 +312,7 @@ do-install: .endif .if ${PORT_OPTIONS:MWFX_SAMBA} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx/samba/ - ${INSTALL_LIB} ${WRKSRC}/plugins/wfx/samba/lib/samba.wfx ${STAGEDIR}${DATADIR}/plugins/wfx/samba/ + ${INSTALL_LIB} ${WRKSRC}/plugins/wfx/samba/samba.wfx ${STAGEDIR}${DATADIR}/plugins/wfx/samba/ .endif .if ${PORT_OPTIONS:MWLX_MPLAYER} @@ -349,7 +322,7 @@ do-install: .if ${PORT_OPTIONS:MDSX_LOCATE} @${MKDIR} ${STAGEDIR}${DATADIR}/plugins/dsx/dsxlocate/ - ${INSTALL_LIB} ${WRKSRC}/plugins/dsx/DSXLocate/lib/dsxlocate.dsx ${STAGEDIR}${DATADIR}/plugins/dsx/dsxlocate/ + ${INSTALL_LIB} ${WRKSRC}/plugins/dsx/DSXLocate/dsxlocate.dsx ${STAGEDIR}${DATADIR}/plugins/dsx/dsxlocate/ .endif .for DIRE in language pixmaps sdk @@ -373,7 +346,7 @@ do-install: post-install: .if ${PORT_OPTIONS:MDOCS} - @cd ${DOCSRC} && \ + @cd ${WRKSRC_help} && \ ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \ ${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DOCSDIR}/{}" \; .endif diff --git a/x11-fm/doublecmd/distinfo b/x11-fm/doublecmd/distinfo index 4e702d6098f9..4275a7f0ead0 100644 --- a/x11-fm/doublecmd/distinfo +++ b/x11-fm/doublecmd/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1610346488 -SHA256 (doublecmd-0.9.10-src.tar.gz) = ba7a064245219086d81884d954ab302460aa905adbae10bba172af8c0eca9441 -SIZE (doublecmd-0.9.10-src.tar.gz) = 8294229 -SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39 -SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996 +TIMESTAMP = 1636105994 +SHA256 (doublecmd-doublecmd-v1.0.1_GH0.tar.gz) = 5fc05f66ba40f72b38b7f5d8fb9e472e86cc40e8cabec1175c69db19120b1190 +SIZE (doublecmd-doublecmd-v1.0.1_GH0.tar.gz) = 9031305 +SHA256 (doublecmd-doublecmd.github.io-1.0.0_GH0.tar.gz) = b078a6e9ecad3d661827b96bce10115430b0082ad4c972b2abbf4faeee084010 +SIZE (doublecmd-doublecmd.github.io-1.0.0_GH0.tar.gz) = 7031082 diff --git a/x11-fm/doublecmd/files/patch-components_multithreadprocs_mtpcpu.pas b/x11-fm/doublecmd/files/patch-components_multithreadprocs_mtpcpu.pas deleted file mode 100644 index db3dc06a4aba..000000000000 --- a/x11-fm/doublecmd/files/patch-components_multithreadprocs_mtpcpu.pas +++ /dev/null @@ -1,22 +0,0 @@ ---- components/multithreadprocs/mtpcpu.pas.orig 2015-09-06 12:19:32 UTC -+++ components/multithreadprocs/mtpcpu.pas -@@ -69,15 +69,17 @@ end; - t = sysconf(_SC_NPROC_ONLN); - end; - {$ELSEIF defined(freebsd) or defined(darwin)} -+type -+ PSysCtl = {$IF FPC_FULLVERSION>=30200}pcint{$ELSE}pchar{$ENDIF}; - var - mib: array[0..1] of cint; -- len: cint; -+ len: csize_t; - t: cint; - begin - mib[0] := CTL_HW; - mib[1] := HW_NCPU; - len := sizeof(t); -- fpsysctl(pchar(@mib), 2, @t, @len, Nil, 0); -+ fpsysctl(PSysCtl(@mib), 2, @t, @len, Nil, 0); - Result:=t; - end; - {$ELSEIF defined(linux)} diff --git a/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas b/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas index b34da62c799b..b0c15f9744ca 100644 --- a/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas +++ b/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas @@ -1,18 +1,22 @@ ---- src/dmhelpmanager.pas.orig 2016-01-13 13:34:47 UTC +--- src/dmhelpmanager.pas.orig 2021-10-17 08:37:18 UTC +++ src/dmhelpmanager.pas -@@ -106,12 +106,12 @@ begin - else +@@ -106,7 +106,7 @@ begin + gHelpLang:= 'en' + else begin + gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']); +- if not mbDirectoryExists(gpExePath + 'doc' + PathDelim + gHelpLang) then ++ if not mbDirectoryExists(gpDocsDir + 'doc' + PathDelim + gHelpLang) then begin - gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']); -- if not mbDirectoryExists(gpExePath + 'doc' + PathDelim + gHelpLang) then -+ if not mbDirectoryExists(gpDocsDir + PathDelim + gHelpLang) then - gHelpLang:= 'en'; + ATranslations:= TStringListEx.Create; + try +@@ -119,8 +119,8 @@ begin end; + end; - if mbDirectoryExists(gpExePath + 'doc' + PathDelim + gHelpLang) then - HTMLHelpDatabase.BaseURL:= 'file://' + gpExePath + 'doc' + PathDelim + gHelpLang -+ if mbDirectoryExists(gpDocsDir + PathDelim + gHelpLang) then -+ HTMLHelpDatabase.BaseURL:= 'file://' + gpDocsDir + PathDelim + gHelpLang ++ if mbDirectoryExists(gpDocsDir + 'doc' + PathDelim + gHelpLang) then ++ HTMLHelpDatabase.BaseURL:= 'file://' + gpDocsDir + 'doc' + PathDelim + gHelpLang else begin - HTMLHelpDatabase.BaseURL:= 'http://doublecmd.github.io/doc/' + gHelpLang; + HTMLHelpDatabase.BaseURL:= 'https://doublecmd.github.io/doc/' + gHelpLang; end; diff --git a/x11-fm/doublecmd/files/patch-src_platform_udefaultplugins.pas b/x11-fm/doublecmd/files/patch-src_platform_udefaultplugins.pas deleted file mode 100644 index cba04c508426..000000000000 --- a/x11-fm/doublecmd/files/patch-src_platform_udefaultplugins.pas +++ /dev/null @@ -1,11 +0,0 @@ ---- src/platform/udefaultplugins.pas.orig 2017-02-11 15:03:56 UTC -+++ src/platform/udefaultplugins.pas -@@ -287,7 +287,7 @@ begin - - if gWdxPlugins.IndexOfName('audioinfo') < 0 then - begin -- gWdxPlugins.Add(GetCmdDirFromEnvVar(Folder) + 'audioinfo' + PathDelim + 'audioinfo.wdx'); -+ gWdxPlugins.Add(Folder + 'audioinfo' + PathDelim + 'audioinfo.wdx'); - end; - - // Wfx plugins diff --git a/x11-fm/doublecmd/files/patch-src_platform_unix_upipeserver.pas b/x11-fm/doublecmd/files/patch-src_platform_unix_upipeserver.pas deleted file mode 100644 index c252924b38b9..000000000000 --- a/x11-fm/doublecmd/files/patch-src_platform_unix_upipeserver.pas +++ /dev/null @@ -1,44 +0,0 @@ ---- src/platform/unix/upipeserver.pas.orig 2020-12-31 11:38:58 UTC -+++ src/platform/unix/upipeserver.pas -@@ -30,9 +30,13 @@ function GetPipeFileName(const FileName: String; Globa - - implementation - -+{$IF DEFINED(LINUX) OR DEFINED(FREEBSD)} -+ {$DEFINE USE_XDG} -+{$ENDIF} -+ - uses - SimpleIPC, BaseUnix, uPollThread --{$IF DEFINED(LINUX)} -+{$IF DEFINED(USE_XDG)} - , uXdg - {$ENDIF} - ; -@@ -65,7 +69,7 @@ Type - - function GetPipeFileName(const FileName: String; Global : Boolean): String; - begin --{$IF DEFINED(LINUX)} -+{$IF DEFINED(USE_XDG)} - Result:= IncludeTrailingBackslash(GetUserRuntimeDir) + FileName; - {$ELSE} - Result:= GetTempDir(Global) + ApplicationName + '-' + IntToStr(fpGetUID) + PathDelim + FileName; -@@ -89,7 +93,7 @@ begin - end; - - constructor TPipeServerComm.Create(AOWner: TSimpleIPCServer); --{$IF NOT DEFINED(LINUX)} -+{$IF NOT DEFINED(USE_XDG)} - var - Info: TStat; - Directory: String; -@@ -101,7 +105,7 @@ begin - FFileName:= FFileName + '-' + IntToStr(fpGetPID); - if FFileName[1] <> '/' then - FFileName:= GetPipeFileName(FFileName, Owner.Global); --{$IF NOT DEFINED(LINUX)} -+{$IF NOT DEFINED(USE_XDG)} - // Verify directory owner - Directory:= ExtractFileDir(FFileName); - if not DirectoryExists(Directory) then diff --git a/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas b/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas index 6a68ff715ea9..6499f2e9650a 100644 --- a/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas +++ b/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas @@ -13,7 +13,7 @@ gpPixmapPath : String = ''; // path to pixmaps gpHighPath : String = ''; // editor highlighter directory gpThumbCacheDir : String = ''; // thumbnails cache directory -+ gpDocsDir : String = '%%DOCSDIR%%'; // directory for help files ++ gpDocsDir : String = '%%DOCSDIR%%/'; // directory for help files //Global Configuration Filename const diff --git a/x11-fm/doublecmd/pkg-descr b/x11-fm/doublecmd/pkg-descr index ca5e23c04e2f..79ed5adfa92d 100644 --- a/x11-fm/doublecmd/pkg-descr +++ b/x11-fm/doublecmd/pkg-descr @@ -1,4 +1,4 @@ Double Commander is a cross platform open source file manager with two panels side by side. It is inspired by Total Commander and features some new ideas. -WWW: http://doublecmd.sourceforge.net/ +WWW: https://doublecmd.sourceforge.io
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111061319.1A6DJUOx057949>