Attachment #123855 for bug #167278




--- src/uGlobsPaths.pas.old	2012-02-14 04:46:22.000000000 +0100
+++ src/uGlobsPaths.pas	2012-04-24 20:34:12.000000000 +0200
@@ -3,9 +3,9 @@
 interface
 
 var
-  gpExePath : String = '';  // executable directory
+  gpExePath : String = '%%PREFIX%%/bin';  // executable directory
   gpCfgDir : String = '';  // directory from which configuration files are used
-  gpGlobalCfgDir : String = '';  // config dir global for all user
+  gpGlobalCfgDir : String = '%%DATADIR%%';  // 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
@@ -29,7 +29,7 @@
   gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrUTF8(0)));
-  gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrUTF8(0)));
+//  gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrUTF8(0)));
   DCDebug('Executable directory: ', gpExePath);
   
-  gpGlobalCfgDir := gpExePath;
+  //gpGlobalCfgDir := gpExePath;
   if gpCmdLineCfgDir <> EmptyStr then
   begin
     if GetPathType(gpCmdLineCfgDir) <> ptAbsolute then
@@ -48,13 +48,13 @@
   end;
 
   gpCfgDir := IncludeTrailingPathDelimiter(gpCfgDir);
-  gpLngDir := gpExePath + 'language' + DirectorySeparator;
-  gpPixmapPath := gpExePath + 'pixmaps' + DirectorySeparator;
+  gpLngDir := '%%DATADIR%%/' + 'language' + DirectorySeparator;
+  gpPixmapPath := '%%DATADIR%%/' + 'pixmaps' + DirectorySeparator;
   gpCacheDir := GetAppCacheDir;
 
   // set up environment variables
-  mbSetEnvironmentVariable('COMMANDER_DRIVE', ExtractRootDir(gpExePath));
-  mbSetEnvironmentVariable('COMMANDER_PATH', ExcludeTrailingBackslash(gpExePath));
+  mbSetEnvironmentVariable('COMMANDER_DRIVE', ExtractRootDir('%%DATADIR%%'));
+  mbSetEnvironmentVariable('COMMANDER_PATH', ExcludeTrailingBackslash('%%DATADIR%%'));
 end;
 
 end.




*** src/dmhelpmanager.pas	Tue Feb  1 19:25:55 2011
--- src/dmhelpmanager.pas	Sun Oct  9 20:48:57 2011
***************
*** 62,72 ****
    else
      begin
        gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']);
!       if not mbDirectoryExists(gpExePath + 'doc' + PathDelim + gHelpLang) then
          gHelpLang:= 'en';
      end;
  
!   HTMLHelpDatabase.BaseURL:= 'file://' + gpExePath + 'doc' + PathDelim + gHelpLang;
    HTMLHelpDatabase.KeywordPrefix:= '/';
  end;
  
--- 62,72 ----
    else
      begin
        gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']);
!       if not mbDirectoryExists('%%DOCSDIR%%' + PathDelim + gHelpLang) then
          gHelpLang:= 'en';
      end;
  
!   HTMLHelpDatabase.BaseURL:= 'file://%%DOCSDIR%%' + PathDelim + gHelpLang;
    HTMLHelpDatabase.KeywordPrefix:= '/';
  end;
  




# New ports collection makefile for:	doublecmd
# Date created:			01 Oct 2011
# Whom:				Beñat Gonzalez Etxepare <bbtruk@users.sourceforge.net>
#
# $FreeBSD: ports/x11-fm/doublecmd/Makefile,v 1.1 2012/04/19 07:11:18 acm Exp $
#

PORTNAME=	doublecmd
PORTVERSION=	0.5.4
CATEGORIES=	x11-fm
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}/Double%20Commander%20Source
DISTNAME=	${PORTNAME}-${PORTVERSION}-src
DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tar.gz ${PORTNAME}-help-0.5.1-src.tar.gz

MAINTAINER=	bbtruk@users.sourceforge.net
COMMENT=	A Total Commander like file manager for the X Window System


ONLY_FOR_ARCHS=	i386 amd64

MAN1=		${PORTNAME}.1
USE_DOS2UNIX=	yes
DOS2UNIX_REGEX=	.*\.(pas)
USE_GNOME=	desktopfileutils

