Attachment #166426 for bug #206840




# $FreeBSD: head/x11-fm/doublecmd/Makefile 404187 2015-12-21 19:39:32Z marino $

PORTNAME=	doublecmd
PORTVERSION=	0.7R6569
CATEGORIES=	x11-fm
MASTER_SITES=	http://bsd.sugaar.org/
DISTNAME=	${PORTNAME}-${PORTVERSION}-src
DISTFILES=	${DISTNAME}.tar.gz ${PORTNAME}-help-${HELPVERSION}-src.tar.gz



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


PLIST=		${WRKDIR}/pkg-plist

PROJECT_FILE=	src/doublecmd.lpi
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

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


		${WRKSRC}/plugins/wlx/WlxMplayer/src/wlxMplayer.lpr

do-build:
.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} \

Lines 1-4 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (doublecmd-0.6.6-src.tar.gz) = 40172d410b7f37608e702edcb36bdaf3b13ae65f065bf01bc99082c0b01f8610	1	SHA256 (doublecmd-0.7R6569-src.tar.gz) = 9c3b863bec16b0df8c5787bb1f5ae6bde792b50963c3a7902f051ecf568956d3
2	SIZE (doublecmd-0.6.6-src.tar.gz) = 6108433	2	SIZE (doublecmd-0.7R6569-src.tar.gz) = 6485628
3	SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39	3	SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39
4	SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996	4	SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996

Lines 1-11 Link Here

(-)./files/patch-plugins__wlx__WlxMplayer__src__wlxMplayer.lpr (-11 lines)
1	--- plugins/wlx/WlxMplayer/src/wlxMplayer.lpr.orig 2013-03-10 10:26:35 UTC
2	+++ plugins/wlx/WlxMplayer/src/wlxMplayer.lpr
3	@@ -258,7 +258,7 @@ var
4	sPlayerPath: String;
5	p: TMPlayer;
6	begin
7	- pf:= TExProcess.Create('which mplayer');
8	+ pf:= TExProcess.Create('%%LOCALBASE%%/bin/mplayer');
9	try
10	pf.Execute;
11	if (pf.RezList.Count <> 0) then

Line 0 Link Here

(-)./files/patch-plugins_wlx_WlxMplayer_src_wlxMplayer.lpr (+11 lines)
	1	--- plugins/wlx/WlxMplayer/src/wlxMplayer.lpr.orig 2016-01-13 13:19:01 UTC
	2	+++ plugins/wlx/WlxMplayer/src/wlxMplayer.lpr
	3	@@ -258,7 +258,7 @@ var
	4	sPlayerPath: String;
	5	p: TMPlayer;
	6	begin
	7	- pf:= TExProcess.Create('which mplayer');
	8	+ pf:= TExProcess.Create('%%LOCALBASE%%/bin/mplayer');
	9	try
	10	pf.Execute;
	11	if (pf.RezList.Count <> 0) then




--- 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}




--- 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;




--- 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;




--- 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;

Return to bug 206840

Lines 2-10 Link Here

