Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -3229,8 +3229,6 @@
 math/octave-forge-times||2012-04-18|Deprecated upstream
 www/fpc-httpd13||2012-04-19|Obsolete freepascal unit. Use www/fpc-httpd22 instead of it
 www/fpc-httpd20||2012-04-19|Obsolete freepascal unit. Use www/fpc-httpd22 instead of it
-editors/lazarus-gtk2||2012-04-20|Never fully added. Use editors/lazarus instead
-editors/lazarus-qt4||2012-04-20|Never fully added. Use editors/lazarus instead
 net/socks5||2012-04-21|Removed
 games/netpanzer-data||2012-04-25|No longer needed
 www/typo344||2012-04-30|Has expired: Support will end in the near future, see http://typo3.org/download/packages/ for details
@@ -10253,3 +10251,8 @@
 converters/php5-bsdconv|converters/php-bsdconv|2018-04-03|It supports PHP 7 since 11.5.0
 converters/rubygem-bsdconv|converters/rubygem-ruby-bsdconv|2018-04-03|Rename to match our rubygem- port naming
 www/piwik|www/matomo|2018-04-06|Project renamed
+editors/lazarus-lcl-gtk2|editors/lazarus|2018-04-07|Removed, no longer needed
+editors/lazarus-lcl-nogui||2018-04-07|Removed, no longer needed
+editors/lazarus-lcl-qt|editors/lazarus-qt4|2018-04-07|Removed, no longer needed
+editors/lazarus-lcl-qt5|editors/lazarus-qt5|2018-04-07|Removed, no longer needed
+editors/lazarus-lcl-units||2018-04-07|Removed, no longer needed
Index: Mk/Uses/lazarus.mk
===================================================================
--- Mk/Uses/lazarus.mk
+++ Mk/Uses/lazarus.mk
@@ -0,0 +1,140 @@
+#
+# $FreeBSD$
+#
+# Support for Lazarus-based ports.
+#
+# Feature:      lazarus
+# Usage:        USES=lazarus
+# Valid ARGS:   (none), gtk2, qt4, qt5, flavors
+#
+# (none)    - This automatically build lazarus-app with gtk2 interface
+#
+# gtk2      - This automatically build lazarus-app with gtk2 interface
+#     
+# qt4       - This automatically build lazarus-app with qt4 interface
+#
+# qt5       - This automatically build lazarus-app with qt5 interface
+#                
+# flavors   - This automatically build lazarus-app with flavors feature
+#
+# If the port not requires compile lazarus project files automatically, you can
+# defined the following:
+#
+# NO_LAZBUILD=	yes
+#                
+# Variables for ports:
+#
+# LAZARUS_PROJECT_FILES		- List of lpi files. It must not be empty
+#				Default: empty
+# LAZARUS_DIR                   - Path to lazarus installation directory
+#                               Default: ${LOCALBASE}/share/lazarus-${LAZARUS_VER}
+# LAZBUILD_ARGS                 - lazbuild extra args. It could be -d most of cases.
+#                                 See man lazbuild for more information
+#                               Default: empty
+# LAZARUS_NO_FLAVORS		- Do NOT build these lazarus flavors.
+#                                 If LAZARUS_NO_FLAVORS is not define then all
+#                             	  valid lazarus flavors are assumed.
+#
+# Example:
+#        
+#	USES+=	lazarus:flavors
+#	LAZARUS_NO_FLAVORS=qt5
+#
+
+.if !defined(_INCLUDE_USES_LAZARUS_MK)
+
+LAZARUS_Include_MAINTAINER= acm@FreeBSD.org
+
+_INCLUDE_USES_LAZARUS_MK=   yes
+
+.if defined(DEFAULT_LAZARUS_VER)
+WARNING+=	"DEFAULT_LAZARUS_VER is defined, consider using DEFAULT_VERSIONS=lazarus=${DEFAULT_LAZARUS_VER} instead"
+.endif
+
+.if ${lazarus_ARGS:Ngtk2:Nqt4:Nqt5:Nflavors}
+IGNORE=		Unknown argument for USES=lazarus: ${lazarus_ARGS:Ngtk2:Nqt4:Nqt5:Nflavors}
+.endif
+
+.if !empty(LAZARUS_NO_FLAVORS)
+.if ${LAZARUS_NO_FLAVORS:Ngtk2:Nqt4:Nqt5}
+IGNORE=         Unknown argument for LAZARUS_NO_FLAVORS: ${LAZARUS_NO_FLAVORS:Ngtk2:Nqt4:Nqt5}
+.endif
+.endif
+
+DEFAULT_LAZARUS_VER=	${LAZARUS_DEFAULT}
+DEFAULT_FPC_VER=	${FPC_DEFAULT}
+# When adding a version, please keep the comment in
+# Mk/bsd.default-versions.mk in sync.
+LAZARUS_VER=		${DEFAULT_LAZARUS_VER}
+FPC_VER=		${DEFAULT_FPC_VER}
+LAZARUS_ARCH=		${ARCH:S/amd64/x86_64/}
+LAZARUS_PROJECT_FILES?=	# empty
+LAZARUS_DIR?=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}
+
+ONLY_FOR_ARCHS=		i386 amd64
+ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than i386 and amd64
+
+BUILD_DEPENDS+=		fpcres:lang/fpc-utils
+
+BUILDNAME=		${LAZARUS_ARCH}-${OPSYS:tl}
+LCL_UNITS_DIR=		${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME}
+MKINSTDIR=		${LOCALBASE}/lib/fpc/${FPC_VER}/fpmkinst/${BUILDNAME}
+
+.if ${lazarus_ARGS:Mflavors}
+FLAVORS=	gtk2 qt4 qt5
+.for flavor in ${LAZARUS_NO_FLAVORS}
+FLAVORS:=	${FLAVORS:N${flavor}}
+.endfor
+
+.if empty(FLAVOR)
+FLAVOR= ${FLAVORS:[1]}
+.endif
+.endif
+
+LAZARUS_PKGNAMESUFFIX=	-${FLAVOR}
+
+.if ${lazarus_ARGS:Mgtk2} || ${FLAVOR} == gtk2
+BUILD_DEPENDS+=	${MKINSTDIR}/gtk2.fpm:x11-toolkits/fpc-gtk2
+LIB_DEPENDS+=	libglib-2.0.so:devel/glib20 \
+		libgtk-x11-2.0.so:x11-toolkits/gtk20 \
+		libatk-1.0.so:accessibility/atk \
+		libpango-1.0.so:x11-toolkits/pango \
+		libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2
+LCL_PLATFORM=	gtk2
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus
+.endif
+
+.if ${lazarus_ARGS:Mqt4} || ${FLAVOR} == qt4
+LIB_DEPENDS+=	libQt4Pas.so:x11-toolkits/qt4pas
+LCL_PLATFORM=	qt
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-qt4
+.endif
+
+.if ${lazarus_ARGS:Mqt5} || ${FLAVOR} == qt5
+LIB_DEPENDS+=	libQt5Pas.so:x11-toolkits/qt5pas
+LCL_PLATFORM=	qt5
+BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-qt5
+.endif
+
+LAZBUILD_CMD=	${LOCALBASE}/bin/lazbuild
+LAZBUILD_ARGS?=	# empty
+
+_USES_POST+=	lazarus
+.endif 
+# End of _INCLUDE_USES_LAZARUS_MK
+
+.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_LAZARUS_POST_MK)
+_INCLUDE_USES_LAZARUS_POST_MK=	yes
+
+.if !defined(NO_LAZBUILD)
+.if !target(do-build)
+do-build:
+.	for PROJECT_FILE in ${LAZARUS_PROJECT_FILES}
+		@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} \
+			${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} ${PROJECT_FILE})
+.	endfor
+.endif # !target(do-build)
+.endif
+
+.endif
+# End of _INCLUDE_USES_LAZARUS_POST_MK
Index: archivers/peazip/Makefile
===================================================================
--- archivers/peazip/Makefile
+++ archivers/peazip/Makefile
@@ -2,8 +2,9 @@
 # $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
 
