svn commit: r411053 - in branches/2016Q1/x11-fm/doublecmd: . files
Thomas Zander
riggs at FreeBSD.org
Mon Mar 14 10:08:55 UTC 2016
Author: riggs
Date: Mon Mar 14 10:08:53 2016
New Revision: 411053
URL: https://svnweb.freebsd.org/changeset/ports/411053
Log:
MFH: r411032
Un-break port, update to upstream version 0.7.0
While on it:
- Pet portlint
PR: 206840
Submitted by: bbtruk at users.sourceforge.net (maintainer)
Approved by: ports-secteam (feld)
Added:
branches/2016Q1/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr
- copied unchanged from r411032, head/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr
branches/2016Q1/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas
- copied unchanged from r411032, head/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas
branches/2016Q1/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas
- copied unchanged from r411032, head/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas
Deleted:
branches/2016Q1/x11-fm/doublecmd/files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr
branches/2016Q1/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas
branches/2016Q1/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas
Modified:
branches/2016Q1/x11-fm/doublecmd/Makefile
branches/2016Q1/x11-fm/doublecmd/distinfo
Directory Properties:
branches/2016Q1/ (props changed)
Modified: branches/2016Q1/x11-fm/doublecmd/Makefile
==============================================================================
--- branches/2016Q1/x11-fm/doublecmd/Makefile Mon Mar 14 09:26:16 2016 (r411052)
+++ branches/2016Q1/x11-fm/doublecmd/Makefile Mon Mar 14 10:08:53 2016 (r411053)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= doublecmd
-PORTVERSION= 0.6.6
+PORTVERSION= 0.7.0
CATEGORIES= x11-fm
MASTER_SITES= SF/${PORTNAME}/Double%20Commander%20Source
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -13,9 +13,6 @@ COMMENT= Total Commander like file manag
LICENSE= GPLv2
-BROKEN= fails with FPC-3.0.0-built Lazarus\
- (Can't find unit uOverlayScrollBarFix)
-
BUILD_DEPENDS= lazbuild:${PORTSDIR}/editors/lazarus \
fpcres:${PORTSDIR}/lang/fpc-utils
@@ -23,7 +20,7 @@ ONLY_FOR_ARCHS= i386 amd64
PORTDOCS= *
-USES= dos2unix
+USES= dos2unix desktop-file-utils
USE_FPC= cairo fcl-base fcl-db fcl-image fcl-json fcl-registry \
fcl-xml iconvenc pasjpeg rtl-extra x11
DOS2UNIX_FILES= src/dmhelpmanager.pas
@@ -104,7 +101,6 @@ OPTIONS_DEFAULT= GTK2 \
GTK2_USE= fpc=gtk2 gnome=gtk20
GTK2_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
-QT4_USE= fpc=yes
QT4_LIB_DEPENDS= libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
QT4_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
@@ -141,10 +137,9 @@ post-patch:
${WRKSRC}/plugins/wlx/WlxMplayer/src/wlxMplayer.lpr
do-build:
-.for FILE in chsdet/chsdet.lpk CmdLine/cmdbox.lpk dcpcrypt/dcpcrypt.lpk \
- doublecmd/doublecmd_common.lpk KASToolBar/kascomp.lpk \
- viewer/viewerpackage.lpk gifanim/pkg_gifanim.lpk \
- ZVDateTimeCtrls/zvdatetimectrls.lpk
+.for FILE in chsdet/chsdet.lpk CmdLine/cmdbox.lpk multithreadprocs/multithreadprocslaz.lpk \
+ dcpcrypt/dcpcrypt.lpk doublecmd/doublecmd_common.lpk KASToolBar/kascomp.lpk \
+ viewer/viewerpackage.lpk gifanim/pkg_gifanim.lpk
@cd ${WRKSRC}/components && ${SETENV} ${MAKE_ENV} \
${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "${FILE}"
.endfor
Modified: branches/2016Q1/x11-fm/doublecmd/distinfo
==============================================================================
--- branches/2016Q1/x11-fm/doublecmd/distinfo Mon Mar 14 09:26:16 2016 (r411052)
+++ branches/2016Q1/x11-fm/doublecmd/distinfo Mon Mar 14 10:08:53 2016 (r411053)
@@ -1,4 +1,4 @@
-SHA256 (doublecmd-0.6.6-src.tar.gz) = 40172d410b7f37608e702edcb36bdaf3b13ae65f065bf01bc99082c0b01f8610
-SIZE (doublecmd-0.6.6-src.tar.gz) = 6108433
+SHA256 (doublecmd-0.7.0-src.tar.gz) = 4c0bb537268f44c6571da20a68650ee0164d1db9a300666012a72e8e3d7d6d20
+SIZE (doublecmd-0.7.0-src.tar.gz) = 6635488
SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39
SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996
Copied: branches/2016Q1/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr (from r411032, head/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q1/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr Mon Mar 14 10:08:53 2016 (r411053, copy of r411032, head/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr)
@@ -0,0 +1,11 @@
+--- plugins/wlx/WlxMplayer/src/wlxMplayer.lpr.orig 2016-01-13 13:19:01 UTC
++++ plugins/wlx/WlxMplayer/src/wlxMplayer.lpr
+@@ -258,7 +258,7 @@ var
+ sPlayerPath: String;
+ p: TMPlayer;
+ begin
+- pf:= TExProcess.Create('which mplayer');
++ pf:= TExProcess.Create('%%LOCALBASE%%/bin/mplayer');
+ try
+ pf.Execute;
+ if (pf.RezList.Count <> 0) then
Copied: branches/2016Q1/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas (from r411032, head/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q1/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas Mon Mar 14 10:08:53 2016 (r411053, copy of r411032, head/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas)
@@ -0,0 +1,18 @@
+--- src/dmhelpmanager.pas.orig 2016-01-13 13:34:47 UTC
++++ src/dmhelpmanager.pas
+@@ -106,12 +106,12 @@ begin
+ else
+ begin
+ gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']);
+- if not mbDirectoryExists(gpExePath + 'doc' + PathDelim + gHelpLang) then
++ if not mbDirectoryExists(gpDocsDir + PathDelim + gHelpLang) then
+ gHelpLang:= 'en';
+ 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
+ else begin
+ HTMLHelpDatabase.BaseURL:= 'http://doublecmd.github.io/doc/' + gHelpLang;
+ end;
Copied: branches/2016Q1/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas (from r411032, head/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2016Q1/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas Mon Mar 14 10:08:53 2016 (r411053, copy of r411032, head/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas)
@@ -0,0 +1,27 @@
+--- src/uGlobsPaths.pas.orig 2016-01-13 13:34:19 UTC
++++ src/uGlobsPaths.pas
+@@ -3,13 +3,14 @@ unit uGlobsPaths;
+ interface
+
+ var
+- gpExePath : String = ''; // executable directory
++ gpExePath : String = '%%DATADIR%%/'; // executable directory
+ gpCfgDir : String = ''; // directory from which configuration files are used
+ gpGlobalCfgDir : String = ''; // config dir global for all user
+ gpCmdLineCfgDir : String = ''; // config dir passed on the command line
+ gpLngDir : String = ''; // path to language *.po files
+ gpPixmapPath : String = ''; // path to pixmaps
+ gpCacheDir : String = ''; // cache directory
++ gpDocsDir : String = '%%DOCSDIR%%'; // directory for help files
+
+ //Global Configuration Filename
+ const
+@@ -36,7 +37,7 @@ end;
+ procedure LoadPaths;
+ begin
+ OnGetApplicationName := @GetAppName;
+- gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrU(0)));
++ //gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrU(0)));
+ DCDebug('Executable directory: ', gpExePath);
+
+ gpGlobalCfgDir := gpExePath;
More information about the svn-ports-all
mailing list