PROJECT_FILE=	src/doublecmd.lpi
LAZBUILD_CMD=	${LOCALBASE}/bin/lazbuild
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
DOCSRC=		${WRKDIR}/${PORTNAME}-help-0.5.1

.include <bsd.port.pre.mk>


	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DATADIR}
.endfor
	${INSTALL_PROGRAM} ${WRKSRC}/doublecmd ${PREFIX}/bin/${PORTNAME}
	${INSTALL_DATA} ${WRKSRC}/install/linux/${PORTNAME}.desktop ${PREFIX}/share/applications/

post-install:
	-@update-desktop-database
	${INSTALL_MAN} ${WRKSRC}/install/linux/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/
	@${CAT} ${PKGMESSAGE}

.include <bsd.port.post.mk>

Lines 1-4 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (doublecmd-0.5.1-src.tar.gz) = 763fcd5e22b471657a812bbfe15a75b6be8c73c1ed39f1e67ff31cbcd502a4e2	1	SHA256 (doublecmd-0.5.4-src.tar.gz) = 480b83279adeba007ad5c54f455733fae3d9c9ee61762e6b5a63e2e67b1cd7b7
2	SIZE (doublecmd-0.5.1-src.tar.gz) = 2520143	2	SIZE (doublecmd-0.5.4-src.tar.gz) = 2658473
3	SHA256 (doublecmd-help-0.5.1-src.tar.gz) = d9f518e05e089b71aaa31c7d4af8177e77594a02be2c316e85e061e63b4c03e5	3	SHA256 (doublecmd-help-0.5.1-src.tar.gz) = d9f518e05e089b71aaa31c7d4af8177e77594a02be2c316e85e061e63b4c03e5
4	SIZE (doublecmd-help-0.5.1-src.tar.gz) = 10757382	4	SIZE (doublecmd-help-0.5.1-src.tar.gz) = 10757382

Return to bug 167278

Lines 1-40 Link Here

(-)./files/patch-src-uGlobsPaths.pas (-15 / +16 lines)
1	--- src/uGlobsPaths.pas 2012-03-31 18:38:11.000000000 -0500	1	--- src/uGlobsPaths.pas.old 2012-02-14 04:46:22.000000000 +0100
2	+++ src/uGlobsPaths.pas 2012-03-31 18:51:02.000000000 -0500	2	+++ src/uGlobsPaths.pas 2012-04-24 20:34:12.000000000 +0200
3	@@ -3,7 +3,7 @@	3	@@ -3,9 +3,9 @@
4	interface	4	interface
5		5
6	var	6	var
7	- gpExePath : String = ''; // executable directory	7	- gpExePath : String = ''; // executable directory
8	+ gpExePath : String = '%%PREFIX%%/bin'; // executable directory	8	+ gpExePath : String = '%%PREFIX%%/bin'; // executable directory
9	gpCfgDir : String = ''; // directory from which configuration files are used	9	gpCfgDir : String = ''; // directory from which configuration files are used
10	gpGlobalCfgDir : String = ''; // config dir global for all user	10	- gpGlobalCfgDir : String = ''; // config dir global for all user
		11	+ gpGlobalCfgDir : String = '%%DATADIR%%'; // config dir global for all user
