3 files changed, 47 insertions, 26 deletions

diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index f5e556dad547..af8e79070c20 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -6,36 +6,53 @@
 #
 
 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
 
-BUILD_DEPENDS=	lazbuild:${PORTSDIR}/editors/lazarus
-
-BROKEN=		does not build
+BUILD_DEPENDS=	lazbuild:${PORTSDIR}/editors/lazarus \
+		fpcres:${PORTSDIR}/lang/fpc-utils
 
 ONLY_FOR_ARCHS=	i386 amd64
 
+MAN1=		${PORTNAME}.1
 USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.*\.(pas)
+USE_FPC=	yes
 USE_GNOME=	desktopfileutils
 PLIST=		${WRKDIR}/pkg-plist
 SUB_FILES=	pkg-message
 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
+
+OPTIONS=	GTK2	"Use gtk20 interface" on \
+		QT4	"Use qt4 interface" off
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/bin/lazbuild) && exists(${LOCALBASE}/etc/lazbuild.cfg)
-.include "${LOCALBASE}/etc/lazbuild.cfg"
+.if (defined(WITH_GTK2) && defined(WITH_QT4)) || (!defined(WITH_GTK2) && !defined(WITH_QT4))
+IGNORE=		please select one option: QT4 or GTK2
+.endif
+
+.if defined(WITH_GTK2)
+USE_FPC+=	gtk2
+USE_GNOME=	gtk20 gdkpixbuf
+LCL_PLATFORM=	gtk2
+BUILD_DEPENDS+=	${LOCALBASE}/share/lazarus/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
+.endif
+
+.if defined(WITH_QT4)
+LIB_DEPENDS+=	Qt4Pas.5:${PORTSDIR}/x11-toolkits/qt4pas
+LCL_PLATFORM=	qt
+BUILD_DEPENDS+=	${LOCALBASE}/share/lazarus/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
 .endif
 
 post-patch:
@@ -88,6 +105,7 @@ pre-install:
 
 	@${ECHO_CMD} "@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true" >> ${PLIST}
 	@${ECHO_CMD} "@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true" >> ${PLIST}
+	@${ECHO_CMD} "@dirrmtry share/applications" >> ${PLIST}
 
 do-install:
 .for DIRE in language pixmaps sdk
@@ -107,10 +125,12 @@ do-install:
 	${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
+	@${MKDIR} ${DESKTOPDIR}
+	${INSTALL_DATA} ${WRKSRC}/install/linux/${PORTNAME}.desktop ${DESKTOPDIR}/
 
 post-install:
 	-@update-desktop-database
+	${INSTALL_MAN} ${WRKSRC}/install/linux/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/x11-fm/doublecmd/distinfo b/x11-fm/doublecmd/distinfo
index 42de0def4048..50774e8a4e41 100644
--- a/x11-fm/doublecmd/distinfo
+++ b/x11-fm/doublecmd/distinfo
@@ -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
diff --git a/x11-fm/doublecmd/files/patch-src-uGlobsPaths.pas b/x11-fm/doublecmd/files/patch-src-uGlobsPaths.pas
index 9ffd9762f8b2..f5ad71ccb55a 100644
--- a/x11-fm/doublecmd/files/patch-src-uGlobsPaths.pas
+++ b/x11-fm/doublecmd/files/patch-src-uGlobsPaths.pas
@@ -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.