2 files changed, 29 insertions, 31 deletions

diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index 55304c4b76d3..3303f5c975d2 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	doublecmd
-PORTVERSION=	0.9.9
-PORTREVISION=	1
+PORTVERSION=	0.9.10
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF/${PORTNAME}/Double%20Commander%20Source
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
@@ -17,17 +16,16 @@ LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		dos2unix desktop-file-utils fpc gnome lazarus:flavors xorg
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
-PORTDOCS=	*
+USES=		dos2unix desktop-file-utils fpc gnome lazarus:flavors xorg
+DOS2UNIX_FILES=	src/dmhelpmanager.pas components/multithreadprocs/mtpcpu.pas
 
 USE_FPC=	cairo chm fcl-base fcl-db fcl-image fcl-json fcl-registry \
 		fcl-xml iconvenc pasjpeg rtl-extra x11 regexpr
 USE_GNOME=	cairo glib20
 USE_XORG=	x11
-DOS2UNIX_FILES=	src/dmhelpmanager.pas components/multithreadprocs/mtpcpu.pas
-
-PLIST=		${WRKDIR}/pkg-plist
 
 LAZARUS_PROJECT_FILES=	components/chsdet/chsdet.lpk
 LAZARUS_PROJECT_FILES+=	components/CmdLine/cmdbox.lpk
@@ -42,15 +40,28 @@ LAZARUS_PROJECT_FILES+=	components/synunihighlighter/synuni.lpk
 LAZBUILD_ARGS=	-d --pcp=${WRKSRC}/tmppcp
 MAKE_ENV+=	LDVER=ld.bfd # for DragonFly
 
-HELPVERSION=	0.6.0
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-DOCSRC=		${WRKDIR}/${PORTNAME}-help-${HELPVERSION}
-
-gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
+PLIST=		${WRKDIR}/pkg-plist
+PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS DEBUG
+OPTIONS_DEFAULT=	WCX_CPIO \
+			WCX_DEB \
+			WCX_RPM \
+			WCX_UNRAR \
+			WCX_ZIP \
+			WDX_AUDIOINFO \
+			WDX_RPM \
+			WDX_DEB \
+			WDX_SCRIPTS \
+			WDX_TEXTLINE \
+			WDX_XPI \
+			WFX_FTP \
+			WFX_SAMBA \
+			DSX_LOCATE
+
 OPTIONS_GROUP=		WCX WDX WFX WLX DSX
+OPTIONS_GROUP_DSX=	DSX_LOCATE
 OPTIONS_GROUP_WCX=	WCX_CPIO \
 			WCX_DEB \
 			WCX_RPM \
@@ -66,7 +77,6 @@ OPTIONS_GROUP_WDX=	WDX_AUDIOINFO \
 OPTIONS_GROUP_WFX=	WFX_FTP \
 			WFX_SAMBA
 OPTIONS_GROUP_WLX=	WLX_MPLAYER
-OPTIONS_GROUP_DSX=	DSX_LOCATE
 
 WCX_DESC=	Packer plugins to work with archives
 WCX_CPIO_DESC=	CPIO format support
@@ -94,21 +104,6 @@ WLX_MPLAYER_DESC=	Use MPlayer for multimedia files
 DSX_DESC=	Search plugins
 DSX_LOCATE_DESC=	Support locate command
 
-OPTIONS_DEFAULT=	WCX_CPIO \
-			WCX_DEB \
-			WCX_RPM \
-			WCX_UNRAR \
-			WCX_ZIP \
-			WDX_AUDIOINFO \
-			WDX_RPM \
-			WDX_DEB \
-			WDX_SCRIPTS \
-			WDX_TEXTLINE \
-			WDX_XPI \
-			WFX_FTP \
-			WFX_SAMBA \
-			DSX_LOCATE
-
 WCX_UNRAR_LIB_DEPENDS=	libunrar.so.5:archivers/libunrar5
 WFX_SAMBA_USES=		samba:lib
 WLX_MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
@@ -182,6 +177,9 @@ LAZARUS_PROJECT_FILES+=		plugins/dsx/DSXLocate/src/DSXLocate.lpi
 
 LAZARUS_PROJECT_FILES+=		src/doublecmd.lpi
 
+DOCSRC=		${WRKDIR}/${PORTNAME}-help-${HELPVERSION}
+HELPVERSION=	0.6.0
+
 pre-patch:
 	${TR} '\r' '\n' < ${WRKSRC}/src/uGlobsPaths.pas > ${WRKSRC}/src/uGlobsPaths.pas.unix
 	${MV} ${WRKSRC}/src/uGlobsPaths.pas.unix ${WRKSRC}/src/uGlobsPaths.pas
diff --git a/x11-fm/doublecmd/distinfo b/x11-fm/doublecmd/distinfo
index 7d687657198e..4e702d6098f9 100644
--- a/x11-fm/doublecmd/distinfo
+++ b/x11-fm/doublecmd/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1593256118
-SHA256 (doublecmd-0.9.9-src.tar.gz) = 5e5198fbcb8e560d01143d136aa2772f836c5cb17656bde63c860ea14816d8b2
-SIZE (doublecmd-0.9.9-src.tar.gz) = 8284001
+TIMESTAMP = 1610346488
+SHA256 (doublecmd-0.9.10-src.tar.gz) = ba7a064245219086d81884d954ab302460aa905adbae10bba172af8c0eca9441
+SIZE (doublecmd-0.9.10-src.tar.gz) = 8294229
 SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39
 SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996