11	gpCmdLineCfgDir : String = ''; // config dir passed on the command line	12	gpCmdLineCfgDir : String = ''; // config dir passed on the command line
12	@@ -26,10 +26,10 @@	13	gpLngDir : String = ''; // path to language *.po files
13	procedure LoadPaths;	14	gpPixmapPath : String = ''; // path to pixmaps
14	begin	15	@@ -29,7 +29,7 @@
15	OnGetApplicationName := @GetAppName;	16	gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrUTF8(0)));
16	- gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrUTF8(0)));
17	+// gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrUTF8(0)));
18	DCDebug('Executable directory: ', gpExePath);	17	DCDebug('Executable directory: ', gpExePath);
19		18
20	- gpGlobalCfgDir := gpExePath;	19	- gpGlobalCfgDir := gpExePath;
21	+ gpGlobalCfgDir := '%%DATADIR%%';	20	+ //gpGlobalCfgDir := gpExePath;
22	if gpCmdLineCfgDir <> EmptyStr then	21	if gpCmdLineCfgDir <> EmptyStr then
23	begin	22	begin
24	if GetPathType(gpCmdLineCfgDir) <> ptAbsolute then	23	if GetPathType(gpCmdLineCfgDir) <> ptAbsolute then
25	@@ -48,12 +48,12 @@	24	@@ -48,13 +48,13 @@
26	end;	25	end;
27		26
28	gpCfgDir := IncludeTrailingPathDelimiter(gpCfgDir);	27	gpCfgDir := IncludeTrailingPathDelimiter(gpCfgDir);
29	- gpLngDir := gpExePath + 'language' + DirectorySeparator;	28	- gpLngDir := gpExePath + 'language' + DirectorySeparator;
30	- gpPixmapPath := gpExePath + 'pixmaps' + DirectorySeparator;	29	- gpPixmapPath := gpExePath + 'pixmaps' + DirectorySeparator;
31	+ gpLngDir := '%%DATADIR%%/' + 'language' + DirectorySeparator;	30	+ gpLngDir := '%%DATADIR%%/' + 'language' + DirectorySeparator;
32	+ gpPixmapPath := '%%DATADIR%%/' + 'pixmaps' + DirectorySeparator;	31	+ gpPixmapPath := '%%DATADIR%%/' + 'pixmaps' + DirectorySeparator;
33	gpCacheDir := GetAppCacheDir;	32	gpCacheDir := GetAppCacheDir;
34		33
35	// set up environment variables	34	// set up environment variables
36	- mbSetEnvironmentVariable('commander_path', ExcludeTrailingBackslash(gpExePath));	35	- mbSetEnvironmentVariable('COMMANDER_DRIVE', ExtractRootDir(gpExePath));
37	+ mbSetEnvironmentVariable('commander_path', ExcludeTrailingBackslash('%%DATADIR%%/'));	36	- mbSetEnvironmentVariable('COMMANDER_PATH', ExcludeTrailingBackslash(gpExePath));
		37	+ mbSetEnvironmentVariable('COMMANDER_DRIVE', ExtractRootDir('%%DATADIR%%'));
		38	+ mbSetEnvironmentVariable('COMMANDER_PATH', ExcludeTrailingBackslash('%%DATADIR%%'));
38	end;	39	end;
39		40
40	end.	41	end.

Lines 1-16 Link Here

(-)./files/patch-src-dmhelpmanager.pas (-16 / +27 lines)
1	--- src/dmhelpmanager.pas 2012-03-31 17:53:05.000000000 -0500	1	*** src/dmhelpmanager.pas Tue Feb 1 19:25:55 2011
2	+++ src/dmhelpmanager.pas 2012-03-31 17:53:05.000000000 -0500	2	--- src/dmhelpmanager.pas Sun Oct 9 20:48:57 2011
3	@@ -62,11 +62,11 @@	3	***************
4	else	4	* 62,72 **
5	begin	5	else
6	gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']);	6	begin
7	- if not mbDirectoryExists(gpExePath + 'doc' + PathDelim + gHelpLang) then	7	gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']);
8	+ if not mbDirectoryExists('/usr/local/share/doc/doublecmd' + PathDelim + gHelpLang) then	8	! if not mbDirectoryExists(gpExePath + 'doc' + PathDelim + gHelpLang) then
9	gHelpLang:= 'en';	9	gHelpLang:= 'en';
10	end;	10	end;
11		11
12	- HTMLHelpDatabase.BaseURL:= 'file://' + gpExePath + 'doc' + PathDelim + gHelpLang;	12	! HTMLHelpDatabase.BaseURL:= 'file://' + gpExePath + 'doc' + PathDelim + gHelpLang;
13	+ HTMLHelpDatabase.BaseURL:= 'file:///usr/local/share/doc/doublecmd' + PathDelim + gHelpLang;	13	HTMLHelpDatabase.KeywordPrefix:= '/';
14	HTMLHelpDatabase.KeywordPrefix:= '/';	14	end;
15	end;	15
16		16	--- 62,72 ----
		17	else
		18	begin
		19	gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']);
		20	! if not mbDirectoryExists('%%DOCSDIR%%' + PathDelim + gHelpLang) then
		21	gHelpLang:= 'en';
		22	end;
		23
		24	! HTMLHelpDatabase.BaseURL:= 'file://%%DOCSDIR%%' + PathDelim + gHelpLang;
		25	HTMLHelpDatabase.KeywordPrefix:= '/';
		26	end;
		27

