x11-fm/doublecmd: update to version 0.8.1

PR:		224736
Submitted by:	Beñat Gonzalez Etxepare <bbtruk@users.sourceforge.net> (maintainer)

4 files changed, 58 insertions, 18 deletions

diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index 7c7ca65e2148..751a928417c3 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	doublecmd
-PORTVERSION=	0.7.8
-PORTREVISION=	5
+PORTVERSION=	0.8.1
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF/${PORTNAME}/Double%20Commander%20Source
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -14,16 +13,16 @@ COMMENT=	Total Commander like file manager for the X Window System
 
 LICENSE=	GPLv2
 
+ONLY_FOR_ARCHS=	amd64 i386
+
 BUILD_DEPENDS=	lazbuild:editors/lazarus \
 		fpcres:lang/fpc-utils
 
-ONLY_FOR_ARCHS=	i386 amd64
-
 PORTDOCS=	*
 
 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
+		fcl-xml iconvenc pasjpeg rtl-extra x11 regexpr
 USE_XORG=	x11
 DOS2UNIX_FILES=	src/dmhelpmanager.pas
 
@@ -49,11 +48,13 @@ OPTIONS_GROUP_WCX=	WCX_CPIO \
 			WCX_UNBZ2 \
 			WCX_UNRAR \
 			WCX_ZIP
-OPTIONS_GROUP_WDX=	WDX_RPM \
+OPTIONS_GROUP_WDX=	WDX_AUDIOINFO \
+			WDX_RPM \
 			WDX_DEB \
 			WDX_SVN \
 			WDX_XPI \
-			WDX_SCRIPTS
+			WDX_SCRIPTS \
+			WDX_TEXTLINE
 OPTIONS_GROUP_WFX=	WFX_FTP \
 			WFX_SAMBA
 OPTIONS_GROUP_WLX=	WLX_MPLAYER
@@ -68,11 +69,13 @@ WCX_UNRAR_DESC=	RAR format support
 WCX_ZIP_DESC=	ZIP format support
 
 WDX_DESC=	Plugins to display and search extended file attributes
+WDX_AUDIOINFO_DESC=	Information about audio files
 WDX_DEB_DESC=	Debian package file information
 WDX_RPM_DESC=	Red Hat package file information
 WDX_SCRIPTS_DESC=	Add support to use custom Lua scripts
 WDX_SVN_DESC=	Subversion repository information
 WDX_XPI_DESC=	Mozilla plugin file information
+WDX_TEXTLINE_DESC=	Show and replace single lines in text files
 
 WFX_DESC=	File system plugins
 WFX_FTP_DESC=	FTP protocol support
@@ -90,10 +93,12 @@ OPTIONS_DEFAULT=	GTK2 \
 			WCX_RPM \
 			WCX_UNRAR \
 			WCX_ZIP \
+			WDX_AUDIOINFO \
 			WDX_RPM \
 			WDX_DEB \
 			WDX_SVN \
 			WDX_SCRIPTS \
+			WDX_TEXTLINE \
 			WDX_XPI \
 			WFX_FTP \
 			WFX_SAMBA \
@@ -104,6 +109,7 @@ GTK2_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interf
 
 QT4_LIB_DEPENDS=	libQt4Pas.so:x11-toolkits/qt4pas
 QT4_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
+QT4_BROKEN=		Does not build
 
 WCX_UNRAR_LIB_DEPENDS=	libunrar.so.5:archivers/libunrar5
 WFX_SAMBA_USES=		samba:lib
@@ -115,7 +121,6 @@ WLX_MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 LCL_PLATFORM=	gtk2
 USE_GNOME+=	cairo gdkpixbuf2
 .elif ${PORT_OPTIONS:MQT4}
-BROKEN=		Does not build
 LCL_PLATFORM=	qt
 .endif
 
@@ -142,7 +147,7 @@ post-patch:
 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
+	viewer/viewerpackage.lpk gifanim/pkg_gifanim.lpk synunihighlighter/synuni.lpk
 	@cd ${WRKSRC}/components && ${SETENV} ${MAKE_ENV} \
 		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "${FILE}"
 .endfor
@@ -172,6 +177,10 @@ do-build:
 		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/zip/src/Zip.lpi"
 .endif
 
+.if ${PORT_OPTIONS:MWDX_AUDIOINFO}
+	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
+		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/audioinfo/src/AudioInfo.lpi"
+.endif
 .if ${PORT_OPTIONS:MWDX_RPM}
 	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
 		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/rpm_wdx/src/rpm_wdx.lpi"
@@ -188,6 +197,10 @@ do-build:
 	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
 		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/xpi_wdx/src/xpi_wdx.lpi"
 .endif
+.if ${PORT_OPTIONS:MWDX_TEXTLINE}
+	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
+		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/textline/src/TextLine.lpi"
+.endif
 
 .if ${PORT_OPTIONS:MWFX_FTP}
 	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
@@ -242,6 +255,9 @@ pre-install:
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/zip/zip.wcx" >> ${PLIST}
 .endif
 
+.if ${PORT_OPTIONS:MWDX_AUDIOINFO}
+	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/audioinfo/audioinfo.wdx" >> ${PLIST}
+.endif
 .if ${PORT_OPTIONS:MWDX_RPM}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/rpm_wdx/rpm_wdx.wdx" >> ${PLIST}
 .endif
