svn commit: r411032 - in head/x11-fm/doublecmd: . files
Thomas Zander
riggs at FreeBSD.org
Sun Mar 13 21:39:39 UTC 2016
Author: riggs
Date: Sun Mar 13 21:39:37 2016
New Revision: 411032
URL: https://svnweb.freebsd.org/changeset/ports/411032
Log:
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)
MFH: 2016Q1
Added:
head/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr
- copied, changed from r411031, head/x11-fm/doublecmd/files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr
head/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas
- copied, changed from r411031, head/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas
head/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas
- copied, changed from r411031, head/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas
Deleted:
head/x11-fm/doublecmd/files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr
head/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas
head/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas
Modified:
head/x11-fm/doublecmd/Makefile
head/x11-fm/doublecmd/distinfo
Modified: head/x11-fm/doublecmd/Makefile
==============================================================================
--- head/x11-fm/doublecmd/Makefile Sun Mar 13 21:16:26 2016 (r411031)
+++ head/x11-fm/doublecmd/Makefile Sun Mar 13 21:39:37 2016 (r411032)
@@ -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
@@ -32,7 +29,7 @@ WANT_GNOME= yes
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 @@ 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: head/x11-fm/doublecmd/distinfo
==============================================================================
--- head/x11-fm/doublecmd/distinfo Sun Mar 13 21:16:26 2016 (r411031)
+++ head/x11-fm/doublecmd/distinfo Sun Mar 13 21:39:37 2016 (r411032)
@@ -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 and modified: head/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr (from r411031, head/x11-fm/doublecmd/files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr)
==============================================================================
--- head/x11-fm/doublecmd/files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr Sun Mar 13 21:16:26 2016 (r411031, copy source)
+++ head/x11-fm/doublecmd/files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr Sun Mar 13 21:39:37 2016 (r411032)
@@ -1,4 +1,4 @@
---- plugins/wlx/WlxMplayer/src/wlxMplayer.lpr.orig 2013-03-10 10:26:35 UTC
+--- 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;
Copied and modified: head/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas (from r411031, head/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas)
==============================================================================
--- head/x11-fm/doublecmd/files/patch-src__dmhelpmanager.pas Sun Mar 13 21:16:26 2016 (r411031, copy source)
+++ head/x11-fm/doublecmd/files/patch-src_dmhelpmanager.pas Sun Mar 13 21:39:37 2016 (r411032)
@@ -1,6 +1,6 @@
---- src/dmhelpmanager.pas.orig 2015-08-17 15:35:25 UTC
+--- src/dmhelpmanager.pas.orig 2016-01-13 13:34:47 UTC
+++ src/dmhelpmanager.pas
-@@ -69,11 +69,11 @@ begin
+@@ -106,12 +106,12 @@ begin
else
begin
gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']);
@@ -9,8 +9,10 @@
gHelpLang:= 'en';
end;
-- HTMLHelpDatabase.BaseURL:= 'file://' + gpExePath + 'doc' + PathDelim + gHelpLang;
-+ HTMLHelpDatabase.BaseURL:= 'file://' + gpDocsDir + PathDelim + gHelpLang;
- HTMLHelpDatabase.KeywordPrefix:= '/';
-
- {$IFDEF MSWindows}
+- 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 and modified: head/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas (from r411031, head/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas)
==============================================================================
--- head/x11-fm/doublecmd/files/patch-src__uGlobsPaths.pas Sun Mar 13 21:16:26 2016 (r411031, copy source)
+++ head/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas Sun Mar 13 21:39:37 2016 (r411032)
@@ -1,6 +1,6 @@
---- src/uGlobsPaths.pas.orig 2015-08-17 15:35:25 UTC
+--- src/uGlobsPaths.pas.orig 2016-01-13 13:34:19 UTC
+++ src/uGlobsPaths.pas
-@@ -3,14 +3,15 @@ unit uGlobsPaths;
+@@ -3,13 +3,14 @@ unit uGlobsPaths;
interface
var
@@ -11,14 +11,12 @@
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
--
+ gpCacheDir : String = ''; // cache directory
+ gpDocsDir : String = '%%DOCSDIR%%'; // directory for help files
-+
- procedure LoadPaths;
- procedure UpdateEnvironmentVariable;
-@@ -32,7 +33,7 @@ end;
+ //Global Configuration Filename
+ const
+@@ -36,7 +37,7 @@ end;
procedure LoadPaths;
begin
OnGetApplicationName := @GetAppName;
More information about the svn-ports-all
mailing list