Lines 1-17 Link Here

(-)./Makefile (-7 / +9 lines)
1	# New ports collection makefile for: doublecmd	1	# New ports collection makefile for: doublecmd
2	# Date created: 01 Oct 2011	2	# Date created: 01 Oct 2011
3	# Whom: Beñat Gonzalez Etxepare <bbtruk@users.sourceforge.net>	3	# Whom: Beñat Gonzalez Etxepare <bbtruk@users.sourceforge.net>
4	#	4	#
5	# $FreeBSD: ports/x11-fm/doublecmd/Makefile,v 1.1 2012/04/19 07:11:18 acm Exp $	5	# $FreeBSD: ports/x11-fm/doublecmd/Makefile,v 1.1 2012/04/19 07:11:18 acm Exp $
6	#	6	#
7		7
8	PORTNAME= doublecmd	8	PORTNAME= doublecmd
9	PORTVERSION= 0.5.1	9	PORTVERSION= 0.5.4
10	CATEGORIES= x11-fm	10	CATEGORIES= x11-fm
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}/Double%20Commander%20Source	12	MASTER_SITE_SUBDIR= ${PORTNAME}/Double%20Commander%20Source
13	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	13	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
14	DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tar.gz ${PORTNAME}-help-${PORTVERSION}-src.tar.gz	14	DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tar.gz ${PORTNAME}-help-0.5.1-src.tar.gz
15		15
16	MAINTAINER= bbtruk@users.sourceforge.net	16	MAINTAINER= bbtruk@users.sourceforge.net
17	COMMENT= A Total Commander like file manager for the X Window System	17	COMMENT= A Total Commander like file manager for the X Window System
Lines 20-25 Link Here
20		20
21	ONLY_FOR_ARCHS= i386 amd64	21	ONLY_FOR_ARCHS= i386 amd64
22		22
		23	MAN1= ${PORTNAME}.1
23	USE_DOS2UNIX= yes	24	USE_DOS2UNIX= yes
24	DOS2UNIX_REGEX= .*\.(pas)	25	DOS2UNIX_REGEX= .*\.(pas)
25	USE_GNOME= desktopfileutils	26	USE_GNOME= desktopfileutils
Lines 28-34 Link Here
28	PROJECT_FILE= src/doublecmd.lpi	29	PROJECT_FILE= src/doublecmd.lpi
29	LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild	30	LAZBUILD_CMD= ${LOCALBASE}/bin/lazbuild
30	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	31	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
31	DOCSRC= ${WRKDIR}/${PORTNAME}-help-${PORTVERSION}	32	DOCSRC= ${WRKDIR}/${PORTNAME}-help-0.5.1
32		33
33	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
34		35
Lines 105-114 Link Here
105	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DATADIR}	106	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DATADIR}
106	.endfor	107	.endfor
107	${INSTALL_PROGRAM} ${WRKSRC}/doublecmd ${PREFIX}/bin/${PORTNAME}	108	${INSTALL_PROGRAM} ${WRKSRC}/doublecmd ${PREFIX}/bin/${PORTNAME}
108	${INSTALL_DATA} ${WRKSRC}/install/linux/doublecmd.desktop ${PREFIX}/share/applications/doublecmd.desktop	109	${INSTALL_DATA} ${WRKSRC}/install/linux/${PORTNAME}.desktop ${PREFIX}/share/applications/
109		110
110	post-install:	111	post-install:
111	-@update-desktop-database	112	-@update-desktop-database
		113	${INSTALL_MAN} ${WRKSRC}/install/linux/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/
112	@${CAT} ${PKGMESSAGE}	114	@${CAT} ${PKGMESSAGE}
113		115
114	.include <bsd.port.post.mk>	116	.include <bsd.port.post.mk>