Index: head/archivers/peazip/Makefile
===================================================================
--- head/archivers/peazip/Makefile	(revision 470850)
+++ head/archivers/peazip/Makefile	(revision 470851)
@@ -1,127 +1,101 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	peazip
-PORTVERSION=	6.5.0
+PORTVERSION=	6.5.1
 CATEGORIES=	archivers
+PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 MASTER_SITES=	https://github.com/giorgiotani/PeaZip/releases/download/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free archiver and file compressor
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	lazbuild:editors/lazarus \
-		fpcres:lang/fpc-utils
-
-USES=		dos2unix fpc zip
+USES=		dos2unix fpc lazarus:flavors zip
 USE_FPC=	cairo chm fcl-base fcl-image pasjpeg rtl-objpas x11
-USE_GNOME=	#
+USE_XORG=	x11
 
 SUB_FILES=	pea pealauncher peazip
 
 DOS2UNIX_REGEX=		.*\.([txt]|pas|lpi|txt)
+
 LAZARUS_PROJECT_FILES=	project_pea.lpi project_peach.lpi project_gwrap.lpi
-LAZBUILD_CMD=		${LOCALBASE}/bin/lazbuild -d
-LCL_UNITS_DIR=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME}
-LAZARUS_VER=		1.8.0
-LAZARUS_DIR=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}
+LAZBUILD_ARGS=		-d
+
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4 ${PORTNAME}-qt5
+qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt5
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt4
+
 ARCHIVER_FILES=		#
 
 OPTIONS_DEFINE=		7Z ARC ZPAQ UNACE
-OPTIONS_SINGLE=		LCL
-OPTIONS_SINGLE_LCL=	GTK2 QT4 QT5
 
 7Z_DESC=		7z file archiver support
 ARC_DESC=		Arc file archiver support
 ZPAQ_DESC=		Zpaq file archiver support
 UNACE_DESC=		Unace file archiver support
-GTK2_DESC=		Use gtk20 interface
-QT4_DESC=		Use qt4 interface
-QT5_DESC=		Use qt5 interface
 
-OPTIONS_DEFAULT=	GTK2 7Z
+OPTIONS_DEFAULT=	7Z
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGTK2}
-USE_FPC+=	gtk2
-USE_GNOME=	gtk20
-LCL_PLATFORM=	gtk2
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
+.if ${FLAVOR:Ugtk2:Mgtk2}
+USE_GNOME+=	cairo
 .endif
 
-.if ${PORT_OPTIONS:MQT4}
-LIB_DEPENDS+=	libQt4Pas.so:x11-toolkits/qt4pas
-LCL_PLATFORM=	qt
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
-.endif
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MQT5}
-LIB_DEPENDS+=	libQt5Pas.so:x11-toolkits/qt5pas
-LCL_PLATFORM=	qt5
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5
-.endif
-
 .if ${PORT_OPTIONS:M7Z}
 RUN_DEPENDS+=	7z:archivers/p7zip
 ARCHIVER_FILES+=7z
 PLIST_SUB+=	7Z=""
 .else
 PLIST_SUB+=	7Z="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MARC}
 RUN_DEPENDS+=	arc:archivers/arc
 ARCHIVER_FILES+=arc
 PLIST_SUB+=	ARC=""
 .else
 PLIST_SUB+=	ARC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MZPAQ}
 RUN_DEPENDS+=	zpaq:archivers/paq
 ARCHIVER_FILES+=zpaq
 PLIST_SUB+=	ZPAQ=""
 .else
 PLIST_SUB+=	ZPAQ="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MUNACE}
 RUN_DEPENDS+=	unace:archivers/unace
 ARCHIVER_FILES+=unace
 PLIST_SUB+=	UNACE=""
 .else
 PLIST_SUB+=	UNACE="@comment "
 .endif
 
 post-patch:
 	${REINPLACE_CMD} 's|GetSelectedNodePath|Path|g' ${WRKSRC}/peach.pas
-
-do-build:
-.for PROJECT_FILE in ${LAZARUS_PROJECT_FILES}
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE}
-.endfor
 
 pre-install:
 	@${ECHO_CMD} "#" > ${WRKSRC}/altconf.txt
 	@${ECHO_CMD} "appdata" >> ${WRKSRC}/altconf.txt
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/res
 .for ARCHIVER in ${ARCHIVER_FILES}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/res/${ARCHIVER}
 	@${LN} -s ${LOCALBASE}/bin/${ARCHIVER} ${STAGEDIR}${DATADIR}/res/${ARCHIVER}/${ARCHIVER}
 .endfor
 	@cd ${WRKSRC}/res && ${COPYTREE_SHARE} "icons lang themes" ${STAGEDIR}${DATADIR}/res
 	@cd ${WRKSRC} && ${INSTALL_DATA} altconf.txt ${STAGEDIR}${DATADIR}/res && \
 			${INSTALL_PROGRAM} pea pealauncher ${STAGEDIR}${DATADIR}/res && \
 			${INSTALL_PROGRAM} peazip ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/FreeDesktop_integration && \
 		${INSTALL_DATA} peazip.desktop ${STAGEDIR}${DESKTOPDIR} && \
 		${INSTALL_DATA} peazip.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 	${INSTALL_SCRIPT} ${WRKDIR}/pea ${WRKDIR}/pealauncher ${WRKDIR}/peazip ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.mk>
Index: head/archivers/peazip/distinfo
===================================================================
--- head/archivers/peazip/distinfo	(revision 470850)
+++ head/archivers/peazip/distinfo	(revision 470851)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513107866
-SHA256 (peazip-6.5.0.src.zip) = 1c19c7d6c346b511c635c95d6ff0277ee0811873133757d3c06c26fec558e7bf
-SIZE (peazip-6.5.0.src.zip) = 4181167
+TIMESTAMP = 1520457314
+SHA256 (peazip-6.5.1.src.zip) = b106811311fbaf42ad5374520df2be8b20a545b80e6f8713a1f10e2e5a79d01e
+SIZE (peazip-6.5.1.src.zip) = 4289282
Index: head/cad/zcad/Makefile
===================================================================
--- head/cad/zcad/Makefile	(revision 470850)
+++ head/cad/zcad/Makefile	(revision 470851)
@@ -1,94 +1,97 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	zcad
 PORTVERSION=	0.9.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
+PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 MASTER_SITES=	LOCAL/danfe
 DISTNAME=	${PORTNAME}-trunk-r2259
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Simple CAD program
 
-BUILD_DEPENDS=	lazbuild:editors/lazarus
-
-USES=		fpc tar:xz
+USES=		fpc lazarus:flavors tar:xz
 USE_FPC=	cairo chm fcl-base fcl-image fcl-json fcl-stl fcl-xml opengl \
 		pasjpeg rtl-extra rtl-objpas x11
 
-LAZARUS_VER=	1.8.0
-LAZBUILD_CMD=	${LOCALBASE}/bin/lazbuild -d --pcp=${WRKSRC}/tmppcp \
-		--lazarusdir=${LAZARUS_DIR}
-LAZARUS_DIR=	${LOCALBASE}/share/lazarus-${LAZARUS_VER}
-LCL_UNITS_DIR=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}
-
 EXTRACT_CMD=	LC_ALL=en_US.UTF-8 ${TAR}	# for non-ASCII filenames
 