@@ -258,6 +274,9 @@ pre-install:
 	@cd ${WRKSRC}/plugins/wdx/scripts && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/plugins/wdx/scripts/|' >> ${PLIST}
 .endif
+.if ${PORT_OPTIONS:MWDX_TEXTLINE}
+	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/textline/textline.wdx" >> ${PLIST}
+.endif
 
 .if ${PORT_OPTIONS:MWFX_FTP}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wfx/ftp/ftp.wfx" >> ${PLIST}
@@ -286,6 +305,7 @@ pre-install:
 
 	@cd ${WRKSRC}/pixmaps && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/pixmaps/|' >> ${PLIST}
+	@${ECHO_CMD} "@dir %%DATADIR%%/pixmaps/dctheme/20x20/apps" >> ${PLIST}
 
 	@cd ${WRKSRC}/sdk && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/sdk/|' >> ${PLIST}
@@ -320,9 +340,13 @@ do-install:
 .endif
 .if ${PORT_OPTIONS:MWCX_ZIP}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/zip/
-	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/zip/lib/zip.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/zip/
+	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/zip/zip.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/zip/
 .endif
 
+.if ${PORT_OPTIONS:MWDX_AUDIOINFO}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/audioinfo/
+	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/audioinfo/audioinfo.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/audioinfo/
+.endif
 .if ${PORT_OPTIONS:MWDX_RPM}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/rpm_wdx/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/rpm_wdx/lib/rpm_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/rpm_wdx/
@@ -343,6 +367,10 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/scripts/
 	${INSTALL_DATA} ${WRKSRC}/plugins/wdx/scripts/* ${STAGEDIR}${DATADIR}/plugins/wdx/scripts/
 .endif
+.if ${PORT_OPTIONS:MWDX_TEXTLINE}
+	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/textline/
+	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/textline/textline.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/textline/
+.endif
 
 .if ${PORT_OPTIONS:MWFX_FTP}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx/ftp/
diff --git a/x11-fm/doublecmd/distinfo b/x11-fm/doublecmd/distinfo
index d4cdb50187f8..2dacc1158c37 100644
--- a/x11-fm/doublecmd/distinfo
+++ b/x11-fm/doublecmd/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1487956233
-SHA256 (doublecmd-0.7.8-src.tar.gz) = 5249557df3715588f379292258b937e37a097bf584602711bc211dfd6427e9a3
-SIZE (doublecmd-0.7.8-src.tar.gz) = 6784400
+TIMESTAMP = 1514048041
+SHA256 (doublecmd-0.8.1-src.tar.gz) = 7d6e26460b1e57c0af4b26f6fab0c9a38287672f8d5d92d84e2dc5d0e25e75a8
+SIZE (doublecmd-0.8.1-src.tar.gz) = 7566344
 SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39
 SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996
diff --git a/x11-fm/doublecmd/files/patch-src_platform_udefaultplugins.pas b/x11-fm/doublecmd/files/patch-src_platform_udefaultplugins.pas
new file mode 100644
index 000000000000..cba04c508426
--- /dev/null
+++ b/x11-fm/doublecmd/files/patch-src_platform_udefaultplugins.pas
@@ -0,0 +1,11 @@
+--- src/platform/udefaultplugins.pas.orig	2017-02-11 15:03:56 UTC
++++ src/platform/udefaultplugins.pas
+@@ -287,7 +287,7 @@ begin
+ 
+   if gWdxPlugins.IndexOfName('audioinfo') < 0 then
+   begin
+-    gWdxPlugins.Add(GetCmdDirFromEnvVar(Folder) + 'audioinfo' + PathDelim + 'audioinfo.wdx');
++    gWdxPlugins.Add(Folder + 'audioinfo' + PathDelim + 'audioinfo.wdx');
+   end;
+ 
+   // Wfx plugins
diff --git a/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas b/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas
index b22ddda14665..6a68ff715ea9 100644
--- a/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas
+++ b/x11-fm/doublecmd/files/patch-src_uGlobsPaths.pas
@@ -1,6 +1,6 @@
---- src/uGlobsPaths.pas.orig	2016-01-13 13:34:19 UTC
+--- src/uGlobsPaths.pas.orig	2017-12-11 10:45:31 UTC
 +++ src/uGlobsPaths.pas
-@@ -3,13 +3,14 @@ unit uGlobsPaths;
+@@ -3,7 +3,7 @@ unit uGlobsPaths;
  interface
  
  var
@@ -9,14 +9,15 @@
    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
+@@ -11,6 +11,7 @@ var
    gpPixmapPath : String = '';  // path to pixmaps
-   gpCacheDir : String = ''; // cache directory
+   gpHighPath : String = ''; // editor highlighter directory
+   gpThumbCacheDir : String = ''; // thumbnails cache directory
 +  gpDocsDir : String = '%%DOCSDIR%%'; // directory for help files
  
  //Global Configuration Filename
  const
-@@ -36,7 +37,7 @@ end;
+@@ -37,7 +38,7 @@ end;
  procedure LoadPaths;
  begin
    OnGetApplicationName := @GetAppName;