(-)./Makefile (-9 / +5 lines)
2	# $FreeBSD: head/x11-fm/doublecmd/Makefile 404187 2015-12-21 19:39:32Z marino $	2	# $FreeBSD: head/x11-fm/doublecmd/Makefile 404187 2015-12-21 19:39:32Z marino $
3		3
4	PORTNAME= doublecmd	4	PORTNAME= doublecmd
5	PORTVERSION= 0.6.6	5	PORTVERSION= 0.7R6569
6	CATEGORIES= x11-fm	6	CATEGORIES= x11-fm
7	MASTER_SITES= SF/${PORTNAME}/Double%20Commander%20Source	7	MASTER_SITES= http://bsd.sugaar.org/
8	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	8	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
9	DISTFILES= ${DISTNAME}.tar.gz ${PORTNAME}-help-${HELPVERSION}-src.tar.gz	9	DISTFILES= ${DISTNAME}.tar.gz ${PORTNAME}-help-${HELPVERSION}-src.tar.gz
10		10
Lines 13-21 Link Here
13		13
14	LICENSE= GPLv2	14	LICENSE= GPLv2
15		15
16	BROKEN= fails with FPC-3.0.0-built Lazarus\
17	(Can't find unit uOverlayScrollBarFix)
18
19	BUILD_DEPENDS= lazbuild:${PORTSDIR}/editors/lazarus \	16	BUILD_DEPENDS= lazbuild:${PORTSDIR}/editors/lazarus \
20	fpcres:${PORTSDIR}/lang/fpc-utils	17	fpcres:${PORTSDIR}/lang/fpc-utils
21		18
Lines 32-38 Link Here
32	PLIST= ${WRKDIR}/pkg-plist	29	PLIST= ${WRKDIR}/pkg-plist
33		30
34	PROJECT_FILE= src/doublecmd.lpi	31	PROJECT_FILE= src/doublecmd.lpi
35	LAZARUS_VER= 1.4.2	32	LAZARUS_VER= 1.6RC2
36	LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d --pcp=${WRKSRC}/tmppcp	33	LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild -d --pcp=${WRKSRC}/tmppcp
37	LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}	34	LAZARUS_DIR= ${LOCALBASE}/share/lazarus-${LAZARUS_VER}
38	MAKE_ENV+= LDVER=ld.bfd # for DragonFly	35	MAKE_ENV+= LDVER=ld.bfd # for DragonFly
Lines 104-110 Link Here
104	GTK2_USE= fpc=gtk2 gnome=gtk20	101	GTK2_USE= fpc=gtk2 gnome=gtk20
105	GTK2_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2	102	GTK2_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
106		103
107	QT4_USE= fpc=yes
108	QT4_LIB_DEPENDS= libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas	104	QT4_LIB_DEPENDS= libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
109	QT4_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt	105	QT4_BUILD_DEPENDS= ${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
110		106
Lines 141-148 Link Here
141	${WRKSRC}/plugins/wlx/WlxMplayer/src/wlxMplayer.lpr	137	${WRKSRC}/plugins/wlx/WlxMplayer/src/wlxMplayer.lpr
142		138
143	do-build:	139	do-build:
144	.for FILE in chsdet/chsdet.lpk CmdLine/cmdbox.lpk dcpcrypt/dcpcrypt.lpk \	140	.for FILE in chsdet/chsdet.lpk CmdLine/cmdbox.lpk multithreadprocs/multithreadprocslaz.lpk \
145	doublecmd/doublecmd_common.lpk KASToolBar/kascomp.lpk \	141	dcpcrypt/dcpcrypt.lpk doublecmd/doublecmd_common.lpk KASToolBar/kascomp.lpk \
146	viewer/viewerpackage.lpk gifanim/pkg_gifanim.lpk \	142	viewer/viewerpackage.lpk gifanim/pkg_gifanim.lpk \
147	ZVDateTimeCtrls/zvdatetimectrls.lpk	143	ZVDateTimeCtrls/zvdatetimectrls.lpk
148	@cd ${WRKSRC}/components && ${SETENV} ${MAKE_ENV} \	144	@cd ${WRKSRC}/components && ${SETENV} ${MAKE_ENV} \

Lines 1-16 Link Here

(-)./files/patch-src__dmhelpmanager.pas (-16 lines)
1	--- src/dmhelpmanager.pas.orig 2015-08-17 15:35:25 UTC
2	+++ src/dmhelpmanager.pas
3	@@ -69,11 +69,11 @@ begin
4	else
5	begin
6	gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']);
7	- if not mbDirectoryExists(gpExePath + 'doc' + PathDelim + gHelpLang) then
8	+ if not mbDirectoryExists(gpDocsDir + PathDelim + gHelpLang) then
9	gHelpLang:= 'en';
10	end;
11
12	- HTMLHelpDatabase.BaseURL:= 'file://' + gpExePath + 'doc' + PathDelim + gHelpLang;
13	+ HTMLHelpDatabase.BaseURL:= 'file://' + gpDocsDir + PathDelim + gHelpLang;
14	HTMLHelpDatabase.KeywordPrefix:= '/';
15
16	{$IFDEF MSWindows}

Lines 1-29 Link Here

(-)./files/patch-src__uGlobsPaths.pas (-29 lines)
1	--- src/uGlobsPaths.pas.orig 2015-08-17 15:35:25 UTC
2	+++ src/uGlobsPaths.pas
3	@@ -3,14 +3,15 @@ unit uGlobsPaths;
4	interface
5
6	var
7	- gpExePath : String = ''; // executable directory
8	+ gpExePath : String = '%%DATADIR%%/'; // executable directory
9	gpCfgDir : String = ''; // directory from which configuration files are used
10	gpGlobalCfgDir : String = ''; // config dir global for all user
11	gpCmdLineCfgDir : String = ''; // config dir passed on the command line
12	gpLngDir : String = ''; // path to language *.po files
13	gpPixmapPath : String = ''; // path to pixmaps
14	gpCacheDir : UTF8String = ''; // cache directory
15	-
16	+ gpDocsDir : String = '%%DOCSDIR%%'; // directory for help files
17	+
18	procedure LoadPaths;
19	procedure UpdateEnvironmentVariable;
20
21	@@ -32,7 +33,7 @@ end;
22	procedure LoadPaths;
23	begin
24	OnGetApplicationName := @GetAppName;
25	- gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrU(0)));
26	+ //gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrU(0)));
27	DCDebug('Executable directory: ', gpExePath);
28
29	gpGlobalCfgDir := gpExePath;