@@ -12,58 +13,38 @@
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	lazbuild:editors/lazarus \
-		fpcres:lang/fpc-utils
-
-USES=		dos2unix 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}-qt*
+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.pre.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}
+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
@@ -99,12 +80,6 @@
 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
@@ -124,4 +99,4 @@
 		${INSTALL_DATA} peazip.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 	${INSTALL_SCRIPT} ${WRKDIR}/pea ${WRKDIR}/pealauncher ${WRKDIR}/peazip ${STAGEDIR}${PREFIX}/bin/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: archivers/peazip/distinfo
===================================================================
--- archivers/peazip/distinfo
+++ archivers/peazip/distinfo
@@ -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: cad/zcad/Makefile
===================================================================
--- cad/zcad/Makefile
+++ cad/zcad/Makefile
@@ -3,52 +3,51 @@
 
 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=		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}-qt*
+qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2-* ${PORTNAME}-qt5-*
+
 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}
+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}
+MAKE_ENV+=	GUI=qt
+.endif
 
 post-patch:
 	@${EGREP} -lR 'IFN?DEF LINUX' ${BUILD_WRKSRC} | ${XARGS} \
@@ -74,8 +73,12 @@
 # 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
Index: cad/zcad/files/makefile
===================================================================
--- cad/zcad/files/makefile
+++ cad/zcad/files/makefile
@@ -6,7 +6,7 @@
 # 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
Index: comms/cqrlog/Makefile
===================================================================
--- comms/cqrlog/Makefile
+++ comms/cqrlog/Makefile
@@ -3,22 +3,22 @@
 
 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=		shebangfix
+USES=		fpc lazarus:flavors shebangfix
 SHEBANG_FILES=	tools/cqrlog-apparmor-fix \
 		voice_keyer/voice_keyer.sh
   
@@ -28,24 +28,19 @@
 
 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
 
