diff -ruN /usr/ports/x11-fm/doublecmd/Makefile ./Makefile
--- /usr/ports/x11-fm/doublecmd/Makefile	2015-05-11 20:34:57.000000000 +0200
+++ ./Makefile	2015-05-12 22:46:15.491960000 +0200
@@ -2,7 +2,7 @@
 # $FreeBSD: head/x11-fm/doublecmd/Makefile 386097 2015-05-11 18:34:57Z mat $
 
 PORTNAME=	doublecmd
-PORTVERSION=	0.6.1
+PORTVERSION=	0.6.2
 CATEGORIES=	x11-fm
 MASTER_SITES=	SOURCEFORGE/${PORTNAME}/Double%20Commander%20Source
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -22,7 +22,6 @@
 
 USES=		dos2unix
 DOS2UNIX_FILES=	src/dmhelpmanager.pas
-USE_FPC=	yes
 WANT_GNOME=	yes
 
 PLIST=		${WRKDIR}/pkg-plist
@@ -76,31 +75,22 @@
 			WFX_SAMBA \
 			DSX_LOCATE
 
-.include <bsd.port.pre.mk>
+GTK2_USE=		fpc=gtk2 gnome=gtk20
+GTK2_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
 
-.if ${PORT_OPTIONS:MGTK2}
-USE_FPC+=	gtk2
-USE_GNOME=	gtk20
-LCL_PLATFORM=	gtk2
-BUILD_DEPENDS+=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-gtk2
-.endif
+QT4_LIB_DEPENDS=	libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
+QT4_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
 
-.if ${PORT_OPTIONS:MQT4}
-LIB_DEPENDS+=	libQt4Pas.so:${PORTSDIR}/x11-toolkits/qt4pas
-LCL_PLATFORM=	qt
-BUILD_DEPENDS+=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-qt
-.endif
-
-.if ${PORT_OPTIONS:MWCX_UNRAR}
-LIB_DEPENDS+=	libunrar.so:${PORTSDIR}/archivers/libunrar
-.endif
+WCX_UNRAR_LIB_DEPENDS=	libunrar.so:${PORTSDIR}/archivers/libunrar
+WFX_SAMBA_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+WLX_MPLAYER_RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
-.if ${PORT_OPTIONS:MWFX_SAMBA}
-LIB_DEPENDS+=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
-.endif
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MWLX_MPLAYER}
-RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
+.if ${PORT_OPTIONS:MGTK2}
+LCL_PLATFORM=	gtk2
+.elif ${PORT_OPTIONS:MQT4}
+LCL_PLATFORM=	qt
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
@@ -372,4 +362,4 @@
 			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DOCSDIR}/{}" \;
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN /usr/ports/x11-fm/doublecmd/distinfo ./distinfo
--- /usr/ports/x11-fm/doublecmd/distinfo	2015-03-30 14:46:58.000000000 +0200
+++ ./distinfo	2015-05-10 12:54:58.775323034 +0200
@@ -1,4 +1,4 @@
-SHA256 (doublecmd-0.6.1-src.tar.gz) = f5e06488edc5e1d7c7e6f4affd9f205341e5158524bd903e3a4bd5fda5a17642
-SIZE (doublecmd-0.6.1-src.tar.gz) = 6498367
+SHA256 (doublecmd-0.6.2-src.tar.gz) = 76564e927b9bf372dec585df6a65880cfd6ff06086f8c56e7bcf9bbde960e3bb
+SIZE (doublecmd-0.6.2-src.tar.gz) = 5975990
 SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39
 SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996