Line 0 Link Here

(-)./files/patch-src_dmhelpmanager.pas (+18 lines)
	1	--- src/dmhelpmanager.pas.orig 2016-01-13 13:34:47 UTC
	2	+++ src/dmhelpmanager.pas
	3	@@ -106,12 +106,12 @@ begin
	4	else
	5	begin
	6	gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']);
	7	- if not mbDirectoryExists(gpExePath + 'doc' + PathDelim + gHelpLang) then
	8	+ if not mbDirectoryExists(gpDocsDir + PathDelim + gHelpLang) then
	9	gHelpLang:= 'en';
	10	end;
	11
	12	- if mbDirectoryExists(gpExePath + 'doc' + PathDelim + gHelpLang) then
	13	- HTMLHelpDatabase.BaseURL:= 'file://' + gpExePath + 'doc' + PathDelim + gHelpLang
	14	+ if mbDirectoryExists(gpDocsDir + PathDelim + gHelpLang) then
	15	+ HTMLHelpDatabase.BaseURL:= 'file://' + gpDocsDir + PathDelim + gHelpLang
	16	else begin
	17	HTMLHelpDatabase.BaseURL:= 'http://doublecmd.github.io/doc/' + gHelpLang;
	18	end;

Line 0 Link Here

(-)./files/patch-src_uGlobsPaths.pas (+27 lines)
	1	--- src/uGlobsPaths.pas.orig 2016-01-13 13:34:19 UTC
	2	+++ src/uGlobsPaths.pas
	3	@@ -3,13 +3,14 @@ unit uGlobsPaths;
	4	interface
	5
	6	var
	7	- gpExePath : String = ''; // executable directory
	8	+ gpExePath : String = '%%DATADIR%%/'; // executable directory
	9	gpCfgDir : String = ''; // directory from which configuration files are used
	10	gpGlobalCfgDir : String = ''; // config dir global for all user
	11	gpCmdLineCfgDir : String = ''; // config dir passed on the command line
	12	gpLngDir : String = ''; // path to language *.po files
	13	gpPixmapPath : String = ''; // path to pixmaps
	14	gpCacheDir : String = ''; // cache directory
	15	+ gpDocsDir : String = '%%DOCSDIR%%'; // directory for help files
	16
	17	//Global Configuration Filename
	18	const
	19	@@ -36,7 +37,7 @@ end;
	20	procedure LoadPaths;
	21	begin
	22	OnGetApplicationName := @GetAppName;
	23	- gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrU(0)));
	24	+ //gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrU(0)));
	25	DCDebug('Executable directory: ', gpExePath);
	26
	27	gpGlobalCfgDir := gpExePath;