diff -ruN /usr/ports/x11-fm/doublecmd/Makefile ./Makefile --- /usr/ports/x11-fm/doublecmd/Makefile 2015-12-21 20:39:32.000000000 +0100 +++ ./Makefile 2016-02-02 10:54:11.000000000 +0100 @@ -2,9 +2,9 @@ # $FreeBSD: head/x11-fm/doublecmd/Makefile 404187 2015-12-21 19:39:32Z marino $ PORTNAME= doublecmd -PORTVERSION= 0.6.6 +PORTVERSION= 0.7R6569 CATEGORIES= x11-fm -MASTER_SITES= SF/${PORTNAME}/Double%20Commander%20Source +MASTER_SITES= http://bsd.sugaar.org/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src DISTFILES= ${DISTNAME}.tar.gz ${PORTNAME}-help-${HELPVERSION}-src.tar.gz @@ -13,9 +13,6 @@ 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 @@ -32,7 +29,7 @@ PLIST= ${WRKDIR}/pkg-plist PROJECT_FILE= src/doublecmd.lpi -LAZARUS_VER= 1.4.2 +LAZARUS_VER= 1.6RC2 LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d --pcp=${WRKSRC}/tmppcp LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER} MAKE_ENV+= LDVER=ld.bfd # for DragonFly @@ -104,7 +101,6 @@ 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,8 +137,8 @@ ${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 \ +.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 \ ZVDateTimeCtrls/zvdatetimectrls.lpk @cd ${WRKSRC}/components && ${SETENV} ${MAKE_ENV} \ diff -ruN /usr/ports/x11-fm/doublecmd/distinfo ./distinfo --- /usr/ports/x11-fm/doublecmd/distinfo 2015-10-20 18:22:53.000000000 +0200 +++ ./distinfo 2016-02-02 10:58:14.097050772 +0100 @@ -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.7R6569-src.tar.gz) = 9c3b863bec16b0df8c5787bb1f5ae6bde792b50963c3a7902f051ecf568956d3 +SIZE (doublecmd-0.7R6569-src.tar.gz) = 6485628 SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39 SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996 diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr ./files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr --- /usr/ports/x11-fm/doublecmd/files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr 2015-08-18 12:11:05.000000000 +0200 +++ ./files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- plugins/wlx/WlxMplayer/src/wlxMplayer.lpr.orig 2013-03-10 10:26:35 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 diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr ./files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr --- /usr/ports/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr 2016-02-02 10:58:14.102026055 +0100 @@ -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 diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas ./files/patch-src__dmhelpmanager.pas --- /usr/ports/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas 2015-08-18 12:11:05.000000000 +0200 +++ ./files/patch-src__dmhelpmanager.pas 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ ---- src/dmhelpmanager.pas.orig 2015-08-17 15:35:25 UTC -+++ src/dmhelpmanager.pas -@@ -69,11 +69,11 @@ 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; - -- HTMLHelpDatabase.BaseURL:= 'file://' + gpExePath + 'doc' + PathDelim + gHelpLang; -+ HTMLHelpDatabase.BaseURL:= 'file://' + gpDocsDir + PathDelim + gHelpLang; - HTMLHelpDatabase.KeywordPrefix:= '/'; - - {$IFDEF MSWindows} diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas ./files/patch-src__uGlobsPaths.pas --- /usr/ports/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas 2015-08-18 12:11:05.000000000 +0200 +++ ./files/patch-src__uGlobsPaths.pas 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ ---- src/uGlobsPaths.pas.orig 2015-08-17 15:35:25 UTC -+++ src/uGlobsPaths.pas -@@ -3,14 +3,15 @@ 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 : UTF8String = ''; // cache directory -- -+ gpDocsDir : String = '%%DOCSDIR%%'; // directory for help files -+ - procedure LoadPaths; - procedure UpdateEnvironmentVariable; - -@@ -32,7 +33,7 @@ end; - procedure LoadPaths; - begin - OnGetApplicationName := @GetAppName; -- gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrU(0))); -+ //gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrU(0))); - DCDebug('Executable directory: ', gpExePath); - - gpGlobalCfgDir := gpExePath; diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas ./files/patch-src_dmhelpmanager.pas --- /usr/ports/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-src_dmhelpmanager.pas 2016-02-02 10:58:14.113025646 +0100 @@ -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; diff -ruN /usr/ports/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas ./files/patch-src_uGlobsPaths.pas --- /usr/ports/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-src_uGlobsPaths.pas 2016-02-02 10:58:14.115089175 +0100 @@ -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;