Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Apr 2012 21:08:25 GMT
From:      Beñat Gonzalez Etxepare <bbtruk@users.sourceforge.net>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/167278: [update] x11-fm/doublecmd -- update to 0.5.4
Message-ID:  <201204242108.q3OL8P49046055@red.freebsd.org>
Resent-Message-ID: <201204242110.q3OLA8kd081359@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         167278
>Category:       ports
>Synopsis:       [update] x11-fm/doublecmd -- update to 0.5.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 24 21:10:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Beñat Gonzalez Etxepare
>Release:        
>Organization:
>Environment:
>Description:
Update to 0.5.4
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- ../doublecmd/./files/patch-src-uGlobsPaths.pas	2012-04-19 09:11:18.000000000 +0200
+++ ./files/patch-src-uGlobsPaths.pas	2012-04-24 20:35:21.213162000 +0200
@@ -1,40 +1,41 @@
---- src/uGlobsPaths.pas	2012-03-31 18:38:11.000000000 -0500
-+++ src/uGlobsPaths.pas	2012-03-31 18:51:02.000000000 -0500
-@@ -3,7 +3,7 @@
+--- 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 = '';  // config dir global for all user
++  gpGlobalCfgDir : String = '%%DATADIR%%';  // config dir global for all user
    gpCmdLineCfgDir : String = ''; // config dir passed on the command line
-@@ -26,10 +26,10 @@
- procedure LoadPaths;
- begin
-   OnGetApplicationName := @GetAppName;
--  gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrUTF8(0)));
-+//  gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrUTF8(0)));
+   gpLngDir : String = '';  // path to language *.po files
+   gpPixmapPath : String = '';  // path to pixmaps
+@@ -29,7 +29,7 @@
+   gpExePath := ExtractFilePath(TryReadAllLinks(ParamStrUTF8(0)));
    DCDebug('Executable directory: ', gpExePath);
    
 -  gpGlobalCfgDir := gpExePath;
-+  gpGlobalCfgDir := '%%DATADIR%%';
++  //gpGlobalCfgDir := gpExePath;
    if gpCmdLineCfgDir <> EmptyStr then
    begin
      if GetPathType(gpCmdLineCfgDir) <> ptAbsolute then
-@@ -48,12 +48,12 @@
+@@ -48,13 +48,13 @@
    end;
  
    gpCfgDir := IncludeTrailingPathDelimiter(gpCfgDir);
 -  gpLngDir := gpExePath + 'language' + DirectorySeparator;
 -  gpPixmapPath := gpExePath + 'pixmaps' + DirectorySeparator;
-+  gpLngDir :=  '%%DATADIR%%/' + 'language' + DirectorySeparator;
++  gpLngDir := '%%DATADIR%%/' + 'language' + DirectorySeparator;
 +  gpPixmapPath := '%%DATADIR%%/' + 'pixmaps' + DirectorySeparator;
    gpCacheDir := GetAppCacheDir;
  
    // set up environment variables
--  mbSetEnvironmentVariable('commander_path', ExcludeTrailingBackslash(gpExePath));
-+  mbSetEnvironmentVariable('commander_path', ExcludeTrailingBackslash('%%DATADIR%%/'));
+-  mbSetEnvironmentVariable('COMMANDER_DRIVE', ExtractRootDir(gpExePath));
+-  mbSetEnvironmentVariable('COMMANDER_PATH', ExcludeTrailingBackslash(gpExePath));
++  mbSetEnvironmentVariable('COMMANDER_DRIVE', ExtractRootDir('%%DATADIR%%'));
++  mbSetEnvironmentVariable('COMMANDER_PATH', ExcludeTrailingBackslash('%%DATADIR%%'));
  end;
  
  end.
--- ../doublecmd/./files/patch-src-dmhelpmanager.pas	2012-04-19 09:11:18.000000000 +0200
+++ ./files/patch-src-dmhelpmanager.pas	2012-01-15 02:46:15.465598000 +0100
@@ -1,16 +1,27 @@
---- src/dmhelpmanager.pas	2012-03-31 17:53:05.000000000 -0500
-+++ src/dmhelpmanager.pas	2012-03-31 17:53:05.000000000 -0500
-@@ -62,11 +62,11 @@
-   else
-     begin
-       gHelpLang:= ExtractDelimited(2, gPOFileName, ['.']);
--      if not mbDirectoryExists(gpExePath + 'doc' + PathDelim + gHelpLang) then
-+      if not mbDirectoryExists('/usr/local/share/doc/doublecmd' + PathDelim + gHelpLang) then
-         gHelpLang:= 'en';
-     end;
- 
--  HTMLHelpDatabase.BaseURL:= 'file://' + gpExePath + 'doc' + PathDelim + gHelpLang;
-+  HTMLHelpDatabase.BaseURL:= 'file:///usr/local/share/doc/doublecmd' + PathDelim + gHelpLang;
-   HTMLHelpDatabase.KeywordPrefix:= '/';
- 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;
+  
--- ../doublecmd/./Makefile	2012-04-19 09:11:18.000000000 +0200
+++ ./Makefile	2012-04-24 20:14:02.178647000 +0200
@@ -1,17 +1,17 @@
-# New ports collection makefile for:   doublecmd
-# Date created:                01 Oct 2011
-# Whom:                        Beñat Gonzalez Etxepare <bbtruk@users.sourceforge.net>
+# 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.1
+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-${PORTVERSION}-src.tar.gz
+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
@@ -20,6 +20,7 @@
 
 ONLY_FOR_ARCHS=	i386 amd64
 
+MAN1=		${PORTNAME}.1
 USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.*\.(pas)
 USE_GNOME=	desktopfileutils
@@ -28,7 +29,7 @@
 PROJECT_FILE=	src/doublecmd.lpi
 LAZBUILD_CMD=	${LOCALBASE}/bin/lazbuild
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-DOCSRC=		${WRKDIR}/${PORTNAME}-help-${PORTVERSION}
+DOCSRC=		${WRKDIR}/${PORTNAME}-help-0.5.1
 
 .include <bsd.port.pre.mk>
 
@@ -105,10 +106,11 @@
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DATADIR}
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/doublecmd ${PREFIX}/bin/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/install/linux/doublecmd.desktop ${PREFIX}/share/applications/doublecmd.desktop
+	${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>
--- ../doublecmd/./distinfo	2012-04-19 09:11:18.000000000 +0200
+++ ./distinfo	2012-04-24 20:14:29.052517866 +0200
@@ -1,4 +1,4 @@
-SHA256 (doublecmd-0.5.1-src.tar.gz) = 763fcd5e22b471657a812bbfe15a75b6be8c73c1ed39f1e67ff31cbcd502a4e2
-SIZE (doublecmd-0.5.1-src.tar.gz) = 2520143
+SHA256 (doublecmd-0.5.4-src.tar.gz) = 480b83279adeba007ad5c54f455733fae3d9c9ee61762e6b5a63e2e67b1cd7b7
+SIZE (doublecmd-0.5.4-src.tar.gz) = 2658473
 SHA256 (doublecmd-help-0.5.1-src.tar.gz) = d9f518e05e089b71aaa31c7d4af8177e77594a02be2c316e85e061e63b4c03e5
 SIZE (doublecmd-help-0.5.1-src.tar.gz) = 10757382


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204242108.q3OL8P49046055>