@@ -67,8 +62,6 @@
 		${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: comms/cqrlog/files/patch-Makefile
===================================================================
--- comms/cqrlog/files/patch-Makefile
+++ comms/cqrlog/files/patch-Makefile
@@ -2,7 +2,7 @@
 +++ 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
@@ -15,7 +15,7 @@
  
  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
  
Index: comms/cqrlog/files/patch-src_cqrlog.lpi
===================================================================
--- comms/cqrlog/files/patch-src_cqrlog.lpi
+++ comms/cqrlog/files/patch-src_cqrlog.lpi
@@ -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: editors/Makefile
===================================================================
--- editors/Makefile
+++ editors/Makefile
@@ -73,11 +73,8 @@
     SUBDIR += komodo-edit
     SUBDIR += latexila
     SUBDIR += lazarus
-    SUBDIR += lazarus-lcl-gtk2
-    SUBDIR += lazarus-lcl-nogui
-    SUBDIR += lazarus-lcl-qt
-    SUBDIR += lazarus-lcl-qt5
-    SUBDIR += lazarus-lcl-units
+    SUBDIR += lazarus-qt4
+    SUBDIR += lazarus-qt5
     SUBDIR += le
     SUBDIR += leafpad
     SUBDIR += led
Index: editors/coedit/Makefile
===================================================================
--- editors/coedit/Makefile
+++ editors/coedit/Makefile
@@ -2,17 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	coedit
-PORTVERSION=	3.6.1
+PORTVERSION=	3.6.4
 DISTVERSIONPREFIX=v
 CATEGORIES=	editors
+PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	IDE for the D programming language
 
 LICENSE=	BSL
 
-BUILD_DEPENDS=	lazbuild:editors/lazarus \
-		ldmd2:lang/ldc \
+BUILD_DEPENDS=	ldmd2:lang/ldc \
 		${LOCALBASE}/lib/d/libiz.a:devel/iz \
 		${LOCALBASE}/lib/d/libdparse.a:devel/libdparse
 RUN_DEPENDS=	ldmd2:lang/ldc \
@@ -26,9 +26,11 @@
 GH_ACCOUNT=	BBasile
 GH_PROJECT=	Coedit
 
-USE_FPC=	cairo chm fcl-base fcl-db fcl-image fcl-json fcl-net fcl-registry \
+USES=		fpc lazarus:flavors
+USE_FPC=	chm fcl-base fcl-db fcl-image fcl-json fcl-net fcl-registry \
 		fcl-stl fcl-web fcl-xml numlib openssl pasjpeg rtl-objpas \
 		regexpr rtl-extra x11
+USE_XORG=	x11
 
 DESKTOP_ENTRIES="Coedit" \
 		"IDE for the D programming language" \
@@ -37,39 +39,24 @@
 		"Application;IDE;Development;" \
 		${TRUE}
 
-OPTIONS_SINGLE=		LCL
-OPTIONS_SINGLE_LCL=	GTK2 QT4 QT5
+D_LIB_DIR=	${LOCALBASE}/lib/d
+D_INCLUDE_DIR=	${LOCALBASE}/include/d
 
-GTK2_DESC=		Use gtk20 interface
-QT4_DESC=		Use qt4 interface
-QT5_DESC=		Use qt5 interface
+LAZARUS_PROJECT_FILES=	anchordocking/anchordocking.lpk lazproj/coedit.lpi
 
-OPTIONS_DEFAULT=	GTK2
+LAZBUILD_ARGS=	-d
 
-D_LIB_DIR=	${LOCALBASE}/lib/d
-D_INCLUDE_DIR=	${LOCALBASE}/include/d
-PROJECT_FILE=	lazproj/coedit.lpi
-LAZARUS_VER=	1.8.0
-LAZBUILD_CMD=	${LOCALBASE}/bin/lazbuild
-LAZARUS_DIR=	${WRKSRC}/lazarus-${LAZARUS_VER}
-LCL_UNITS_DIR=	${LOCALBASE}/share/lazarus-${LAZARUS_VER}/lcl/units/${BUILDNAME}
 LDMD2_CMD=	${LOCALBASE}/bin/ldmd2
 
-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=		LCL_PLATFORM=gtk2
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt*
+qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2-* ${PORTNAME}-qt5-*
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2-* ${PORTNAME}-qt4-*
 
-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=		LCL_PLATFORM=qt
+.if ${FLAVOR:Ugtk2}
+USE_FPC+=	cairo
+USE_GNOME+=	cairo
+.endif
 
-QT4_BUILD_DEPENDS=	${LCL_UNITS_DIR}/qt5/interfaces.ppu:editors/lazarus-lcl-qt5
-QT4_LIB_DEPENDS=	libQt5Pas.so:x11-toolkits/qt5pas
-QT4_MAKE_ENV=		GUI=qt5
-QT4_VARS=		LCL_PLATFORM=qt5
-
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LDMD2_CMD%%|${LDMD2_CMD}|g' \
 				-e 's|%%D_LIB_DIR%%|${D_LIB_DIR}|g' \
@@ -78,20 +65,12 @@
 	${REINPLACE_CMD} -e 's|LINUX|UNIX|g' ${WRKSRC}/src/ce_common.pas ${WRKSRC}/src/ce_dcd.pas
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/ce_compilers.pas
 
-pre-build:
+post-configure:
 	@${MKDIR} ${WRKSRC}/tmppcp
-	@${MKDIR} ${LAZARUS_DIR}
-	@cd ${LOCALBASE}/share/lazarus-${LAZARUS_VER} && \
-		${FIND} * -type d -exec ${MKDIR} ${LAZARUS_DIR}/{} \;
-	@cd ${LOCALBASE}/share/lazarus-${LAZARUS_VER} && \
-		${FIND} * -type f -exec ${LN} -fs ${LOCALBASE}/share/lazarus-${LAZARUS_VER}/{} ${LAZARUS_DIR}/{} \;
-	@${FIND} ${LAZARUS_DIR} -type d -name ${BUILDNAME} -type d -print0 | \
-		${XARGS} -0 ${RM} -R
+	${CP} -a  ${LAZARUS_DIR}/components/anchordocking ${WRKSRC}
 
-do-build:
+pre-build:
 	@cd ${WRKSRC}/dastworx && ${SH} build.sh
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${LAZBUILD_CMD} --ws=${LCL_PLATFORM} --lazarusdir=${LAZARUS_DIR} --pcp=${WRKSRC}/tmppcp ${PROJECT_FILE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/coedit ${STAGEDIR}${PREFIX}/bin/
Index: editors/coedit/distinfo
===================================================================
--- editors/coedit/distinfo
+++ editors/coedit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1517606831
-SHA256 (BBasile-Coedit-v3.6.1_GH0.tar.gz) = 8bb0b6ec365c70c81a89e696b9fbfcd9a0a77f3fd5dae8b94b4b4049d95b0e9b
-SIZE (BBasile-Coedit-v3.6.1_GH0.tar.gz) = 3857174
+TIMESTAMP = 1520727939
+SHA256 (BBasile-Coedit-v3.6.4_GH0.tar.gz) = afed9234facf9683e0de3620f97d2f00e4b35aae38e7b39b3bd5333ba3278052
+SIZE (BBasile-Coedit-v3.6.4_GH0.tar.gz) = 3862290
Index: editors/coedit/files/patch-dastworx_build.sh
===================================================================
--- editors/coedit/files/patch-dastworx_build.sh
+++ editors/coedit/files/patch-dastworx_build.sh
@@ -1,6 +1,6 @@
---- dastworx/build.sh.orig	2017-07-14 05:55:36 UTC
-+++ dastworx/build.sh
-@@ -1,13 +1,3 @@
+--- dastworx/build.sh	2018-02-11 21:48:35.000000000 -0500
++++ dastworx/build.sh	2018-02-12 12:01:10.311013000 -0500
+@@ -1,18 +1,3 @@
 -#iz sources
 -cd ../etc/iz/import/
 -iz=$(find `pwd` -type f -name \*.d)
@@ -11,23 +11,23 @@
 -dparse=$(find `pwd` -type f -name \*.d)
 -cd ../../../dastworx
 -
+-#stdx-alloc sources
+-cd ../etc/stdx-allocator/source/
+-stdxalloc=$(find `pwd` -type f -name \*.d)
+-cd ../../../dastworx
+-
  #dast sources
  cd src/
  dast=$(find `pwd` -type f -name \*.d)
-@@ -16,12 +6,12 @@ cd ../
+@@ -21,9 +6,9 @@
  echo building...
  
  #build
--dmd ${dast[@]} ${dparse[@]} ${iz[@]} \
-+%%LDMD2_CMD%% ${dast} \
+-dmd ${dast[@]} ${dparse[@]} ${iz[@]} ${stdxalloc[@]} \
++%%LDMD2_CMD%% ${dast}  \
  -O -release -inline -boundscheck=off \
---Isrc -I../etc/iz/import -I../etc/libdparse/src \
+--Isrc -I../etc/iz/import -I../etc/libdparse/src -I../etc/stdx-allocator/source \
 +-Isrc -I%%D_INCLUDE_DIR%% -L%%D_LIB_DIR%%/libiz.a -L%%D_LIB_DIR%%/libdparse.a \
  -of../bin/dastworx
  
  #cleanup
- rm ../bin/dastworx.o
- 
--echo ...done
-\ No newline at end of file
-+echo ...done
Index: editors/lazarus-lcl-gtk2/Makefile
===================================================================
--- editors/lazarus-lcl-gtk2/Makefile
+++ editors/lazarus-lcl-gtk2/Makefile
@@ -1,18 +0,0 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
-# $FreeBSD$
-
-PKGNAMESUFFIX=	-lcl-gtk2
-
-COMMENT=	Lazarus components library - GTK2 backend
-
-BUILD_DEPENDS=	${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units
-
-USE_FPC=	cairo chm fcl-base fcl-db fcl-image fcl-json fcl-res \
-		fcl-registry fcl-xml gtk2 pasjpeg regexpr x11
-
-LCL_INTERFACE=	gtk2
-
-MASTERDIR=	${.CURDIR}/../../editors/lazarus
-
-OPT=		#
-.include "${MASTERDIR}/Makefile"
Index: editors/lazarus-lcl-nogui/Makefile
===================================================================
--- editors/lazarus-lcl-nogui/Makefile
+++ editors/lazarus-lcl-nogui/Makefile
@@ -1,18 +0,0 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
-# $FreeBSD$
-
-PKGNAMESUFFIX=	-lcl-nogui
-
-COMMENT=	Lazarus components library - No gui backend
-
-BUILD_DEPENDS=	${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units
-
-USE_FPC=	chm fcl-base fcl-db fcl-image fcl-json fcl-registry fcl-xml \
-		pasjpeg regexpr rtl-objpas
-
-LCL_INTERFACE=	nogui
-
-MASTERDIR=	${.CURDIR}/../../editors/lazarus
-
-OPT=		#
-.include "${MASTERDIR}/Makefile"
Index: editors/lazarus-lcl-qt/Makefile
===================================================================
--- editors/lazarus-lcl-qt/Makefile
+++ editors/lazarus-lcl-qt/Makefile
@@ -1,17 +0,0 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
-# $FreeBSD$
-
-PKGNAMESUFFIX=	-lcl-qt
-
-COMMENT=	Lazarus components library - QT backend
-
-BUILD_DEPENDS=	${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units
-
-USE_FPC=	chm fcl-base fcl-db fcl-image fcl-json fcl-registry fcl-res \
-		fcl-xml pasjpeg regexpr x11
-
-LCL_INTERFACE=	qt
-
-MASTERDIR=	${.CURDIR}/../../editors/lazarus
-
-.include "${MASTERDIR}/Makefile"
Index: editors/lazarus-lcl-qt/files/patch-interfaces_qt_qt45.pas
===================================================================
--- editors/lazarus-lcl-qt/files/patch-interfaces_qt_qt45.pas
+++ editors/lazarus-lcl-qt/files/patch-interfaces_qt_qt45.pas
@@ -1,11 +0,0 @@
---- interfaces/qt/qt45.pas.orig	2014-02-05 12:08:29 UTC
-+++ interfaces/qt/qt45.pas
-@@ -45,7 +45,7 @@ const
- {$ENDIF}
- 
- {$IFNDEF QTOPIA}
--  {$IF DEFINED(LINUX) or DEFINED(FREEBSD) or DEFINED(NETBSD)}
-+  {$IF DEFINED(LINUX) or DEFINED(FREEBSD) or DEFINED(NETBSD) or DEFINED(DRAGONFLY)}
-     {$DEFINE BINUX}
-     Qt4PasLib = 'libQt4Pas.so.5';
-   {$ENDIF}
Index: editors/lazarus-lcl-qt5/Makefile
===================================================================
--- editors/lazarus-lcl-qt5/Makefile
+++ editors/lazarus-lcl-qt5/Makefile
@@ -1,17 +0,0 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
-# $FreeBSD$
-
-PKGNAMESUFFIX=	-lcl-qt5
-
-COMMENT=	Lazarus components library - QT5 backend
-
-BUILD_DEPENDS=	${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units
-
-USE_FPC=	chm fcl-base fcl-db fcl-image fcl-json fcl-registry fcl-res \
-		fcl-xml pasjpeg regexpr x11
-
-LCL_INTERFACE=	qt5
-
-MASTERDIR=	${.CURDIR}/../../editors/lazarus
-
-.include "${MASTERDIR}/Makefile"
Index: editors/lazarus-lcl-qt5/files/patch-interfaces_qt_qt45.pas
===================================================================
--- editors/lazarus-lcl-qt5/files/patch-interfaces_qt_qt45.pas
+++ editors/lazarus-lcl-qt5/files/patch-interfaces_qt_qt45.pas
@@ -1,11 +0,0 @@
---- interfaces/qt/qt45.pas.orig	2014-02-05 12:08:29 UTC
-+++ interfaces/qt/qt45.pas
-@@ -45,7 +45,7 @@ const
- {$ENDIF}
- 
- {$IFNDEF QTOPIA}
--  {$IF DEFINED(LINUX) or DEFINED(FREEBSD) or DEFINED(NETBSD)}
-+  {$IF DEFINED(LINUX) or DEFINED(FREEBSD) or DEFINED(NETBSD) or DEFINED(DRAGONFLY)}
-     {$DEFINE BINUX}
-     Qt4PasLib = 'libQt4Pas.so.5';
-   {$ENDIF}
Index: editors/lazarus-lcl-units/Makefile
===================================================================
--- editors/lazarus-lcl-units/Makefile
+++ editors/lazarus-lcl-units/Makefile
@@ -1,17 +0,0 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
-# $FreeBSD$
-
-PKGNAMESUFFIX=	-lcl-units
-
-COMMENT=	Lazarus components library units
-
-USE_FPC=	chm fcl-base fcl-db fcl-image fcl-json fcl-registry \
-		fcl-res fcl-xml iconvenc pasjpeg regexpr
-
-LCL_INTERFACE=	#
-
-MASTERDIR=	${.CURDIR}/../../editors/lazarus
-
-OPT=		"-Fu../../lcl/ -Fu../lcl -Fu../../lcl/forms -Fu../../lcl/nonwin32 -Fu../../lcl/widgetset -Fi../../lcl/include"
-
-.include "${MASTERDIR}/Makefile"
Index: editors/lazarus-qt4/Makefile
===================================================================
--- editors/lazarus-qt4/Makefile
+++ editors/lazarus-qt4/Makefile
@@ -1,193 +1,15 @@
-# Created by: Shaun Amott <shaun@inerd.com>
 # $FreeBSD$
 
-PORTNAME=	lazarus
-PORTVERSION=	1.8.0
-PORTREVISION?=	0
-CATEGORIES=	editors devel
-MASTER_SITES=	SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
-		LOCAL/acm/freepascal
-DIST_SUBDIR=	freepascal
+PKGNAMESUFFIX?=  -qt4
 
-MAINTAINER?=	acm@FreeBSD.org
-COMMENT?=	Portable Delphi-like IDE for the FreePascal compiler
+COMMENT=	Portable Delphi-like IDE for the FreePascal compiler (QT4)
 
-BUILD_DEPENDS?=	#
-RUN_DEPENDS?=	#
+CONFLICTS=	${PORTNAME}-gtk2-* ${PORTNAME}-qt5-*
 
-ONLY_FOR_ARCHS=	i386 amd64
+LIB_DEPENDS=	libQt4Pas.so:x11-toolkits/qt4pas
 
-USES=		gmake
-USE_GNOME=	#
-USE_FPC?=	cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \
-		fcl-registry fcl-res fcl-web fcl-xml gtk2 ibase iconvenc mysql \
-		numlib odbc openssl oracle pasjpeg postgres regexpr rtl-extra \
-		sqlite x11
-OPT?=		"-Sgic "
-
-MAKE_ENV=	OPT=${OPT}
-PLIST=		${WRKDIR}/pkg-plist
-WRKSRC?=	${WRKDIR}/${PORTNAME}
-DATADIR?=	${PREFIX}/share/${PORTNAME}-${PORTVERSION}
-
-.if !defined(PKGNAMESUFFIX)
-OPTIONS_DEFINE=		GDB
-OPTIONS_SINGLE=		LCL
-OPTIONS_SINGLE_LCL=	GTK2 QT4 QT5
-
-GDB_DESC=		Install a newest version  of gdb
-GTK2_DESC=		Use gtk20 interface
-QT4_DESC=		Use qt4 interface
-QT5_DESC=		Use qt5 interface
-
-OPTIONS_DEFAULT=	GTK2 GDB
-.endif
-
-.include <bsd.port.options.mk>
-
-LAZARUS_ARCH=	${ARCH:S,amd64,x86_64,}
-
-BUILDNAME=	${LAZARUS_ARCH}-${OPSYS:tl}
-LCL_UNITS_DIR=	${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}
-
-.if !defined(PKGNAMESUFFIX)
-BUILD_DEPENDS+=	fpcres:lang/fpc-utils \
-		${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \
-		${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui
-RUN_DEPENDS+=	fpcres:lang/fpc-utils \
-		${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \
-		${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui
-
-USES+=		gettext iconv
-USE_FPC+=	chm
-
-MAN1S=		lazarus-ide.1 lazbuild.1 startlazarus.1
-SUB_FILES=	pkg-message
-SUB_LIST+=	PORTSDIR="${PORTSDIR}"
-
-.if ${PORT_OPTIONS:MGDB}
-RUN_DEPENDS+=	${LOCALBASE}/bin/gdb:devel/gdb
-.endif
-
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME=	gtk20 gdkpixbuf
-LCL_PLATFORM=	gtk2
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
-RUN_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
-RUN_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
-.endif
 
-.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
-RUN_DEPENDS+=   ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5
-.endif
+MASTERDIR=	${.CURDIR}/../../editors/lazarus
 
-post-extract:
-	@${MKDIR} ${WRKDIR}/man1
-	@${MV} ${WRKSRC}/install/man/man1/lazarus-ide.1 ${WRKDIR}/man1/
-	@${MV} ${WRKSRC}/install/man/man1/lazbuild.1 ${WRKDIR}/man1/
-	@${MV} ${WRKSRC}/install/man/man1/startlazarus.1 ${WRKDIR}/man1/
-	@${MV} ${WRKSRC}/examples ${WRKDIR}/examples
-	@${MV} ${WRKSRC}/docs ${WRKDIR}/docs
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \
-			-e 's|tools: lcl|tools:|g' -e '3267d' -e '3269d' -e '3270d' -e '3271d' -e '3272d' -e '3273d' ${WRKSRC}/${MAKEFILE}
-
-pre-build:
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units ${WRKSRC}/lcl/units
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/debuggerintf/lib ${WRKSRC}/components/debuggerintf/lib
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/ideintf/units ${WRKSRC}/components/ideintf/units
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/synedit/units ${WRKSRC}/components/synedit/units
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazcontrols/lib ${WRKSRC}/components/lazcontrols/lib
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazdebuggergdbmi/lib ${WRKSRC}/components/lazdebuggergdbmi/lib
-
-do-build:
-	@cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} registration lazutils codetools bigide starter lazbuild LCL_PLATFORM=${LCL_PLATFORM}
-	@cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} tools LCL_PLATFORM=${LCL_PLATFORM}
-
-post-build:
-	@cd ${WRKSRC} && \
-		${RM} -R COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \
-			ide/Makefile*.orig ide/Makefile*.bak lcl/units components/ideintf/units \
-				components/synedit/units components/lazcontrols/lib
-
-pre-install:
-	@${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper
-	@${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/lazarus-wrapper
-	@${ECHO} "exec ./startlazarus" >> ${WRKDIR}/lazarus-wrapper
-
-	@${RM} ${PLIST}
-	@${RM} ${WRKSRC}/lcl/units
-	@${RM} -r ${WRKSRC}/components/chmhelp/lhelp/lhelp.app/Contents/MacOS \
-		${WRKSRC}/lazarus.app/Contents/MacOS \
-		${WRKSRC}/lazarus.app/Contents/Resources/startlazarus.app/Contents/MacOS
-
-.	for FILE in bin/lazarus bin/lazbuild
-		@${ECHO_CMD} ${FILE} >> ${PLIST}
-.	endfor
-.	for m in ${MAN1S}
-		@${ECHO_CMD} man/man1/${m}.gz >> ${PLIST}
-.	endfor
-
-	@${ECHO_CMD} "%%DATADIR%%/docs" >> ${PLIST}
-	@cd ${WRKDIR}/docs && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DOCSDIR%%/|' >> ${PLIST}
-
-	@${ECHO_CMD} "%%DATADIR%%/examples" >> ${PLIST}
-	@cd ${WRKDIR}/examples && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%EXAMPLESDIR%%/|' >> ${PLIST} && \
-		${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%EXAMPLESDIR%%/|' >> ${PLIST}
-
-	@cd ${WRKSRC} && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
-		${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%DATADIR%%/|' >> ${PLIST}
-
-do-install:
-.for DIRE in components converter debugger designer doceditor ide images install languages lazarus.app lcl \
-	packager tools units
-		@${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
-	@${CHMOD} +x ${STAGEDIR}${DATADIR}/tools/svn2revisioninc ${STAGEDIR}${DATADIR}/tools/lazres ${STAGEDIR}${DATADIR}/tools/lrstolfm \
-		${STAGEDIR}${DATADIR}/tools/updatepofiles
-
-.for FILE in lazarus startlazarus lazbuild
-	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${DATADIR}
-.endfor
-
-	@cd ${WRKDIR}/docs && \
-		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DOCSDIR}/{}" \;
-	@${LN} -s ${DOCSDIR} ${STAGEDIR}${DATADIR}/docs
-
-	@cd ${WRKDIR}/examples && \
-		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${EXAMPLESDIR}/{}" \;
-	@${LN} -s ${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples
-
-	${INSTALL_SCRIPT} ${WRKSRC}/localize.sh ${STAGEDIR}${DATADIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/lazarus-wrapper ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_DATA}	${WRKSRC}/Makefile* ${WRKSRC}/fpmake*  ${STAGEDIR}${DATADIR}
-.for FILE in ${MAN1S}
-	${INSTALL_MAN} ${WRKDIR}/man1/${FILE} ${STAGEDIR}${MAN1PREFIX}/man/man1
-.endfor
-	${LN} -s ${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild
-
-.else
-.include "${MASTERDIR}/Makefile.common"
-.endif
-
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
Index: editors/lazarus-qt5/Makefile
===================================================================
--- editors/lazarus-qt5/Makefile
+++ editors/lazarus-qt5/Makefile
@@ -1,193 +1,16 @@
-# Created by: Shaun Amott <shaun@inerd.com>
 # $FreeBSD$
 
-PORTNAME=	lazarus
-PORTVERSION=	1.8.0
-PORTREVISION?=	0
-CATEGORIES=	editors devel
-MASTER_SITES=	SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
-		LOCAL/acm/freepascal
-DIST_SUBDIR=	freepascal
+PKGNAMESUFFIX?=  -qt5
 
-MAINTAINER?=	acm@FreeBSD.org
-COMMENT?=	Portable Delphi-like IDE for the FreePascal compiler
+COMMENT=	Portable Delphi-like IDE for the FreePascal compiler (QT5)
 
-BUILD_DEPENDS?=	#
-RUN_DEPENDS?=	#
+CONFLICTS=	${PORTNAME}-gtk2-* ${PORTNAME}-qt4-*
 
-ONLY_FOR_ARCHS=	i386 amd64
+LIB_DEPENDS=	libQt5Pas.so:x11-toolkits/qt5pas
 
-USES=		gmake
-USE_GNOME=	#
-USE_FPC?=	cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \
-		fcl-registry fcl-res fcl-web fcl-xml gtk2 ibase iconvenc mysql \
-		numlib odbc openssl oracle pasjpeg postgres regexpr rtl-extra \
-		sqlite x11
-OPT?=		"-Sgic "
+LCL_PLATFORM=	qt5
 
-MAKE_ENV=	OPT=${OPT}
-PLIST=		${WRKDIR}/pkg-plist
-WRKSRC?=	${WRKDIR}/${PORTNAME}
-DATADIR?=	${PREFIX}/share/${PORTNAME}-${PORTVERSION}
+MASTERDIR=	${.CURDIR}/../../editors/lazarus
 
-.if !defined(PKGNAMESUFFIX)
-OPTIONS_DEFINE=		GDB
-OPTIONS_SINGLE=		LCL
-OPTIONS_SINGLE_LCL=	GTK2 QT4 QT5
+.include "${MASTERDIR}/Makefile"
 
-GDB_DESC=		Install a newest version  of gdb
-GTK2_DESC=		Use gtk20 interface
-QT4_DESC=		Use qt4 interface
-QT5_DESC=		Use qt5 interface
-
-OPTIONS_DEFAULT=	GTK2 GDB
-.endif
-
-.include <bsd.port.options.mk>
-
-LAZARUS_ARCH=	${ARCH:S,amd64,x86_64,}
-
-BUILDNAME=	${LAZARUS_ARCH}-${OPSYS:tl}
-LCL_UNITS_DIR=	${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}
-
-.if !defined(PKGNAMESUFFIX)
-BUILD_DEPENDS+=	fpcres:lang/fpc-utils \
-		${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \
-		${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui
-RUN_DEPENDS+=	fpcres:lang/fpc-utils \
-		${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \
-		${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui
-
-USES+=		gettext iconv
-USE_FPC+=	chm
-
-MAN1S=		lazarus-ide.1 lazbuild.1 startlazarus.1
-SUB_FILES=	pkg-message
-SUB_LIST+=	PORTSDIR="${PORTSDIR}"
-
-.if ${PORT_OPTIONS:MGDB}
-RUN_DEPENDS+=	${LOCALBASE}/bin/gdb:devel/gdb
-.endif
-
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME=	gtk20 gdkpixbuf
-LCL_PLATFORM=	gtk2
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
-RUN_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
-RUN_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
-.endif
-
-.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
-RUN_DEPENDS+=   ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5
-.endif
-
-post-extract:
-	@${MKDIR} ${WRKDIR}/man1
-	@${MV} ${WRKSRC}/install/man/man1/lazarus-ide.1 ${WRKDIR}/man1/
-	@${MV} ${WRKSRC}/install/man/man1/lazbuild.1 ${WRKDIR}/man1/
-	@${MV} ${WRKSRC}/install/man/man1/startlazarus.1 ${WRKDIR}/man1/
-	@${MV} ${WRKSRC}/examples ${WRKDIR}/examples
-	@${MV} ${WRKSRC}/docs ${WRKDIR}/docs
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \
-			-e 's|tools: lcl|tools:|g' -e '3267d' -e '3269d' -e '3270d' -e '3271d' -e '3272d' -e '3273d' ${WRKSRC}/${MAKEFILE}
-
-pre-build:
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units ${WRKSRC}/lcl/units
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/debuggerintf/lib ${WRKSRC}/components/debuggerintf/lib
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/ideintf/units ${WRKSRC}/components/ideintf/units
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/synedit/units ${WRKSRC}/components/synedit/units
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazcontrols/lib ${WRKSRC}/components/lazcontrols/lib
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazdebuggergdbmi/lib ${WRKSRC}/components/lazdebuggergdbmi/lib
-
-do-build:
-	@cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} registration lazutils codetools bigide starter lazbuild LCL_PLATFORM=${LCL_PLATFORM}
-	@cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} tools LCL_PLATFORM=${LCL_PLATFORM}
-
-post-build:
-	@cd ${WRKSRC} && \
-		${RM} -R COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \
-			ide/Makefile*.orig ide/Makefile*.bak lcl/units components/ideintf/units \
-				components/synedit/units components/lazcontrols/lib
-
-pre-install:
-	@${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper
-	@${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/lazarus-wrapper
-	@${ECHO} "exec ./startlazarus" >> ${WRKDIR}/lazarus-wrapper
-
-	@${RM} ${PLIST}
-	@${RM} ${WRKSRC}/lcl/units
-	@${RM} -r ${WRKSRC}/components/chmhelp/lhelp/lhelp.app/Contents/MacOS \
-		${WRKSRC}/lazarus.app/Contents/MacOS \
-		${WRKSRC}/lazarus.app/Contents/Resources/startlazarus.app/Contents/MacOS
-
-.	for FILE in bin/lazarus bin/lazbuild
-		@${ECHO_CMD} ${FILE} >> ${PLIST}
-.	endfor
-.	for m in ${MAN1S}
-		@${ECHO_CMD} man/man1/${m}.gz >> ${PLIST}
-.	endfor
-
-	@${ECHO_CMD} "%%DATADIR%%/docs" >> ${PLIST}
-	@cd ${WRKDIR}/docs && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DOCSDIR%%/|' >> ${PLIST}
-
-	@${ECHO_CMD} "%%DATADIR%%/examples" >> ${PLIST}
-	@cd ${WRKDIR}/examples && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%EXAMPLESDIR%%/|' >> ${PLIST} && \
-		${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%EXAMPLESDIR%%/|' >> ${PLIST}
-
-	@cd ${WRKSRC} && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
-		${FIND} * -type d -empty | ${SORT} | ${SED} -e 's|^|@dir %%DATADIR%%/|' >> ${PLIST}
-
-do-install:
-.for DIRE in components converter debugger designer doceditor ide images install languages lazarus.app lcl \
-	packager tools units
-		@${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
-	@${CHMOD} +x ${STAGEDIR}${DATADIR}/tools/svn2revisioninc ${STAGEDIR}${DATADIR}/tools/lazres ${STAGEDIR}${DATADIR}/tools/lrstolfm \
-		${STAGEDIR}${DATADIR}/tools/updatepofiles
-
-.for FILE in lazarus startlazarus lazbuild
-	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${STAGEDIR}${DATADIR}
-.endfor
-
-	@cd ${WRKDIR}/docs && \
-		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DOCSDIR}/{}" \;
-	@${LN} -s ${DOCSDIR} ${STAGEDIR}${DATADIR}/docs
-
-	@cd ${WRKDIR}/examples && \
-		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${EXAMPLESDIR}/{}" \; && \
-			${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${EXAMPLESDIR}/{}" \;
-	@${LN} -s ${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples
-
-	${INSTALL_SCRIPT} ${WRKSRC}/localize.sh ${STAGEDIR}${DATADIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/lazarus-wrapper ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_DATA}	${WRKSRC}/Makefile* ${WRKSRC}/fpmake*  ${STAGEDIR}${DATADIR}
-.for FILE in ${MAN1S}
-	${INSTALL_MAN} ${WRKDIR}/man1/${FILE} ${STAGEDIR}${MAN1PREFIX}/man/man1
-.endfor
-	${LN} -s ${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild
-
-.else
-.include "${MASTERDIR}/Makefile.common"
-.endif
-
-.include <bsd.port.mk>
Index: editors/lazarus/Makefile
===================================================================
--- editors/lazarus/Makefile
+++ editors/lazarus/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	lazarus
-PORTVERSION=	1.8.0
+PORTVERSION=	1.8.2
+PKGNAMESUFFIX?=  -gtk2
 PORTREVISION?=	0
 CATEGORIES=	editors devel
 MASTER_SITES=	SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
@@ -10,19 +11,21 @@
 DIST_SUBDIR=	freepascal
 
 MAINTAINER?=	acm@FreeBSD.org
-COMMENT?=	Portable Delphi-like IDE for the FreePascal compiler
+COMMENT?=	Portable Delphi-like IDE for the FreePascal compiler (GTK2)
 
-BUILD_DEPENDS?=	#
-RUN_DEPENDS?=	#
+CONFLICTS?=	${PORTNAME}-qt4-* ${PORTNAME}-qt5-*
 
+BUILD_DEPENDS?=	fpcres:lang/fpc-utils
+RUN_DEPENDS?=	fpcres:lang/fpc-utils
+
 ONLY_FOR_ARCHS=	i386 amd64
 
-USES=		gmake
-USE_GNOME=	#
-USE_FPC?=	cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \
+USES=		fpc gettext gmake iconv
+USE_FPC?=	chm cairo dblib fcl-base fcl-db fcl-fpcunit fcl-image fcl-json fcl-net \
 		fcl-registry fcl-res fcl-web fcl-xml gtk2 ibase iconvenc mysql \
 		numlib odbc openssl oracle pasjpeg postgres regexpr rtl-extra \
 		sqlite x11
+USE_XORG=	x11
 OPT?=		"-Sgic "
 
 MAKE_ENV=	OPT=${OPT}
@@ -30,37 +33,17 @@
 WRKSRC?=	${WRKDIR}/${PORTNAME}
 DATADIR?=	${PREFIX}/share/${PORTNAME}-${PORTVERSION}
 
-.if !defined(PKGNAMESUFFIX)
 OPTIONS_DEFINE=		GDB
-OPTIONS_SINGLE=		LCL
-OPTIONS_SINGLE_LCL=	GTK2 QT4 QT5
-
 GDB_DESC=		Install a newest version  of gdb
-GTK2_DESC=		Use gtk20 interface
-QT4_DESC=		Use qt4 interface
-QT5_DESC=		Use qt5 interface
-
 OPTIONS_DEFAULT=	GTK2 GDB
-.endif
 
 .include <bsd.port.options.mk>
 
 LAZARUS_ARCH=	${ARCH:S,amd64,x86_64,}
 
 BUILDNAME=	${LAZARUS_ARCH}-${OPSYS:tl}
-LCL_UNITS_DIR=	${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}
+LCL_PLATFORM?=	gtk2
 
-.if !defined(PKGNAMESUFFIX)
-BUILD_DEPENDS+=	fpcres:lang/fpc-utils \
-		${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \
-		${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui
-RUN_DEPENDS+=	fpcres:lang/fpc-utils \
-		${LCL_UNITS_DIR}/alllclunits.ppu:editors/lazarus-lcl-units \
-		${LCL_UNITS_DIR}/nogui/interfaces.ppu:editors/lazarus-lcl-nogui
-
-USES+=		gettext iconv
-USE_FPC+=	chm
-
 MAN1S=		lazarus-ide.1 lazbuild.1 startlazarus.1
 SUB_FILES=	pkg-message
 SUB_LIST+=	PORTSDIR="${PORTSDIR}"
@@ -69,27 +52,11 @@
 RUN_DEPENDS+=	${LOCALBASE}/bin/gdb:devel/gdb
 .endif
 
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME=	gtk20 gdkpixbuf
-LCL_PLATFORM=	gtk2
-BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
-RUN_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-gtk2
+.if ${PKGNAMESUFFIX} == "-gtk2"
+USES+=		gnome
+USE_GNOME=	cairo gtk20 gdkpixbuf2
 .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
-RUN_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt
-.endif
-
-.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
-RUN_DEPENDS+=   ${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-lcl-qt5
-.endif
-
 post-extract:
 	@${MKDIR} ${WRKDIR}/man1
 	@${MV} ${WRKSRC}/install/man/man1/lazarus-ide.1 ${WRKDIR}/man1/
@@ -99,28 +66,18 @@
 	@${MV} ${WRKSRC}/docs ${WRKDIR}/docs
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' \
-			-e 's|tools: lcl|tools:|g' -e '3267d' -e '3269d' -e '3270d' -e '3271d' -e '3272d' -e '3273d' ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/${MAKEFILE}
 
-pre-build:
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units ${WRKSRC}/lcl/units
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/debuggerintf/lib ${WRKSRC}/components/debuggerintf/lib
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/ideintf/units ${WRKSRC}/components/ideintf/units
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/synedit/units ${WRKSRC}/components/synedit/units
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazcontrols/lib ${WRKSRC}/components/lazcontrols/lib
-	@${LN} -sf ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazdebuggergdbmi/lib ${WRKSRC}/components/lazdebuggergdbmi/lib
-
 do-build:
 	@cd ${WRKSRC} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} registration lazutils codetools bigide starter lazbuild LCL_PLATFORM=${LCL_PLATFORM}
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} bigide LCL_PLATFORM=${LCL_PLATFORM}
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} tools LCL_PLATFORM=${LCL_PLATFORM}
 
 post-build:
 	@cd ${WRKSRC} && \
 		${RM} -R COPYING* README* debian localize.bat test *.orig *.bak startlazarus.app \
-			ide/Makefile*.orig ide/Makefile*.bak lcl/units components/ideintf/units \
-				components/synedit/units components/lazcontrols/lib
+			ide/Makefile*.orig ide/Makefile*.bak
 
 pre-install:
 	@${ECHO} "#!/bin/sh" > ${WRKDIR}/lazarus-wrapper
@@ -128,7 +85,6 @@
 	@${ECHO} "exec ./startlazarus" >> ${WRKDIR}/lazarus-wrapper
 
 	@${RM} ${PLIST}
-	@${RM} ${WRKSRC}/lcl/units
 	@${RM} -r ${WRKSRC}/components/chmhelp/lhelp/lhelp.app/Contents/MacOS \
 		${WRKSRC}/lazarus.app/Contents/MacOS \
 		${WRKSRC}/lazarus.app/Contents/Resources/startlazarus.app/Contents/MacOS
@@ -186,8 +142,4 @@
 .endfor
 	${LN} -s ${DATADIR}/lazbuild ${STAGEDIR}${PREFIX}/bin/lazbuild
 
-.else
-.include "${MASTERDIR}/Makefile.common"
-.endif
-
 .include <bsd.port.mk>
Index: editors/lazarus/Makefile.common
===================================================================
--- editors/lazarus/Makefile.common
+++ editors/lazarus/Makefile.common
@@ -1,104 +0,0 @@
-# $FreeBSD: ports/editors/lazarus/Makefile.common,v 1.3 2012/12/12 21:08:13 svnexp Exp $
-
-EXTRACT_AFTER_ARGS=	${LCLDIR} ${PORTNAME}/packager/registration \
-				${PORTNAME}/components/lazutils ${PORTNAME}/components/ideintf \
-				${PORTNAME}/images ${PORTNAME}/components/synedit \
-				${PORTNAME}/components/lazcontrols 
-
-.if ${PKGNAMESUFFIX} == "-lcl-nogui"
-EXTRACT_AFTER_ARGS+=		${PORTNAME}/components/debuggerintf \
-				${PORTNAME}/components/lazdebuggergdbmi
-.endif
-
-PATCHDIR=	${.CURDIR}/files
-FILESDIR=	${.CURDIR}/files
-PLIST_SUB+=	BUILDNAME=${BUILDNAME}
-
-LCLDIR=		${PORTNAME}/lcl
-
-WRKSRC=		${WRKDIR}/${LCLDIR}
-
-.if ${PKGNAMESUFFIX} != "-lcl-units"
-BUILDSRC=	${WRKSRC}/interfaces
-.else
-BUILDSRC=	${WRKSRC}
-.endif
-
-.if ${PKGNAMESUFFIX} != "-lcl-units"
-pre-build:
-	@${MKDIR} ${WRKSRC}/units/${BUILDNAME}
-	@${MKDIR} ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME}
-	@${MKDIR} ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}
-	@${MKDIR} ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}
-	@${MKDIR} ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}
-	@${MKDIR} ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME}
-	@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/lcl/units/${BUILDNAME}/* ${WRKDIR}/${LCLDIR}/units/${BUILDNAME}/
-	@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/debuggerintf/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME}/
-	@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazcontrols/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/
-	@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/ideintf/units/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/
-	@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/synedit/units/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/
-	@${LN} -s ${LOCALBASE}/share/${PORTNAME}-${PORTVERSION}/components/lazdebuggergdbmi/lib/${BUILDNAME}/* ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME}/
-.endif
-
-do-build:
-	@cd ${WRKDIR}/${PORTNAME}/packager/registration && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
-	@cd ${WRKDIR}/${PORTNAME}/components/lazutils && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
-	@cd ${WRKDIR}/${PORTNAME}/components/lazcontrols && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
-	@cd ${WRKDIR}/${PORTNAME}/components/ideintf && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
-	@cd ${WRKDIR}/${PORTNAME}/components/synedit && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
-.if ${PKGNAMESUFFIX} == "-lcl-nogui"
-	@cd ${WRKDIR}/${PORTNAME}/components/debuggerintf && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
-	@cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
-.endif
-	@cd ${BUILDSRC} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} LCL_PLATFORM=${LCL_INTERFACE}
-
-pre-install:
-	@${RM} ${PLIST}
-
-	@cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/lcl/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST}
-.if ${PKGNAMESUFFIX} == "-lcl-nogui"
-	@cd ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME}/ && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/debuggerintf/lib/%%BUILDNAME%%/|' -e 's|//|/|' >> ${PLIST}
-	@cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME}/ && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/lazdebuggergdbmi/lib/%%BUILDNAME%%/|' -e 's|//|/|' >> ${PLIST}
-.endif
-	@cd ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/ideintf/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST}
-	@cd ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/synedit/units/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST}
-	@cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \
-		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/components/lazcontrols/lib/%%BUILDNAME%%/${LCL_INTERFACE}/|' -e 's|//|/|' >> ${PLIST}
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE}
-.if ${PKGNAMESUFFIX} == "-lcl-nogui"
-	@${MKDIR} ${STAGEDIR}${DATADIR}/components/debuggerintf/lib/${BUILDNAME}
-	@${MKDIR} ${STAGEDIR}${DATADIR}/components/lazdebuggergdbmi/lib/${BUILDNAME}
-.endif
-	@${MKDIR} ${STAGEDIR}${DATADIR}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE}
-	@${MKDIR} ${STAGEDIR}${DATADIR}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE}
-	@${MKDIR} ${STAGEDIR}${DATADIR}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE}
-
-	@cd ${WRKSRC}/units/${BUILDNAME}/${LCL_INTERFACE} && \
-		${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/lcl/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
-.if ${PKGNAMESUFFIX} == "-lcl-nogui"
-	@cd ${WRKDIR}/${PORTNAME}/components/debuggerintf/lib/${BUILDNAME} && \
-		${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/debuggerintf/lib/${BUILDNAME}/{}" \;
-	@cd ${WRKDIR}/${PORTNAME}/components/lazdebuggergdbmi/lib/${BUILDNAME} && \
-		${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/lazdebuggergdbmi/lib/${BUILDNAME}/{}" \;
-.endif
-	@cd ${WRKDIR}/${PORTNAME}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE} && \
-		${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/ideintf/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
-	@cd ${WRKDIR}/${PORTNAME}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE} && \
-		${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/synedit/units/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
-	@cd ${WRKDIR}/${PORTNAME}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE} && \
-		${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DATADIR}/components/lazcontrols/lib/${BUILDNAME}/${LCL_INTERFACE}/{}" \;
Index: editors/lazarus/distinfo
===================================================================
--- editors/lazarus/distinfo
+++ editors/lazarus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513100874
-SHA256 (freepascal/lazarus-1.8.0.tar.gz) = 320888ba1af17295b8d3993d50c31780d137e363e05797e3575eee90f3b3a844
-SIZE (freepascal/lazarus-1.8.0.tar.gz) = 62114372
+TIMESTAMP = 1520354258
+SHA256 (freepascal/lazarus-1.8.2.tar.gz) = 252861f86b7e49487fa925195b78e8ab6a68528d3e6059cf68630fb5bc6d5219
+SIZE (freepascal/lazarus-1.8.2.tar.gz) = 62935678
Index: editors/lazarus/files/patch-Makefile
===================================================================
--- editors/lazarus/files/patch-Makefile
+++ editors/lazarus/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile	2014-03-23 19:30:47.000000000 -0500
-+++ Makefile	2014-03-25 19:19:37.000000000 -0500
-@@ -294,7 +294,7 @@
+--- Makefile.orig	2018-02-25 03:49:41.000000000 -0500
++++ Makefile	2018-03-06 15:24:00.905598000 -0500
+@@ -339,7 +339,7 @@
  LAZARUS_INSTALL_DIR=C:\lazarus
  endif
  ifneq ($(findstring $(OS_TARGET),freebsd),)
@@ -9,12 +9,3 @@
  endif
  ifneq ($(findstring $(OS_TARGET),win32 win64),)
  IDEVERSION=$(shell .\tools\install\get_lazarus_version.bat)
-@@ -2848,7 +2848,7 @@
- examples:
- 	$(MAKE) -C examples
- all: lazbuild lcl basecomponents ide starter
--bigide: lazbuild lcl basecomponents bigidecomponents idebig starter lhelp
-+bigide: lazbuild bigidecomponents idebig starter lhelp
- cleanide:
- 	$(MAKE) -C ide cleanide
- cleanlaz: cleanide
Index: editors/lazarus/files/patch-components-synedit_synedit.pp
===================================================================
--- editors/lazarus/files/patch-components-synedit_synedit.pp
+++ editors/lazarus/files/patch-components-synedit_synedit.pp
@@ -1,20 +0,0 @@
---- components/synedit/synedit.pp	2018-01-30 13:41:54.904942000 -0500
-+++ components/synedit/synedit.pp	2018-01-30 13:40:23.811860000 -0500
-@@ -8945,7 +8945,7 @@
-       while not Highlighter.GetEol do begin
-         Start := Highlighter.GetTokenPos + 1;
-         Token := Highlighter.GetToken;
--        if (PosX >= Start) and (PosX <= Start + Length(Token)) then begin
-+        if (PosX >= Start) and (PosX < Start + Length(Token)) then begin
-           Attri := Highlighter.GetTokenAttribute;
-           TokenType := Highlighter.GetTokenKind;
-           exit(True);
-@@ -8990,7 +8990,7 @@
-         //TokenType := Highlighter.GetTokenKind;
-         Attri := Highlighter.GetTokenAttribute;
-         //DebugLn(['  TCustomSynEdit.CaretAtIdentOrString: Start=', Start, ', Token=', Token]);
--        if (PosX >= Start) and (PosX <= Start + Length(Token)) then
-+        if (PosX >= Start) and (PosX < Start + Length(Token)) then
-         begin
-           AtIdent := Attri = Highlighter.IdentifierAttribute;
-           NearString := (Attri = Highlighter.StringAttribute)
Index: editors/lazarus/files/pkg-message.in
===================================================================
--- editors/lazarus/files/pkg-message.in
+++ editors/lazarus/files/pkg-message.in
@@ -24,12 +24,11 @@
    and these can be built with an interface different than lazarus has compiled
    by default:
 
-   editors/lazarus-lcl-nogui
-   editors/lazarus-lcl-gtk2
-   editors/lazarus-lcl-qt
-   editors/lazarus-lcl-qt5
+   editors/lazarus
+   editors/lazarus-qt4
+   editors/lazarus-qt5
 
-   You can added those ports if you want support for nogui, gtk2, qt or qt5
+   You can added those ports if you want support for gtk2, qt4 or qt5
    interfaces. Please look at net-p2p/transmission-remote-gui like a example of
    how use it
 
Index: multimedia/winff/Makefile
===================================================================
--- multimedia/winff/Makefile
+++ multimedia/winff/Makefile
@@ -3,8 +3,9 @@
 
 PORTNAME=	WinFF
 PORTVERSION=	1.5.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia
+PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 MASTER_SITES=	http://winff.org/docs/source/
 DISTNAME=	${_PORTNAME}-${PORTVERSION}-source
 
@@ -13,19 +14,15 @@
 
 LICENSE=	GPLv3
 
-BROKEN=		fails to build
-
-BUILD_DEPENDS=	lazbuild:editors/lazarus
 LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
 
 NO_WRKSUBDIR=	yes
 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}"	\
@@ -34,46 +31,27 @@
 			"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}
+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
Index: multimedia/winff/files/patch-winff_unit1.pas
===================================================================
--- multimedia/winff/files/patch-winff_unit1.pas
+++ multimedia/winff/files/patch-winff_unit1.pas
@@ -1,7 +1,16 @@
---- 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}
@@ -16,7 +25,7 @@
    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);
@@ -32,7 +41,7 @@
    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);
Index: net-p2p/transmission-remote-gui/Makefile
===================================================================
--- net-p2p/transmission-remote-gui/Makefile
+++ net-p2p/transmission-remote-gui/Makefile
@@ -2,64 +2,37 @@
 # $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
 
-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_CONFLICTS_INSTALL=	${PORTNAME}-qt*
+qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2-* ${PORTNAME}-qt5-*
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2-* ${PORTNAME}-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}
-
 do-install:
 	@cd ${WRKSRC}/units && \
 		${INSTALL_PROGRAM} transgui ${STAGEDIR}${PREFIX}/bin
Index: net-p2p/transmission-remote-gui/distinfo
===================================================================
--- net-p2p/transmission-remote-gui/distinfo
+++ net-p2p/transmission-remote-gui/distinfo
@@ -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: net-p2p/transmission-remote-gui/pkg-descr
===================================================================
--- net-p2p/transmission-remote-gui/pkg-descr
+++ net-p2p/transmission-remote-gui/pkg-descr
@@ -2,4 +2,4 @@
 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: russian/emkatic/Makefile
===================================================================
--- russian/emkatic/Makefile
+++ russian/emkatic/Makefile
@@ -2,9 +2,9 @@
 # $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
 
@@ -14,43 +14,30 @@
 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
 
-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}-qt*
+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}
+USE_GNOME+=	cairo
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
Index: russian/emkatic/distinfo
===================================================================
--- russian/emkatic/distinfo
+++ russian/emkatic/distinfo
@@ -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: x11-fm/doublecmd/Makefile
===================================================================
--- x11-fm/doublecmd/Makefile
+++ x11-fm/doublecmd/Makefile
@@ -2,9 +2,9 @@
 # $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
@@ -16,12 +16,9 @@
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-BUILD_DEPENDS=	lazbuild:editors/lazarus \
-		fpcres:lang/fpc-utils
-
 PORTDOCS=	*
 
-USES=		dos2unix desktop-file-utils
+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
@@ -29,19 +26,28 @@
 
 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 \
@@ -88,8 +94,7 @@
 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 \
@@ -105,126 +110,96 @@
 			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
 
@@ -375,7 +350,7 @@
 
 .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/
Index: x11-fm/doublecmd/distinfo
===================================================================
--- x11-fm/doublecmd/distinfo
+++ x11-fm/doublecmd/distinfo
@@ -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