x11-fm/doublecmd: update to version 0.9.1

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

2 files changed, 9 insertions, 25 deletions

diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index 645d615740f9..686582ca69ec 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	doublecmd
-PORTVERSION=	0.8.4
+PORTVERSION=	0.9.1
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF/${PORTNAME}/Double%20Commander%20Source
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
@@ -38,7 +38,6 @@ LAZARUS_PROJECT_FILES+=	components/viewer/viewerpackage.lpk
 LAZARUS_PROJECT_FILES+=	components/gifanim/pkg_gifanim.lpk
 LAZARUS_PROJECT_FILES+=	components/synunihighlighter/synuni.lpk
 
-LAZARUS_NO_FLAVORS=qt5
 LAZBUILD_ARGS=	-d --pcp=${WRKSRC}/tmppcp
 MAKE_ENV+=	LDVER=ld.bfd # for DragonFly
 LLD_UNSAFE=	yes
@@ -47,8 +46,9 @@ HELPVERSION=	0.6.0
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DOCSRC=		${WRKDIR}/${PORTNAME}-help-${HELPVERSION}
 
-gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4
-qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4 ${PORTNAME}-qt5
+qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt5
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt4
 
 OPTIONS_DEFINE=		DOCS DEBUG
 OPTIONS_GROUP=		WCX WDX WFX WLX DSX
@@ -61,7 +61,6 @@ OPTIONS_GROUP_WCX=	WCX_CPIO \
 OPTIONS_GROUP_WDX=	WDX_AUDIOINFO \
 			WDX_RPM \
 			WDX_DEB \
-			WDX_SVN \
 			WDX_XPI \
 			WDX_SCRIPTS \
 			WDX_TEXTLINE
@@ -83,7 +82,6 @@ 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
 
@@ -105,7 +103,6 @@ OPTIONS_DEFAULT=	WCX_CPIO \
 			WDX_AUDIOINFO \
 			WDX_RPM \
 			WDX_DEB \
-			WDX_SVN \
 			WDX_SCRIPTS \
 			WDX_TEXTLINE \
 			WDX_XPI \
@@ -164,10 +161,6 @@ LAZARUS_PROJECT_FILES+=		plugins/wdx/rpm_wdx/src/rpm_wdx.lpi
 LAZARUS_PROJECT_FILES+=		plugins/wdx/deb_wdx/src/deb_wdx.lpi
 .endif
 
-.if ${PORT_OPTIONS:MWDX_SVN}
-LAZARUS_PROJECT_FILES+=		plugins/wdx/svn_wdx/src/svn_wdx.lpi
-.endif
-
 .if ${PORT_OPTIONS:MWDX_XPI}
 LAZARUS_PROJECT_FILES+=		plugins/wdx/xpi_wdx/src/xpi_wdx.lpi
 .endif
@@ -199,7 +192,6 @@ post-patch:
 		${WRKSRC}/src/uGlobsPaths.pas
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/plugins/wlx/WlxMplayer/src/wlxMplayer.lpr
-	@${REINPLACE_CMD} -e '3632d' ${WRKSRC}/src/fmain.pas
 	@${REINPLACE_CMD} -e 's| Default="True"||g' \
 		-e 's|Name="NoDebug Full Optimizations"|Name="NoDebug Full Optimizations" Default="True"|g' \
 			${WRKSRC}/src/${PORTNAME}.lpi
@@ -244,9 +236,6 @@ pre-install:
 .if ${PORT_OPTIONS:MWDX_DEB}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/deb_wdx/deb_wdx.wdx" >> ${PLIST}
 .endif
-.if ${PORT_OPTIONS:MWDX_SVN}
-	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/svn_wdx/svn_wdx.wdx" >> ${PLIST}
-.endif
 .if ${PORT_OPTIONS:MWDX_XPI}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wdx/xpi_wdx/xpi_wdx.wdx" >> ${PLIST}
 .endif
@@ -275,8 +264,7 @@ pre-install:
 
 .for FILE in %%DATADIR%%/doublecmd.ext.example %%DATADIR%%/pixmaps.txt \
 	%%DATADIR%%/multiarc.ini bin/doublecmd share/applications/doublecmd.desktop \
-	share/pixmaps/doublecmd.png share/icons/hicolor/scalable/apps/doublecmd.svg \
-	%%DATADIR%%/doublecmd.xml
+	share/pixmaps/doublecmd.png share/icons/hicolor/scalable/apps/doublecmd.svg
 	@${ECHO_CMD} ${FILE} >> ${PLIST}
 .endfor
 
@@ -335,10 +323,6 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/deb_wdx/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/deb_wdx/lib/deb_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/deb_wdx/
 .endif
-.if ${PORT_OPTIONS:MWDX_SVN}
-	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/svn_wdx/
-	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/svn_wdx/lib/svn_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/svn_wdx/
-.endif
 .if ${PORT_OPTIONS:MWDX_XPI}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/xpi_wdx/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/xpi_wdx/lib/xpi_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/xpi_wdx/
@@ -378,7 +362,7 @@ do-install:
 			${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \;
 .endfor
 
-.for FILE in doublecmd.ext.example pixmaps.txt multiarc.ini install/linux/doublecmd.xml
+.for FILE in doublecmd.ext.example pixmaps.txt multiarc.ini
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DATADIR}
 .endfor
 
diff --git a/x11-fm/doublecmd/distinfo b/x11-fm/doublecmd/distinfo
index 6f12c6bb9653..e1733b7634f4 100644
--- a/x11-fm/doublecmd/distinfo
+++ b/x11-fm/doublecmd/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1534873908
-SHA256 (doublecmd-0.8.4-src.tar.gz) = c546a7b48e163bea752ea385dbacb85c3b5828fcaafd1be84b0f132b49742de2
-SIZE (doublecmd-0.8.4-src.tar.gz) = 7756824
+TIMESTAMP = 1550317564
+SHA256 (doublecmd-0.9.1-src.tar.gz) = fc2e0a24492d74ecf4cafdcd5148cda3377f553f16a3d98dc22b26f1692b29c5
+SIZE (doublecmd-0.9.1-src.tar.gz) = 8125883
 SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39
 SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996