-MAKE_ENV=	LAZBUILD_CMD="${LAZBUILD_CMD}"
+MAKE_ENV=	LAZBUILD_CMD="${LAZBUILD_CMD}" \
+		LAZBUILD_ARGS="${LAZBUILD_ARGS}" \
+		LCL_PLATFORM="${LCL_PLATFORM}" \
+		LAZARUS_DIR="${LAZARUS_DIR}" \
+		INSTANTFPCCACHE="${WRKSRC}/.cache"
 
+NO_LAZBUILD=	yes
 WRKSRC=		${WRKDIR}/trunk
 BUILD_WRKSRC=	${WRKSRC}/cad_source
 INSTALL_WRKSRC=	${WRKSRC}/cad
 
+LAZBUILD_ARGS=	-d --pcp=${WRKSRC}/tmppcp
+LAZARUS_NO_FLAVORS=qt5
+
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4
+qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
+
 MAKE_JOBS_UNSAFE=	yes
 
 PORTDOCS=	UserGuide.odt UserGuide.pdf
 
 OPTIONS_DEFINE=		DOCS
-OPTIONS_SINGLE=		GUI
-OPTIONS_SINGLE_GUI=	GTK2 QT4
-OPTIONS_DEFAULT=	GTK2
 
-GTK2_BUILD_DEPENDS=	${LCL_UNITS_DIR}/gtk2/interfaces.ppu:editors/lazarus-lcl-gtk2
-GTK2_USE=		GNOME=gtk20 FPC=gtk2
-GTK2_MAKE_ENV=		GUI=gtk2
-GTK2_VARS=		LAZBUILD_CMD+=--ws=gtk2
+.if ${FLAVOR:Ugtk2:Mgtk2}
+MAKE_ENV+=	GUI=gtk2
+.endif
 
-QT4_BUILD_DEPENDS=	${LCL_UNITS_DIR}/qt/interfaces.ppu:editors/lazarus-lcl-qt
-QT4_LIB_DEPENDS=	libQt4Pas.so:x11-toolkits/qt4pas
-QT4_MAKE_ENV=		GUI=qt
-QT4_VARS=		LAZBUILD_CMD+=--ws=qt
+.if ${FLAVOR:Uqt4:Mqt4}
+MAKE_ENV+=	GUI=qt
+.endif
 
 post-patch:
 	@${EGREP} -lR 'IFN?DEF LINUX' ${BUILD_WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -E '/IFN?DEF LINUX/s,LINUX,UNIX,g'
 	@${REINPLACE_CMD} -e '/}Linux{/d' \
 		${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VStream.pas \
 		${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VFStream.pas \
 		${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VFileSys.pas \
 		${BUILD_WRKSRC}/other/AGraphLaz/Vectors/VStrm64.pas
 	${CP} ${FILESDIR}/makefile ${BUILD_WRKSRC}/Makefile
 
 pre-build:
 # OpenGL component must be fixed and rebuilt locally (to avoid touching
 # filesystem outside working directory)
 	${SED} -e 's,Linux,${OPSYS},' \
 		${LAZARUS_DIR}/components/opengl/openglcontext.pas \
 		> ${BUILD_WRKSRC}/openglcontext.pas
 	${CP} ${LAZARUS_DIR}/components/opengl/glgtkglxcontext.pas \
 		${LAZARUS_DIR}/components/opengl/glqtcontext.pas \
 		${LAZARUS_DIR}/components/opengl/openglcontext.res \
 		${BUILD_WRKSRC}
 # Build components that do not come with precompiled *.ppu files (also
 # copy them locally first for the same reason as above)
 	${CP} -a  ${LAZARUS_DIR}/components/fpvectorial \
 		${LAZARUS_DIR}/components/anchordocking ${WRKSRC}
-	${LAZBUILD_CMD} ${WRKSRC}/fpvectorial/fpvectorialpkg.lpk
-	${LAZBUILD_CMD} ${WRKSRC}/anchordocking/anchordocking.lpk
+	${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} ${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} \
+		--lazarusdir=${LAZARUS_DIR} \
+			${WRKSRC}/fpvectorial/fpvectorialpkg.lpk
+	${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} ${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} \
+		--lazarusdir=${LAZARUS_DIR} \
+			${WRKSRC}/anchordocking/anchordocking.lpk
 
 do-install:
 # Not ready for hier(7)-conforming installation yet
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/${PORTNAME}
 	cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} "blocks components \
 		fonts images languages menu programdb rtl sample \
 		template" ${STAGEDIR}${PREFIX}/${PORTNAME}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/userguide/UserGuide.odt \
 		${INSTALL_WRKSRC}/UserGuide.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/cad/zcad/files/makefile
===================================================================
--- head/cad/zcad/files/makefile	(revision 470850)
+++ head/cad/zcad/files/makefile	(revision 470851)
@@ -1,85 +1,85 @@
 # $FreeBSD$
 
 OUTSUFX=	lib/$(ARCH)-$(OPSYS:tl)
 
 # XXX: sometimes the build crashes with ``An unhandled exception occurred
 # at $0814EBB3'' message (EAccessViolation: Access violation).  It might
 # be some concurrency issue, but it occurs even with MAKE_JOBS_UNSAFE, so
 # use the following simple workaround for the time being.
-ZEALOUS_BUILD=	sh -c 'i=0 ; until $(LAZBUILD_CMD) $$0 ; do \
+ZEALOUS_BUILD=	sh -c 'i=0 ; until $(LAZBUILD_CMD) $(LAZBUILD_ARGS) --ws=$(LCL_PLATFORM) --lazarusdir=$(LAZARUS_DIR) $$0 ; do \
 		test $$i -lt 4 || return ; i=$$((i+1)) ; done'
 
 all: ../$(OUTSUFX)/zcad.compiled
 
 ZCAD_DEPS= \
 	other/AGraphLaz/lazarus/$(OUTSUFX)/ag_graph.compiled \
 	other/VirtualTreeView-Lazarus/Source/$(OUTSUFX)-$(GUI)/virtualtreeview_package.compiled \
 	components/zmath/$(OUTSUFX)/zmath.compiled \
 	components/zobjectinspector/$(OUTSUFX)/zobjectinspector.compiled
 
 AG_GRAPH_DEPS= \
 	other/AGraphLaz/lazarus/$(OUTSUFX)/ag_vectors.compiled \
 	other/AGraphLaz/lazarus/$(OUTSUFX)/ag_attr.compiled \
 	other/AGraphLaz/lazarus/$(OUTSUFX)/ag_math.compiled \
 
 VTV_DEPS= \
 	other/lclextensions/$(OUTSUFX)-$(GUI)/lclextensions_package.compiled
 
 ZMATH_DEPS= \
 	components/zebase/$(OUTSUFX)/zebase.compiled
 
 ZOBJINST_DEPS= \
 	components/zscript/$(OUTSUFX)/zscript.compiled \
 	components/zcontrols/$(OUTSUFX)/zcontrols.compiled \
 	components/zundostack/$(OUTSUFX)/zundostack.compiled
 
 ZSCRIPT_DEPS= \
 	components/zscriptbase/$(OUTSUFX)/zscriptbase.compiled
 
 ZSCRIPTBASE_DEPS= \
 	components/zcontainers/$(OUTSUFX)/zcontainers.compiled
 
 ../$(OUTSUFX)/zcad.compiled: $(ZCAD_DEPS)
 	$(ZEALOUS_BUILD) zcad.lpi
 
 other/AGraphLaz/lazarus/$(OUTSUFX)/ag_graph.compiled: $(AG_GRAPH_DEPS)
 	$(ZEALOUS_BUILD) other/AGraphLaz/lazarus/ag_graph.lpk
 
 other/AGraphLaz/lazarus/$(OUTSUFX)/ag_vectors.compiled:
 	$(ZEALOUS_BUILD) other/AGraphLaz/lazarus/ag_vectors.lpk
 
 other/AGraphLaz/lazarus/$(OUTSUFX)/ag_attr.compiled:
 	$(ZEALOUS_BUILD) other/AGraphLaz/lazarus/ag_attr.lpk
 
 other/AGraphLaz/lazarus/$(OUTSUFX)/ag_math.compiled:
 	$(ZEALOUS_BUILD) other/AGraphLaz/lazarus/ag_math.lpk
 
 other/VirtualTreeView-Lazarus/Source/$(OUTSUFX)-$(GUI)/virtualtreeview_package.compiled: $(VTV_DEPS)
 	$(ZEALOUS_BUILD) other/VirtualTreeView-Lazarus/Source/virtualtreeview_package.lpk
 
 other/lclextensions/$(OUTSUFX)-$(GUI)/lclextensions_package.compiled:
 	$(ZEALOUS_BUILD) other/lclextensions/lclextensions_package.lpk
 
 components/zmath/$(OUTSUFX)/zmath.compiled: $(ZMATH_DEPS)
 	$(ZEALOUS_BUILD) components/zmath/zmath.lpk
 
 components/zebase/$(OUTSUFX)/zebase.compiled:
 	$(ZEALOUS_BUILD) components/zebase/zebase.lpk
 
 components/zobjectinspector/$(OUTSUFX)/zobjectinspector.compiled: $(ZOBJINST_DEPS)
 	$(ZEALOUS_BUILD) components/zobjectinspector/zobjectinspector.lpk
 
 components/zscript/$(OUTSUFX)/zscript.compiled: $(ZSCRIPT_DEPS)
 	$(ZEALOUS_BUILD) components/zscript/zscript.lpk
 
 components/zscriptbase/$(OUTSUFX)/zscriptbase.compiled: $(ZSCRIPTBASE_DEPS)
 	$(ZEALOUS_BUILD) components/zscriptbase/zscriptbase.lpk
 
 components/zcontainers/$(OUTSUFX)/zcontainers.compiled: $(ZMATH_DEPS)
 	$(ZEALOUS_BUILD) components/zcontainers/zcontainers.lpk
 
 components/zcontrols/$(OUTSUFX)/zcontrols.compiled:
 	$(ZEALOUS_BUILD) components/zcontrols/zcontrols.lpk
 
 components/zundostack/$(OUTSUFX)/zundostack.compiled: $(ZSCRIPT_DEPS)
 	$(ZEALOUS_BUILD) components/zundostack/zundostack.lpk
Index: head/comms/cqrlog/Makefile
===================================================================
--- head/comms/cqrlog/Makefile	(revision 470850)
+++ head/comms/cqrlog/Makefile	(revision 470851)
@@ -1,74 +1,67 @@
 # Created by: Stephen Hurd <shurd@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cqrlog
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	comms hamradio
+PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio logging application
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	lazbuild:editors/lazarus
-PATCH_DEPENDS=	${LAZARUS_DIR}/tools/lazres:editors/lazarus
 LIB_DEPENDS=	libhamlib.so:comms/hamlib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ok2cqr
 
-USES=		fpc shebangfix
+USES=		fpc lazarus:flavors shebangfix
 SHEBANG_FILES=	tools/cqrlog-apparmor-fix \
 		voice_keyer/voice_keyer.sh
   
 USE_FPC=	cairo fcl-base chm fcl-db fcl-image fcl-json fcl-net fcl-web \
 		fcl-registry rtl-extra fcl-xml mysql numlib openssl \
 		pasjpeg regexpr x11
 
 ALL_TARGET=	${PORTNAME}
 
-LAZARUS_VER=	1.8.0
-LAZARUS_DIR=	${LOCALBASE}/share/lazarus-${LAZARUS_VER}
+MAKE_ENV+=	LAZBUILD_CMD="${LAZBUILD_CMD}" \
+		LAZBUILD_ARGS="${LAZBUILD_ARGS}" \
+		LCL_PLATFORM="${LCL_PLATFORM}" \
+		LAZARUS_DIR="${LAZARUS_DIR}"
 
-OPTIONS_SINGLE=		LCL
-OPTIONS_SINGLE_LCL=	GTK2 QT4
-OPTIONS_DEFAULT=	GTK2
-
 USE_XORG+=	x11
-USE_GNOME+=	gdkpixbuf2 cairo
+NO_LAZBUILD=	yes
+LAZBUILD_ARGS=	-d --pcp=.
+LAZARUS_NO_FLAVORS=qt5
 
-GTK2_USE=	fpc=gtk2 gnome=gtk20
-GTK2_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/gtk2/interfaces.ppu:editors/lazarus-lcl-gtk2
-GTK2_MAKE_ARGS=	PLATFORM=gtk2
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4
+qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
-QT4_LIB_DEPENDS=	libQt4Pas.so:x11-toolkits/qt4pas
-QT4_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/qt/interfaces.ppu:editors/lazarus-lcl-qt
-QT4_MAKE_ARGS=	PLATFORM=qt
-
 post-extract:
 	@${RM} -r ${WRKSRC}/src/lnet/lib/openssl.pas
 
 post-patch:
 	@${SED} -e s!%%LOCALBASE%%!${LOCALBASE}!g \
 		-e s!%%MAKE_CMD%%!${MAKE_CMD}!g \
 		-e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \
 		${FILESDIR}/environmentoptions.xml.in \
 		> ${WRKSRC}/environmentoptions.xml
 	${REINPLACE_CMD} -e s!%%LOCALBASE%%!${LOCALBASE}!g \
 		${WRKSRC}/help/cwd.html ${WRKSRC}/help/h1.html \
 		${WRKSRC}/src/cqrlog.lpi ${WRKSRC}/src/dData.pas \
 		${WRKSRC}/src/dUtils.pas \
 		${WRKSRC}/src/fLoTWExport.pas ${WRKSRC}/src/fLoTWExport.lfm \
 		${WRKSRC}/src/fPreferences.pas ${WRKSRC}/src/fRotControl.pas \
 		${WRKSRC}/src/fTRXControl.pas ${WRKSRC}/src/fGrayline.pas \
 		${WRKSRC}/src/fPreferences.lfm ${WRKSRC}/src/fPreferences.pas
 	${REINPLACE_CMD} -e s!%%DATADIR%%!${DATADIR}!g \
 		${WRKSRC}/src/dData.pas ${WRKSRC}/src/fGrayline.pas
 	${REINPLACE_CMD} -e s!Linux!FreeBSD!g \
 		${WRKSRC}/src/fMain.lfm
-	${REINPLACE_CMD} -e s!%%LAZARUSDIR%%!${LAZARUS_DIR}!g \
-		${WRKSRC}/Makefile
 	${RM} -r ${WRKSRC}/src/mysql
 
 .include <bsd.port.mk>
Index: head/comms/cqrlog/files/patch-Makefile
===================================================================
--- head/comms/cqrlog/files/patch-Makefile	(revision 470850)
+++ head/comms/cqrlog/files/patch-Makefile	(revision 470851)
@@ -1,39 +1,39 @@
 --- Makefile.orig	2017-12-30 02:10:01.000000000 -0500
 +++ Makefile	2018-01-05 12:34:28.752177000 -0500
 @@ -1,12 +1,13 @@
 -CC=lazbuild
-+CC=lazbuild -d
++LAZBUILD_CMD?=lazbuild -d
  ST=strip
 -datadir  = $(DESTDIR)/usr/share/cqrlog
 -bindir   = $(DESTDIR)/usr/bin
 -sharedir = $(DESTDIR)/usr/share
 +datadir  = $(DESTDIR)${PREFIX}/share/cqrlog
 +bindir   = $(DESTDIR)${PREFIX}/bin
 +sharedir = $(DESTDIR)${PREFIX}/share
  tmpdir   = /tmp
 +mandir   = $(DESTDIR)${PREFIX}
  
  cqrlog: src/cqrlog.lpi
 -	$(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
-+	$(CC) --pcp=. --ws=${PLATFORM} src/cqrlog.lpi --lazarusdir=%%LAZARUSDIR%%
++	$(LAZBUILD_CMD) $(LAZBUILD_ARGS) --ws=$(LCL_PLATFORM) --lazarusdir=$(LAZARUS_DIR) src/cqrlog.lpi
  	$(ST) src/cqrlog
  	gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
  
 @@ -38,7 +39,7 @@
  	install -d -v         $(sharedir)/icons/cqrlog
  	install -d -v         $(sharedir)/applications
  	install -d -v         $(sharedir)/appdata
 -	install -d -v         $(sharedir)/man/man1
 +	install -d -v         $(mandir)/man/man1
  	install    -v -m 0755 src/cqrlog $(bindir)
  	install    -v -m 0755 tools/cqrlog-apparmor-fix $(datadir)/cqrlog-apparmor-fix
  	install    -v -m 0644 ctyfiles/* $(datadir)/ctyfiles/
 @@ -64,7 +65,7 @@
  	install    -v -m 0644 images/icon/32x32/cqrlog.png $(sharedir)/pixmaps/cqrlog/cqrlog.png
  	install    -v -m 0644 images/icon/128x128/cqrlog.png $(sharedir)/icons/cqrlog.png
  	install    -v -m 0644 src/changelog.html $(datadir)/changelog.html
 -	install    -v -m 0644 tools/cqrlog.1.gz $(sharedir)/man/man1/cqrlog.1.gz
 +	install    -v -m 0644 tools/cqrlog.1.gz $(mandir)/man/man1/cqrlog.1.gz
  deb:
  	dpkg-buildpackage -rfakeroot -i -I
  deb_src:
Index: head/comms/cqrlog/files/patch-src_cqrlog.lpi
===================================================================
--- head/comms/cqrlog/files/patch-src_cqrlog.lpi	(revision 470850)
+++ head/comms/cqrlog/files/patch-src_cqrlog.lpi	(revision 470851)
@@ -1,11 +1,20 @@
---- src/cqrlog.lpi.orig	2016-04-20 16:06:15 UTC
-+++ src/cqrlog.lpi
-@@ -32,7 +32,7 @@
+--- src/cqrlog.lpi.orig	2017-12-30 02:10:01.000000000 -0500
++++ src/cqrlog.lpi	2018-04-07 19:17:15.225110000 -0500
+@@ -35,7 +35,7 @@
        <local>
          <FormatVersion Value="1"/>
          <CommandLineParams Value="--DEBUG=1"/>
 -        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
-+        <LaunchingApplication PathPlusParams="%%LOCALBASE%%/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
++        <LaunchingApplication PathPlusParams="/usr/local/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
        </local>
        <environment>
          <UserOverrides Count="2">
+@@ -748,7 +748,7 @@
+     <Version Value="11"/>
+     <SearchPaths>
+       <Libraries Value="$(LazarusDir)/lcl"/>
+-      <OtherUnitFiles Value="lnet/lib;richmemo;richmemo/gtk2;synapse"/>
++      <OtherUnitFiles Value="lnet/lib;richmemo;richmemo/gtk2;richmemo/qt;synapse"/>
+     </SearchPaths>
+     <Parsing>
+       <SyntaxOptions>
Index: head/multimedia/winff/Makefile
===================================================================
--- head/multimedia/winff/Makefile	(revision 470850)
+++ head/multimedia/winff/Makefile	(revision 470851)
@@ -1,89 +1,66 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
 
 PORTNAME=	WinFF
 PORTVERSION=	1.5.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
+PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 MASTER_SITES=	http://winff.org/docs/source/
 DISTNAME=	${_PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Convert your videos quickly, easily, and all at once
 
 LICENSE=	GPLv3
 
-BROKEN=		fails to build
-
-BUILD_DEPENDS=	lazbuild:editors/lazarus
 LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
 
 NO_WRKSUBDIR=	yes
-USES=		fpc
 USE_XORG=	x11
-USE_FPC=	cairo fcl-base fcl-image fcl-json fcl-xml pasjpeg regexpr x11
-USE_GNOME=	cairo
+USES=		fpc lazarus:flavors
+USE_FPC=	chm fcl-base fcl-image fcl-json fcl-xml pasjpeg regexpr x11
 _PORTNAME=	${PORTNAME:tl}
 DATADIR=	${PREFIX}/share/${_PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${_PORTNAME}
-INSTALLS_ICONS=	yes
 
 DESKTOP_ENTRIES=	"${PORTNAME}"	\
 			"${COMMENT}"	\
 			"${_PORTNAME}"	\
 			"${_PORTNAME}"	\
 			"AudioVideo;"	\
 			true
 
-LAZBUILD_CMD=	${LOCALBASE}/bin/lazbuild -d
-LAZARUS_VER=	1.8.0
-LAZARUS_DIR=	${LOCALBASE}/share/lazarus-${LAZARUS_VER}
-LCL_UNITS_DIR=	${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME}
+LAZARUS_NO_FLAVORS=	qt5
+LAZARUS_PROJECT_FILES=	winff.lpr
+LAZBUILD_ARGS=		-d
 
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4
+qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
+
 BUILD_WRKSRC=	${WRKDIR}/${PKGNAME}/${_PORTNAME}
 
-OPTIONS_SINGLE=		LCL
-OPTIONS_SINGLE_LCL=	GTK2 QT4
-
-GTK2_DESC=		Use gtk20 interface
-QT4_DESC=		Use qt4 interface
-
-OPTIONS_DEFAULT=	GTK2
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGTK2}
-USE_FPC+=	gtk2
-USE_GNOME+=	gtk20
-LCL_PLATFORM=	gtk2
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
+.if ${FLAVOR:Ugtk2:Mgtk2}
+USE_FPC+=	cairo
+USE_GNOME+=	cairo
+INSTALLS_ICONS=yes
 .endif
 
-.if ${PORT_OPTIONS:MQT4}
-LIB_DEPENDS+=	libQt4Pas.so:x11-toolkits/qt4pas
-LCL_PLATFORM=	qt
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
-.endif
-
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' ${BUILD_WRKSRC}/unit1.pas
 .for fp in unit1.pas unit4.pas scripts/check_presets.sh
 	${REINPLACE_CMD} -e 's|/usr/bin/|${LOCALBASE}/bin/|g' ${BUILD_WRKSRC}/${fp}
 .endfor
-
-do-build:
-	cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} -B winff.lpr
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME:tl} ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DATADIR}/languages
 	${INSTALL_DATA} ${BUILD_WRKSRC}/presets.xml ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/languages/* ${STAGEDIR}${DATADIR}/languages/
 	${INSTALL_MAN} ${BUILD_WRKSRC}/${_PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${BUILD_WRKSRC}/winff-icons/48x48/${_PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${BUILD_WRKSRC}/docs/*.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/multimedia/winff/files/patch-winff_unit1.pas
===================================================================
--- head/multimedia/winff/files/patch-winff_unit1.pas	(revision 470850)
+++ head/multimedia/winff/files/patch-winff_unit1.pas	(revision 470851)
@@ -1,43 +1,52 @@
---- winff/unit1.pas.orig	2013-08-16 03:55:46 UTC
-+++ winff/unit1.pas
-@@ -1228,13 +1228,13 @@ end;
+--- winff/unit1.pas	2016-09-21 16:40:54.000000000 -0500
++++ winff/unit1.pas	2018-03-07 17:35:42.310241000 -0500
+@@ -27,7 +27,7 @@
+   {$IFDEF WINDOWS} windows, shellapi, dos,{$endif}
+   {$IFDEF unix} baseunix, unix, {$endif}
+   laz_xmlcfg, dom, xmlread, xmlwrite, StdCtrls, Buttons, ActnList, Menus, unit2, unit3,
+-  unit4, unit5, gettext, translations, process
++  unit4, unit5, gettext, translations, process, LazFileUtils, LazUTF8
+   {$IFDEF TRANSLATESTRING}, DefaultTranslator{$ENDIF}, ExtCtrls, ComCtrls, Spin, UTF8Process,
+   PoTranslator, types, FileUtil, regexpr;
  
+@@ -1241,13 +1241,13 @@
+ 
  // launch browser
  procedure TfrmMain.launchbrowser(URL:string);
 -{$IFDEF linux}
 +{$IFDEF unix}
  var
  launcher:tprocess;
  s:string;
  {$endif}
  begin
 -  {$ifdef linux}
 +  {$ifdef unix}
    s:='';
    if fileexists('/usr/bin/konqueror') then s:='/usr/bin/konqueror';
    if fileexists('/usr/bin/mozilla-firefox') then s:='/usr/bin/mozilla-firefox';
-@@ -1369,13 +1369,13 @@ end;
+@@ -1382,13 +1382,13 @@
  
  // launch pdf
  procedure TfrmMain.LaunchPdf(pdffile:string);
 -{$IFDEF linux}
 +{$IFDEF unix}
  var
  launcher:tprocess;
  s:string;
  {$endif}
  begin
 -  {$ifdef linux}
 +  {$ifdef unix}
    s:='';
    if fileexists('/usr/bin/evince') then s:='/usr/bin/evince';
    if fileexists('/usr/bin/kpdf') then s:='/usr/bin/kpdf';
-@@ -1953,7 +1953,7 @@ var s : string;
+@@ -1982,7 +1982,7 @@
  language: string;
  begin
    language:=leftstr(lang,2);
 -  {$ifdef linux}
 +  {$ifdef unix}
    s :='';
    if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf.gz') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf.gz';
    if fileexists('/usr/share/doc/winff/WinFF.' + language + '.pdf') then s:='/usr/share/doc/winff/WinFF.' + language + '.pdf';
Index: head/net-p2p/transmission-remote-gui/Makefile
===================================================================
--- head/net-p2p/transmission-remote-gui/Makefile	(revision 470850)
+++ head/net-p2p/transmission-remote-gui/Makefile	(revision 470851)
@@ -1,68 +1,39 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	transmission-remote-gui
-PORTVERSION=	5.0.1
-PORTREVISION=	13
+PORTVERSION=	5.14.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net-p2p
-MASTER_SITES=	SF/${PROJECTNAME}/${PORTVERSION}/
-DISTNAME=	transgui-${PORTVERSION}-src
+PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	transmission-remote-gui
+GH_PROJECT=	transgui
+
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Remote GUI for transmission daemon
 
-BROKEN=		fails to build
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-BUILD_DEPENDS=	lazbuild:editors/lazarus \
-		fpcres:lang/fpc-utils
-RUN_DEPENDS=	transmission-daemon:net-p2p/transmission-daemon
+USES=		fpc iconv lazarus:flavors
+USE_FPC=	cairo chm fcl-base fcl-image fcl-json fcl-net pasjpeg rtl-objpas \
+		rtl-extra x11
 
-USES=		fpc
-USE_FPC=	cairo fcl-base fcl-image fcl-net pasjpeg rtl-objpas rtl-extra \
-		x11
-USES=		iconv zip
-USE_GNOME=	#
-
-WRKSRC=		${WRKDIR}/TransGUI
+WRKSRC=		${WRKDIR}/transgui-${PORTVERSION}
 PLIST_FILES=	bin/transgui
 SUB_FILES=	pkg-message
 
-LAZARUS_PROJECT_FILE=	transgui.lpi
-LAZBUILD_CMD=		${LOCALBASE}/bin/lazbuild -d
-LCL_UNITS_DIR=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME}
-LAZARUS_VER=		1.8.0
-LAZARUS_DIR=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}
+LAZARUS_PROJECT_FILES=	transgui.lpi
+LAZBUILD_ARGS=		-d
 PROJECT_NAME=		transgui
 
-OPTIONS_SINGLE=		LCL
-OPTIONS_SINGLE_LCL=	GTK2 QT4
-
-GTK2_DESC=		Use gtk20 interface
-QT4_DESC=		Use qt4 interface
-
-OPTIONS_DEFAULT=	GTK2
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGTK2}
-USE_FPC+=	gtk2
-USE_GNOME=	gtk20
-LCL_PLATFORM=	gtk2
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
-.endif
-
-.if ${PORT_OPTIONS:MQT4}
-LIB_DEPENDS+=	libQt4Pas.so:x11-toolkits/qt4pas
-LCL_PLATFORM=	qt
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
-.endif
-
-do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} ${LAZARUS_PROJECT_FILE}
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4 ${PORTNAME}-qt5
+qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt5
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt4
 
 do-install:
 	@cd ${WRKSRC}/units && \
 		${INSTALL_PROGRAM} transgui ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/net-p2p/transmission-remote-gui/distinfo
===================================================================
--- head/net-p2p/transmission-remote-gui/distinfo	(revision 470850)
+++ head/net-p2p/transmission-remote-gui/distinfo	(revision 470851)
@@ -1,2 +1,3 @@
-SHA256 (transgui-5.0.1-src.zip) = 9f59ca89169bd59c63c0c8bc30c3e32b654319ef53a117787fa99eff08ac1278
-SIZE (transgui-5.0.1-src.zip) = 947645
+TIMESTAMP = 1520359617
+SHA256 (transmission-remote-gui-transgui-v5.14.0_GH0.tar.gz) = 30c0bdd9ede5b11fdc3abf8768e4d52d28614c180e4d08e649bf9ce7b4230df2
+SIZE (transmission-remote-gui-transgui-v5.14.0_GH0.tar.gz) = 1699886
Index: head/net-p2p/transmission-remote-gui/pkg-descr
===================================================================
--- head/net-p2p/transmission-remote-gui/pkg-descr	(revision 470850)
+++ head/net-p2p/transmission-remote-gui/pkg-descr	(revision 470851)
@@ -1,5 +1,5 @@
 Transmission Remote GUI is feature rich cross platform front-end to remotely
 control Transmission daemon via its RPC protocol. It is faster and has more
 functionality than build-in Transmission web interface.
 
-WWW: http://code.google.com/p/transmisson-remote-gui/
+WWW: https://github.com/transmission-remote-gui/transgui
Index: head/russian/emkatic/Makefile
===================================================================
--- head/russian/emkatic/Makefile	(revision 470850)
+++ head/russian/emkatic/Makefile	(revision 470851)
@@ -1,63 +1,49 @@
 # Created by: Andrey Fesenko <andrey@bsdnir.info>
 # $FreeBSD$
 
 PORTNAME=	emkatic
-PORTVERSION=	0.28
-PORTREVISION=	3
+PORTVERSION=	0.36
 CATEGORIES=	russian emulators
+PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 MASTER_SITES=	SF/${PORTNAME}/eMKatic%20Source
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	andrey@bsdnir.info
 COMMENT=	Emulator of Elektronika RPN programmable calculator series
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-BUILD_DEPENDS=	lazbuild:editors/lazarus \
-		fpcres:lang/fpc-utils
+USES=		fpc lazarus:flavors
+USE_FPC=	cairo chm fcl-base fcl-image fcl-json fcl-registry fcl-xml \
+		pasjpeg regexpr rtl-extra x11
+USE_XORG=	x11
 
-USES=		fpc
-USE_FPC=	cairo chm fcl-base fcl-image fcl-json fcl-xml pasjpeg rtl-extra x11
+LAZARUS_PROJECT_FILES=	emkatic.lpi
+LAZBUILD_ARGS=		-d --pcp=${WRKSRC}/tmppcp
 
-PROJECT_FILE=	emkatic.lpi
-LAZARUS_VER=	1.8.0
-LAZBUILD_CMD=	${LOCALBASE}/bin/lazbuild -d --pcp=${WRKSRC}/tmppcp
-LAZARUS_DIR=	${LOCALBASE}/share/lazarus-${LAZARUS_VER}
-LCL_UNITS_DIR=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}
-
 PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 PORTDOCS=	CHANGELOG.*.txt README.*.txt
 
+gtk2_CONFLICTS_INSTALL=	ru-${PORTNAME}-qt4 ru-${PORTNAME}-qt5
+qt4_CONFLICTS_INSTALL=	ru-${PORTNAME}-gtk2 ru-${PORTNAME}-qt5
+qt5_CONFLICTS_INSTALL=	ru-${PORTNAME}-gtk2 ru-${PORTNAME}-qt4
+
 OPTIONS_DEFINE=		DOCS PORTAUDIO
-OPTIONS_SINGLE=		GUI
-OPTIONS_SINGLE_GUI=	GTK2 QT4
-OPTIONS_DEFAULT=	GTK2 PORTAUDIO
+OPTIONS_DEFAULT=	PORTAUDIO
 
-GTK2_DESC=	Build with GTK+ 2 interface
-QT4_DESC=	Build with Qt 4 interface
-
-GTK2_BUILD_DEPENDS=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
-GTK2_USE=		GNOME=gtk20 FPC=gtk2
-GTK2_VARS=		LCL_PLATFORM=gtk2
-
-QT4_BUILD_DEPENDS=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
-QT4_LIB_DEPENDS=	libQt4Pas.so:x11-toolkits/qt4pas
-QT4_VARS=		LCL_PLATFORM=qt
-
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
-do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --ws="${LCL_PLATFORM}" \
-			--lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE}
+.if ${FLAVOR:Ugtk2:Mgtk2}
+USE_GNOME+=	cairo
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/russian/emkatic/distinfo
===================================================================
--- head/russian/emkatic/distinfo	(revision 470850)
+++ head/russian/emkatic/distinfo	(revision 470851)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479326115
-SHA256 (emkatic-0.28-src.tar.gz) = 449aad9358e3f3433ced59b396f3104cf1af020d13116bc0862c81526c5b256f
-SIZE (emkatic-0.28-src.tar.gz) = 573493
+TIMESTAMP = 1520360250
+SHA256 (emkatic-0.36-src.tar.gz) = 10df44162d0a31a2a23fd1a79d82e933d16add796802275cc9d3b8e797ae786a
+SIZE (emkatic-0.36-src.tar.gz) = 665151
Index: head/x11-fm/doublecmd/Makefile
===================================================================
--- head/x11-fm/doublecmd/Makefile	(revision 470850)
+++ head/x11-fm/doublecmd/Makefile	(revision 470851)
@@ -1,421 +1,396 @@
 # Created by: Beñat Gonzalez Etxepare <bbtruk@users.sourceforge.net>
 # $FreeBSD$
 
 PORTNAME=	doublecmd
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	0.8.2
 CATEGORIES=	x11-fm
+PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 MASTER_SITES=	SF/${PORTNAME}/Double%20Commander%20Source
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 DISTFILES=	${DISTNAME}.tar.gz ${PORTNAME}-help-${HELPVERSION}-src.tar.gz
 
 MAINTAINER=	bbtruk@users.sourceforge.net
 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
-
 PORTDOCS=	*
 
-USES=		dos2unix desktop-file-utils fpc
+USES=		dos2unix desktop-file-utils fpc lazarus:flavors
 USE_FPC=	cairo chm fcl-base fcl-db fcl-image fcl-json fcl-registry \
 		fcl-xml iconvenc pasjpeg rtl-extra x11 regexpr
 USE_XORG=	x11
 DOS2UNIX_FILES=	src/dmhelpmanager.pas
 
 PLIST=		${WRKDIR}/pkg-plist
 
-PROJECT_FILE=	src/doublecmd.lpi
-LAZARUS_VER=	1.8.0
-LAZBUILD_CMD=	${LOCALBASE}/bin/lazbuild -d --pcp=${WRKSRC}/tmppcp
-LAZARUS_DIR=	${LOCALBASE}/share/lazarus-${LAZARUS_VER}
+LAZARUS_PROJECT_FILES=	components/chsdet/chsdet.lpk
+LAZARUS_PROJECT_FILES+=	components/CmdLine/cmdbox.lpk
+LAZARUS_PROJECT_FILES+=	components/multithreadprocs/multithreadprocslaz.lpk
+LAZARUS_PROJECT_FILES+=	components/dcpcrypt/dcpcrypt.lpk
+LAZARUS_PROJECT_FILES+=	components/doublecmd/doublecmd_common.lpk
+LAZARUS_PROJECT_FILES+=	components/KASToolBar/kascomp.lpk
+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
 
 HELPVERSION=	0.6.0
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DOCSRC=		${WRKDIR}/${PORTNAME}-help-${HELPVERSION}
 
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4
+qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
+
 OPTIONS_DEFINE=		DOCS DEBUG
-OPTIONS_SINGLE=		LCL
-OPTIONS_SINGLE_LCL=	GTK2 QT4
 OPTIONS_GROUP=		WCX WDX WFX WLX DSX
 OPTIONS_GROUP_WCX=	WCX_CPIO \
 			WCX_DEB \
 			WCX_RPM \
 			WCX_UNBZ2 \
 			WCX_UNRAR \
 			WCX_ZIP
 OPTIONS_GROUP_WDX=	WDX_AUDIOINFO \
 			WDX_RPM \
 			WDX_DEB \
 			WDX_SVN \
 			WDX_XPI \
 			WDX_SCRIPTS \
 			WDX_TEXTLINE
 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
 WCX_DEB_DESC=	Debian package archive support
 WCX_RPM_DESC=	Red Hat package archive support
 WCX_UNBZ2_DESC=	BZIP2 format support
 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
 WFX_SAMBA_DESC=	SMB protocol support
 
 WLX_DESC=	Internal viewer plugins
 WLX_MPLAYER_DESC=	Use MPlayer for multimedia files
 
 DSX_DESC=	Search plugins
 DSX_LOCATE_DESC=	Support locate command
 
-OPTIONS_DEFAULT=	GTK2 \
-			WCX_CPIO \
+OPTIONS_DEFAULT=	WCX_CPIO \
 			WCX_DEB \
 			WCX_RPM \
 			WCX_UNRAR \
 			WCX_ZIP \
 			WDX_AUDIOINFO \
 			WDX_RPM \
 			WDX_DEB \
 			WDX_SVN \
 			WDX_SCRIPTS \
 			WDX_TEXTLINE \
 			WDX_XPI \
 			WFX_FTP \
 			WFX_SAMBA \
 			DSX_LOCATE
 
-GTK2_USE=		fpc=gtk2 gnome=gtk20
-GTK2_BUILD_DEPENDS=	${LAZARUS_DIR}/lcl/units/${BUILDNAME}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
-
-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
 WLX_MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MGTK2}
-LCL_PLATFORM=	gtk2
-USE_GNOME+=	cairo gdkpixbuf2
-.elif ${PORT_OPTIONS:MQT4}
-LCL_PLATFORM=	qt
-.endif
-
 .if ${PORT_OPTIONS:MDEBUG}
-BUILD_MODE=	Debug
+LAZBUILD_ARGS+=	-bm="Debug"
 .else
-BUILD_MODE=	NoDebug Full Optimizations
+LAZBUILD_ARGS+=	-bm="NoDebug Full Optimizations"
 .endif
 
 .if ${PORT_OPTIONS:MWFX_FTP}
 USE_FPC+=	fcl-net
+LAZARUS_PROJECT_FILES+=		plugins/wfx/ftp/src/ftp.lpi
 .endif
 
-pre-patch:
-	${TR} '\r' '\n' < ${WRKSRC}/src/uGlobsPaths.pas > ${WRKSRC}/src/uGlobsPaths.pas.unix
-	${MV} ${WRKSRC}/src/uGlobsPaths.pas.unix ${WRKSRC}/src/uGlobsPaths.pas
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \
-		${WRKSRC}/src/uGlobsPaths.pas
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/plugins/wlx/WlxMplayer/src/wlxMplayer.lpr
-
-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 synunihighlighter/synuni.lpk
-	@cd ${WRKSRC}/components && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "${FILE}"
-.endfor
-
 .if ${PORT_OPTIONS:MWCX_CPIO}
-	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/cpio/src/cpio.lpi"
+LAZARUS_PROJECT_FILES+=		plugins/wcx/cpio/src/cpio.lpi
 .endif
+
 .if ${PORT_OPTIONS:MWCX_DEB}
-	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/deb/src/deb.lpi"
+LAZARUS_PROJECT_FILES+=		plugins/wcx/deb/src/deb.lpi
 .endif
+
 .if ${PORT_OPTIONS:MWCX_UNBZ2}
-	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/unbz2/src/unbz2.lpi"
+LAZARUS_PROJECT_FILES+=		plugins/wcx/unbz2/src/unbz2.lpi
 .endif
+
 .if ${PORT_OPTIONS:MWCX_RPM}
-	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/rpm/src/rpm.lpi"
+LAZARUS_PROJECT_FILES+=		plugins/wcx/rpm/src/rpm.lpi
 .endif
+
 .if ${PORT_OPTIONS:MWCX_UNRAR}
-	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/unrar/src/unrar.lpi"
+LAZARUS_PROJECT_FILES+=		plugins/wcx/unrar/src/unrar.lpi
 .endif
+
 .if ${PORT_OPTIONS:MWCX_ZIP}
-	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wcx/zip/src/Zip.lpi"
+LAZARUS_PROJECT_FILES+=		plugins/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"
+LAZARUS_PROJECT_FILES+=		plugins/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"
+LAZARUS_PROJECT_FILES+=		plugins/wdx/rpm_wdx/src/rpm_wdx.lpi
 .endif
+
 .if ${PORT_OPTIONS:MWDX_DEB}
-	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/deb_wdx/src/deb_wdx.lpi"
+LAZARUS_PROJECT_FILES+=		plugins/wdx/deb_wdx/src/deb_wdx.lpi
 .endif
+
 .if ${PORT_OPTIONS:MWDX_SVN}
-	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/svn_wdx/src/svn_wdx.lpi"
+LAZARUS_PROJECT_FILES+=		plugins/wdx/svn_wdx/src/svn_wdx.lpi
 .endif
+
 .if ${PORT_OPTIONS:MWDX_XPI}
-	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wdx/xpi_wdx/src/xpi_wdx.lpi"
+LAZARUS_PROJECT_FILES+=		plugins/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"
+LAZARUS_PROJECT_FILES+=		plugins/wdx/textline/src/TextLine.lpi
 .endif
 
-.if ${PORT_OPTIONS:MWFX_FTP}
-	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wfx/ftp/src/ftp.lpi"
-.endif
 .if ${PORT_OPTIONS:MWFX_SAMBA}
-	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wfx/samba/src/samba.lpi"
+LAZARUS_PROJECT_FILES+= 	plugins/wfx/samba/src/samba.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWLX_MPLAYER}
-	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "wlx/WlxMplayer/src/wlxMplayer.lpi"
+LAZARUS_PROJECT_FILES+=		plugins/wlx/WlxMplayer/src/wlxMplayer.lpi
 .endif
 
 .if ${PORT_OPTIONS:MDSX_LOCATE}
-	@cd ${WRKSRC}/plugins && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --lazarusdir=${LAZARUS_DIR} --ws=${LCL_PLATFORM} "dsx/DSXLocate/src/DSXLocate.lpi"
+LAZARUS_PROJECT_FILES+=		plugins/dsx/DSXLocate/src/DSXLocate.lpi
 .endif
 
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --bm="${BUILD_MODE}" --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE}
+LAZARUS_PROJECT_FILES+=		src/doublecmd.lpi
 
+pre-patch:
+	${TR} '\r' '\n' < ${WRKSRC}/src/uGlobsPaths.pas > ${WRKSRC}/src/uGlobsPaths.pas.unix
+	${MV} ${WRKSRC}/src/uGlobsPaths.pas.unix ${WRKSRC}/src/uGlobsPaths.pas
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%DOCSDIR%%|${DOCSDIR}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \
+		${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
+
 post-build:
 	@${RM} -r ${DOCSRC}/*/dev-help
 
 pre-install:
 	@${RM} ${PLIST}
 
 	@${ECHO_CMD} "@dir %%DATADIR%%/plugins/wcx" >> ${PLIST}
 	@${ECHO_CMD} "@dir %%DATADIR%%/plugins/wdx" >> ${PLIST}
 	@${ECHO_CMD} "@dir %%DATADIR%%/plugins/wfx" >> ${PLIST}
 	@${ECHO_CMD} "@dir %%DATADIR%%/plugins/wlx" >> ${PLIST}
 	@${ECHO_CMD} "@dir %%DATADIR%%/plugins/dsx" >> ${PLIST}
 
 .if ${PORT_OPTIONS:MWCX_CPIO}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/cpio/cpio.wcx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWCX_DEB}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/deb/deb.wcx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWCX_RPM}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/rpm/rpm.wcx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWCX_UNBZ2}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/unbz2/unbz2.wcx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWCX_UNRAR}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wcx/unrar/unrar.wcx" >> ${PLIST}
 .endif
 .if ${PORT_OPTIONS:MWCX_ZIP}
 	@${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
 .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
 .if ${PORT_OPTIONS:MWDX_SCRIPTS}
 	@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}
 .endif
 .if ${PORT_OPTIONS:MWFX_SAMBA}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wfx/samba/samba.wfx" >> ${PLIST}
 .endif
 
 .if ${PORT_OPTIONS:MWLX_MPLAYER}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/wlx/wlxmplayer/wlxmplayer.wlx" >> ${PLIST}
 .endif
 
 .if ${PORT_OPTIONS:MDSX_LOCATE}
 	@${ECHO_CMD} "%%DATADIR%%/plugins/dsx/dsxlocate/dsxlocate.dsx" >> ${PLIST}
 .endif
 
 .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
 	@${ECHO_CMD} ${FILE} >> ${PLIST}
 .endfor
 
 	@cd ${WRKSRC}/language && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/language/|' >> ${PLIST}
 
 	@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}
 
 	@${ECHO_CMD} "man/man1/doublecmd.1.gz" >> ${PLIST}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wlx
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/dsx
 .if ${PORT_OPTIONS:MWCX_CPIO}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/cpio
 	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/cpio/lib/cpio.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/cpio/
 .endif
 .if ${PORT_OPTIONS:MWCX_DEB}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/deb
 	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/deb/lib/deb.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/deb/
 .endif
 .if ${PORT_OPTIONS:MWCX_RPM}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/rpm/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/rpm/lib/rpm.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/rpm/
 .endif
 .if ${PORT_OPTIONS:MWCX_UNBZ2}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/unbz2/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/unbz2/lib/unbz2.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/unbz2/
 .endif
 .if ${PORT_OPTIONS:MWCX_UNRAR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wcx/unrar/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wcx/unrar/lib/unrar.wcx ${STAGEDIR}${DATADIR}/plugins/wcx/unrar/
 .endif
 .if ${PORT_OPTIONS:MWCX_ZIP}
 	@${MKDIR} ${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/
 .endif
 .if ${PORT_OPTIONS:MWDX_DEB}
 	@${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/
 .endif
 .if ${PORT_OPTIONS:MWDX_SCRIPTS}
 	@${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/
-	${INSTALL_LIB} ${WRKSRC}/plugins/wfx/ftp/lib/ftp.wfx ${STAGEDIR}${DATADIR}/plugins/wfx/ftp/
+	${INSTALL_LIB} ${WRKSRC}/plugins/wfx/ftp/ftp.wfx ${STAGEDIR}${DATADIR}/plugins/wfx/ftp/
 .endif
 .if ${PORT_OPTIONS:MWFX_SAMBA}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wfx/samba/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wfx/samba/lib/samba.wfx ${STAGEDIR}${DATADIR}/plugins/wfx/samba/
 .endif
 
 .if ${PORT_OPTIONS:MWLX_MPLAYER}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wlx/wlxmplayer/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wlx/WlxMplayer/lib/wlxmplayer.wlx ${STAGEDIR}${DATADIR}/plugins/wlx/wlxmplayer/
 .endif
 
 .if ${PORT_OPTIONS:MDSX_LOCATE}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/dsx/dsxlocate/
 	${INSTALL_LIB} ${WRKSRC}/plugins/dsx/DSXLocate/lib/dsxlocate.dsx ${STAGEDIR}${DATADIR}/plugins/dsx/dsxlocate/
 .endif
 
 .for DIRE in language pixmaps sdk
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${DIRE}
 	@cd ${WRKSRC}/${DIRE} && \
 		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \; && \
 			${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/${DIRE}/{}" \;
 .endfor
 
 .for FILE in doublecmd.ext.example pixmaps.txt multiarc.ini install/linux/doublecmd.xml
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DATADIR}
 .endfor
 
 	${INSTALL_DATA} ${WRKSRC}/doublecmd.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/mainicon/alt/dcfinal.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/doublecmd.svg
 
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/install/linux/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}/
 	${INSTALL_MAN} ${WRKSRC}/install/linux/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@cd ${DOCSRC} && \
 		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \
 			${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DOCSDIR}/{}" \;
 .endif
 
 .include <bsd.port.mk>
Index: head/x11-fm/doublecmd/distinfo
===================================================================
--- head/x11-fm/doublecmd/distinfo	(revision 470850)
+++ head/x11-fm/doublecmd/distinfo	(revision 470851)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1514048041
-SHA256 (doublecmd-0.8.1-src.tar.gz) = 7d6e26460b1e57c0af4b26f6fab0c9a38287672f8d5d92d84e2dc5d0e25e75a8
-SIZE (doublecmd-0.8.1-src.tar.gz) = 7566344
+TIMESTAMP = 1520360222
+SHA256 (doublecmd-0.8.2-src.tar.gz) = 57a3dd94e9aa00b381f2b844a9000fbc7f28dae1bdd6409b170b1c26b7b4ba43
+SIZE (doublecmd-0.8.2-src.tar.gz) = 7570292
 SHA256 (doublecmd-help-0.6.0-src.tar.gz) = d50a58f0e8c25c07720f2afd987213f330dfce268e2aef349d1da3de2eef1c39
 SIZE (doublecmd-help-0.6.0-src.tar.gz) = 11514996