diff --git a/archivers/peazip/Makefile b/archivers/peazip/Makefile
index 35aca8573624..18d1eaab6b00 100644
--- a/archivers/peazip/Makefile
+++ b/archivers/peazip/Makefile
@@ -1,109 +1,110 @@
 PORTNAME=	peazip
 PORTVERSION=	8.6.0
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://github.com/giorgiotani/PeaZip/releases/download/${PORTVERSION}/
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free archiver and file compressor
 
 LICENSE=	LGPL3
 
 USES=		cpe desktop-file-utils dos2unix fpc lazarus:flavors zip xorg
 USE_FPC=	cairo chm fcl-base fcl-image fcl-xml pasjpeg rtl-objpas x11
 USE_XORG=	x11
 
 CPE_VENDOR=	giorgio_tani
 
 SUB_FILES=	pea peazip
 
 DOS2UNIX_REGEX=		.*\.([txt]|pas|lpi|txt)
 
 LAZARUS_PROJECT_FILES=	project_pea.lpi project_peach.lpi
 LAZBUILD_ARGS=		-d
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 ARCHIVER_FILES=		#
 
 OPTIONS_DEFINE=		7Z ARC ZPAQ UNACE
 
 7Z_DESC=		7z file archiver support
 ARC_DESC=		Arc file archiver support
 ZPAQ_DESC=		Zpaq file archiver support
 UNACE_DESC=		Unace file archiver support
 
 OPTIONS_DEFAULT=	7Z
 
 .if ${FLAVOR:Ugtk2:Mgtk2}
 USES+=		gnome
 USE_GNOME+=	cairo
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:M7Z}
 RUN_DEPENDS+=	7zz:archivers/7-zip
 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
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} 's|GetSelectedNodePath|Path|g' ${WRKSRC}/peach.pas
 
 pre-install:
 	@${ECHO_CMD} "#" > ${WRKSRC}/altconf.txt
 	@${ECHO_CMD} "appdata" >> ${WRKSRC}/altconf.txt
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/res/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}/res/share
 .for ARCHIVER in ${ARCHIVER_FILES}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/res/bin/${ARCHIVER}
 .if ${ARCHIVER} == "7z"
 	@${LN} -sf ${LOCALBASE}/bin/7zz ${STAGEDIR}${DATADIR}/res/bin/${ARCHIVER}/${ARCHIVER}
 .else
 	@${LN} -sf ${LOCALBASE}/bin/${ARCHIVER} ${STAGEDIR}${DATADIR}/res/bin/${ARCHIVER}/${ARCHIVER}
 .endif
 .endfor
 	@cd ${WRKSRC}/res/share && ${COPYTREE_SHARE} "icons lang themes" ${STAGEDIR}${DATADIR}/res/share
 	@cd ${WRKSRC} && ${INSTALL_DATA} altconf.txt ${STAGEDIR}${DATADIR}/res && \
 			${INSTALL_PROGRAM} pea ${STAGEDIR}${DATADIR}/res && \
 			${INSTALL_PROGRAM} peazip ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps
 	@cd ${WRKSRC}/res/share/batch/freedesktop_integration && \
 		${INSTALL_DATA} peazip.desktop ${STAGEDIR}${DESKTOPDIR} && \
 		${INSTALL_DATA} peazip.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/${PORTNAME}.png
 	${INSTALL_SCRIPT} ${WRKDIR}/pea ${WRKDIR}/peazip ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.post.mk>
diff --git a/cad/zcad/Makefile b/cad/zcad/Makefile
index 7e920cabbe0b..ab52c506c789 100644
--- a/cad/zcad/Makefile
+++ b/cad/zcad/Makefile
@@ -1,117 +1,117 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	zcad
 PORTVERSION=	0.9.8.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Simple CAD program
 
 USES=		dos2unix fpc lazarus:flavors tar:xz
 USE_GITHUB=	yes
 GH_ACCOUNT=	zamtmn
 GH_TAGNAME=	8b8a693
 USE_FPC=	cairo chm fcl-base fcl-image fcl-json fcl-stl fcl-xml opengl \
 		pasjpeg rtl-extra rtl-generics rtl-objpas x11
 
 MAKE_ENV=	LAZBUILD_CMD="${LAZBUILD_CMD}" \
 		LAZBUILD_ARGS="${LAZBUILD_ARGS}" \
 		LCL_PLATFORM="${LCL_PLATFORM}" \
 		LAZARUS_DIR="${LAZARUS_DIR}" \
 		INSTANTFPCCACHE="${WRKSRC}/.cache"
 
 DOS2UNIX_GLOB=	*.pas *.lpi
 BUILD_WRKSRC=	${WRKSRC}/cad_source
 INSTALL_WRKSRC=	${WRKSRC}/cad
 
 LAZARUS_PROJECT_FILES=	anchordocking/anchordocking.lpk \
 			fpvectorial/fpvectorialpkg.lpk \
 			lclextensions/lclextensions_package.lpk \
 			other/laz.virtualtreeview_package/laz.virtualtreeview_package.lpk \
 			components/zmacros/zmacros.lpk \
 			components/zebase/zebase.lpk \
 			components/zcontainers/zcontainers.lpk \
 			components/zcontrols/zcontrols.lpk \
 			components/zmath/zmath.lpk \
 			components/zscriptbase/zscriptbase.lpk \
 			components/zscript/zscript.lpk \
 			components/zundostack/zundostack.lpk \
 			components/zobjectinspector/zobjectinspector.lpk \
 			components/ztoolbars/ztoolbars.lpk \
 			other/AGraphLaz/lazarus/ag_vectors.lpk \
 			other/AGraphLaz/lazarus/ag_attr.lpk \
 			other/AGraphLaz/lazarus/ag_math.lpk \
 			other/AGraphLaz/lazarus/ag_graph.lpk \
 			other/uniqueinstance/uniqueinstance_package.lpk \
 			utils/typeexporter.lpi
 
 LAZBUILD_ARGS=	-d --pcp=${WRKSRC}/tmppcp
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 PORTDOCS=	UserGuide.odt UserGuide.pdf
 
 OPTIONS_DEFINE=		DOCS
 
 .if ${FLAVOR:Ugtk2:Mgtk2}
 MAKE_ENV+=	GUI=gtk2
 .endif
 
 post-patch:
 	@${EGREP} -lR 'IFN?DEF LINUX' ${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
 	@${REINPLACE_CMD} -e 's|LazOpenGLContext|openglcontext.pas|g' \
 		${BUILD_WRKSRC}/zcad.lpi
 	@${REINPLACE_CMD} -e "s|&apos;|'|g" \
 		${BUILD_WRKSRC}/other/laz.virtualtreeview_package/laz.virtualtreeview_package.lpk
 	@${REINPLACE_CMD} '1,6d' ${WRKSRC}/environment/makeenv_zcad.sh
 
 post-configure:
 # 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}
 	${CP} -a ${LAZARUS_DIR}/components/fpvectorial \
 		${LAZARUS_DIR}/components/anchordocking \
 		${LAZARUS_DIR}/components/lclextensions ${BUILD_WRKSRC}
 
 post-build:
 	@${MKDIR} ${WRKSRC}/cad
 	@${MKDIR} ${WRKSRC}/cad_source/autogenerated
 	@${CP} -a ${WRKSRC}/environment/runtimefiles/common/* ${WRKSRC}/cad
 	@${CP} -a ${WRKSRC}/environment/runtimefiles/zcad/* ${WRKSRC}/cad
 	@cd ${WRKSRC}/environment && ${SH} makeenv_zcad.sh
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${LAZBUILD_CMD} \
 		${LAZBUILD_ARGS} --ws=${LCL_PLATFORM} \
 		--lazarusdir=${LAZARUS_DIR} zcad.lpi
 
 do-install:
 # Not ready for hier(7)-conforming installation yet
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/${BUILDNAME}/${PORTNAME} \
 		${STAGEDIR}${PREFIX}/${PORTNAME}
 	cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} "autosave components \
 		fonts images languages log menu plugins 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>
 
 PATCH_ARGS+=	-l
diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
index 581ce9882bfb..4548d86756be 100644
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -1,64 +1,64 @@
 # Created by: Stephen Hurd <shurd@FreeBSD.org>
 
 PORTNAME=	cqrlog
 PORTVERSION=	2.5.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio logging application
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libhamlib.so:comms/hamlib
 
 USES=		fpc gnome lazarus:flavors shebangfix ssl:run dos2unix \
 		mysql:server xorg
 
 USE_GNOME+=	cairo
 USE_XORG=	x11
 USE_GITHUB=	yes
 GH_ACCOUNT=	ok2cqr
 
 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 opengl openssl \
 		pasjpeg regexpr x11
 
 ALL_TARGET=	${PORTNAME}
 
 MAKE_ENV+=	LAZBUILD_CMD="${LAZBUILD_CMD}" \
 		LAZBUILD_ARGS="${LAZBUILD_ARGS}" \
 		LCL_PLATFORM="${LCL_PLATFORM}" \
 		LAZARUS_DIR="${LAZARUS_DIR}"
 
 NO_LAZBUILD=	yes
 LAZBUILD_ARGS=	-d --pcp=.
 DOS2UNIX_WRKSRC=${WRKSRC}/src/synapse/
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 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/fPreferences.lfm
 	${REINPLACE_CMD} -e s!%%DATADIR%%!${DATADIR}!g \
 		${WRKSRC}/src/dData.pas ${WRKSRC}/src/fGrayline.pas
 
 .include <bsd.port.mk>
diff --git a/editors/cudatext/Makefile b/editors/cudatext/Makefile
index 20e1e4cb74ea..b21ca4a51bc6 100644
--- a/editors/cudatext/Makefile
+++ b/editors/cudatext/Makefile
@@ -1,70 +1,70 @@
 PORTNAME=	cudatext
-PORTVERSION=	1.166.0
+PORTVERSION=	1.166.2
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Cross-platform text editor, written in Lazarus
 
 LICENSE=	MPL20
 
 USES=		desktop-file-utils dos2unix fpc gnome lazarus:flavors python xorg
 USE_FPC=	chm fcl-base fcl-image fcl-json fcl-stl fcl-xml pasjpeg rtl-objpas x11
 USE_XORG=	x11
 USE_GITHUB=	yes
 GH_ACCOUNT=	Alexey-T
 GH_PROJECT=	CudaText
 GH_TUPLE=	bgrabitmap:bgrabitmap:ace7e0e:bgrabitmap/bgrabitmap \
 		Alexey-T:Python-for-Lazarus:24d15bb:python4lazarus/python4lazarus \
 		Alexey-T:ATFlatControls:9538ba1:atflatcontrols/atflatcontrols  \
 		Alexey-T:ATSynEdit:1b44e6d:atsynedit/atsynedit \
 		Alexey-T:Emmet-Pascal:fb5b116:emmet/emmet \
 		Alexey-T:EControl:72dccb1:econtrol/econtrol \
 		Alexey-T:ATSynEdit_Ex:cde4e8b:atsyneditex/atsyneditex \
 		Alexey-T:ATSynEdit_Cmp:aa58946:atsyneditcmp/atsyneditcmp \
 		Alexey-T:ATBinHex-Lazarus:c63346b:atbinhex/atbinhex \
 		Alexey-T:UniqueInstance:753f823:uniqueinstance/uniqueinstance \
 		Alexey-T:EncConv:7197f21:encconv/encconv
 
 DOS2UNIX_FILES=	app/settings_default/default.json setup/debfiles/cudatext.desktop
 
 LAZARUS_PROJECT_FILES=	bgrabitmap/bgrabitmap/bgrabitmappack.lpk
 LAZARUS_PROJECT_FILES+=	atflatcontrols/atflatcontrols/atflatcontrols_package.lpk
 LAZARUS_PROJECT_FILES+=	python4lazarus/python4lazarus/python4lazarus_package.lpk
 LAZARUS_PROJECT_FILES+= encconv/encconv/encconv_package.lpk
 LAZARUS_PROJECT_FILES+=	atsynedit/atsynedit/atsynedit_package.lpk
 LAZARUS_PROJECT_FILES+=	emmet/emmet/emmet_package.lpk
 LAZARUS_PROJECT_FILES+=	econtrol/econtrol/econtrol_package.lpk
 LAZARUS_PROJECT_FILES+=	atsyneditex/atsynedit_ex/atsynedit_ex_package.lpk
 LAZARUS_PROJECT_FILES+=	atsyneditcmp/atsynedit_cmp/atsynedit_cmp_package.lpk
 LAZARUS_PROJECT_FILES+=	atbinhex/atbinhex/atbinhex_package.lpk
 LAZARUS_PROJECT_FILES+= uniqueinstance/uniqueinstance/uniqueinstance_package.lpk
 LAZARUS_PROJECT_FILES+=	app/cudatext.lpi
 
 LAZBUILD_ARGS=		-d
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 USE_FPC_gtk2=	cairo
 USE_GNOME_gtk2=	cairo
 USE_FPC+=	${USE_FPC_${FLAVOR}}
 USE_GNOME+=	${USE_GNOME_${FLAVOR}}
 
 #WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 post-patch:
 	${REINPLACE_CMD} 's|-512||g' ${WRKSRC}/setup/debfiles/${PORTNAME}.desktop
 	${REINPLACE_CMD} 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/app/proc_globdata.pas
 	${REINPLACE_CMD} 's|TEncoding.UTF8|True|g' ${WRKSRC}/app/formmain_py_pluginwork.inc
 	${REINPLACE_CMD} '636d' ${WRKSRC}/app/proc_miscutils.pas
 
 do-install:	
 	${INSTALL_PROGRAM} ${WRKSRC}/app/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/setup/debfiles/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps
 	${INSTALL_DATA} ${WRKSRC}/setup/debfiles/${PORTNAME}-512.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/${PORTNAME}.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/app && ${COPYTREE_SHARE} "data py readme settings_default" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index c9445b20daa5..56f19844a9fa 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -1,182 +1,182 @@
 PORTNAME=	lazarus
 PORTVERSION=	2.2.2
 DISTVERSIONSUFFIX=	-0
 PKGNAMESUFFIX?=  -gtk2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	editors devel
 MASTER_SITES=	SF/${PORTNAME}/Lazarus%20Zip%20_%20GZip/Lazarus%20${PORTVERSION} \
 		LOCAL/acm/freepascal
 DIST_SUBDIR=	freepascal
 
 MAINTAINER?=	acm@FreeBSD.org
 COMMENT?=	Portable Delphi-like IDE for the FreePascal compiler (GTK2)
 
 CONFLICTS?=	${PORTNAME}-qt5
 
 BUILD_DEPENDS?=	${LOCALBASE}/bin/as:devel/binutils \
 		fpcres:lang/fpc-utils
 RUN_DEPENDS?=	${LOCALBASE}/bin/as:devel/binutils \
 		gmake:devel/gmake \
 		${PPNAME}:lang/fpc \
 		fpcres:lang/fpc-utils \
 		${LOCALBASE}/share/fpc-source-${FPC_DEFAULT}/Makefile.fpc:lang/fpc-source
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 USES=		cpe desktop-file-utils fpc:run gettext gmake iconv shared-mime-info xorg
 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 fppkg gtk2 ibase iconvenc mysql \
 		numlib odbc opengl openssl oracle pasjpeg postgres regexpr rtl-extra \
 		rtl-generics sqlite x11
 USE_XORG=	x11
 OPT?=		"-Sgic "
 
 MAKE_ENV=	OPT=${OPT}
 PLIST=		${WRKDIR}/pkg-plist
 WRKSRC?=	${WRKDIR}/${PORTNAME}
 DATADIR?=	${PREFIX}/share/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=		GDB
 GDB_DESC=		Install a newest version  of gdb
 OPTIONS_DEFAULT=	GDB
 
 .include <bsd.port.options.mk>
 
 LAZARUS_ARCH=	${ARCH:S,amd64,x86_64,}
 
 BUILDNAME=	${LAZARUS_ARCH}-${OPSYS:tl}
 LCL_PLATFORM?=	gtk2
 
 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 ${PKGNAMESUFFIX} == "-gtk2"
 USES+=		gnome
 USE_GNOME=	cairo gtk20 gdkpixbuf2
 .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' ${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -e 's|startlazarus|${PORTNAME}|g' ${WRKSRC}/install/${PORTNAME}.desktop
 
 do-build:
 	@cd ${WRKSRC} && \
 		${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/interfaces/qt5/qtobjects.pas.orig
 	@cd ${WRKDIR} && \
 		${RM} -R docs/chm/.gitignore docs/html/.gitignore lazarus/tools/install/rpm/.gitignore \
 			lazarus/tools/.gitignore lazarus/components/chmhelp/lhelp/.gitignore \
 			lazarus/.git*
 
 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} -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}
 
 	@${ECHO_CMD} "share/applications/lazarus.desktop" >> ${PLIST}
 
 .	for RESO in 128 16 256 32 48 64
 		@${ECHO_CMD} share/icons/hicolor/${RESO}x${RESO}/apps/lazarus.png >> ${PLIST}
 .	endfor
 
 	@cd ${WRKSRC}/images/mimetypes && \
 		${FIND} * -type f -name "*.png" | ${SORT} | ${SED} -e 's|^|share/icons/hicolor/48x48/mimetypes/|' >> ${PLIST}
 
 	@${ECHO_CMD} "share/icons/hicolor/scalable/apps/lazarus.svg" >> ${PLIST}
 	@${ECHO_CMD} "share/mime/packages/lazarus.xml" >> ${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
 
 .for RESO in 128 16 256 32 48 64
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${RESO}x${RESO}/apps
 	${INSTALL_DATA} ${WRKSRC}/images/icons/${PORTNAME}${RESO}x${RESO}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${RESO}x${RESO}/apps/${PORTNAME}.png
 .endfor
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/mimetypes
 	@cd ${WRKSRC}/images/mimetypes && \
 		${FIND} * -type f -name "*.png" -exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/mimetypes/{} \;
 
 	@${INSTALL_DATA} ${WRKSRC}/install/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	@${INSTALL_DATA} ${WRKSRC}/images/icons/${PORTNAME}.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${PORTNAME}.svg
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/mime/packages
 	@${INSTALL_DATA} ${WRKSRC}/install/${PORTNAME}-mime.xml ${STAGEDIR}${PREFIX}/share/mime/packages/${PORTNAME}.xml
 
 	${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
 
 .include <bsd.port.mk>
diff --git a/editors/picpas/Makefile b/editors/picpas/Makefile
index 937b9e2ab8df..db89ac291e29 100644
--- a/editors/picpas/Makefile
+++ b/editors/picpas/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	picpas
 PORTVERSION=	0.9.0
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSIONPREFIX=	v
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Multi-platform Pascal for Microchip PIC16F microcontrollers
 
 LICENSE=	GPLv2
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 USES=		dos2unix fpc gnome lazarus:flavors xorg
 USE_FPC=	chm fcl-base fcl-image fcl-json fcl-registry fcl-xml pasjpeg regexpr \
 		rtl-objpas x11
 USE_XORG=	x11
 DOS2UNIX_REGEX=	.*\.([txt]|pas|lpi|txt|lfm)
 USE_GITHUB=	yes
 GH_ACCOUNT=	t-edson
 GH_PROJECT=	PicPas
 GH_TAGNAME=	7940bc3
 GH_TUPLE=	t-edson:MiConfig:a4a988a:miconfig/miconfig \
 		t-edson:MisUtils:742eff3:misutils/misutils  \
 		t-edson:PicUtils:5f89bdf:picutils/picutils \
 		t-edson:SynFacilUtils:8725237:syncfacilutils/syncfacilutils \
 		t-edson:UtilsGrilla:07744b9:utilsgrilla/utilsgrilla \
 		t-edson:ogEditGraf:a19b68a:ogeditgraf/ogeeditgraf \
 		t-edson:t-Xpres:6665922:txpres/txpres
 
 USE_FPC_gtk2=	cairo
 USE_GNOME_gtk2=	cairo
 USE_FPC+=	${USE_FPC_${FLAVOR}}
 USE_GNOME+=	${USE_GNOME_${FLAVOR}}
 
 LAZARUS_PROJECT_FILES=	Source/PicPas.lpi
 LAZBUILD_ARGS=		-d
 
 post-patch:
 	${REINPLACE_CMD} 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/Source/Globales.pas
 	${REINPLACE_CMD} 's|0.8.7|${PORTVERSION}|g' ${WRKSRC}/version.txt
 	${REINPLACE_CMD} '81d' ${WRKSRC}/Source/FrameSyntaxTree.lfm
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/PicPas-freebsd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "devices10 devices16 devices17 syntax samples temp themes units" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile
index 7006b2475147..ff4945ea03c4 100644
--- a/games/hedgewars/Makefile
+++ b/games/hedgewars/Makefile
@@ -1,73 +1,73 @@
 PORTNAME=	hedgewars
 PORTVERSION=	1.0.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	http://www.hedgewars.org/download/releases/ \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	${PORTNAME}-src-${DISTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Free Worms-like turn based strategy game
 
 LICENSE=	GPLv2 GFDL
 LICENSE_COMB=	multi
 
 BROKEN_i386=	ld: error: duplicate symbol: LandDirty_dimension_info
 
 LIB_DEPENDS=	libphysfs.so:devel/physfs \
 		libpng.so:graphics/png
 
 USES=		cmake:noninja desktop-file-utils fpc gl lua:51 pkgconfig qt:5 \
 		sdl tar:bzip2
 USE_SDL=	sdl2 mixer2 image2 ttf2 net2
 USE_FPC=	opengl libpng rtl-objpas rtl-extra
 USE_QT=		core gui widgets network \
 		qmake_build buildtools_build \
 		linguisttools_build
 USE_GL=		gl glu
 USE_LDCONFIG=	yes
 CMAKE_ON=	NOSERVER
 
 PLIST_FILES=	bin/${PORTNAME} bin/hwengine \
 		share/appdata/hedgewars.appdata.xml \
 		share/applications/${PORTNAME}.desktop \
 		share/pixmaps/${PORTNAME}.png \
 		share/pixmaps/${PORTNAME}.xpm \
 		lib/libphyslayer.so \
 		lib/libphyslayer.so.1.0
 PORTDATA=	*
 
 USE_LOCALE=	en_US.UTF-8
 MAKE_ENV=	LOCALBASE="${LOCALBASE}"  # fpc issue https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=251712
 CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"  # fpc issue https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=251712
 
 OPTIONS_DEFINE=	VIDEOREC
 OPTIONS_DEFAULT=VIDEOREC
 OPTIONS_EXCLUDE_i386=	VIDEOREC  # some pascal issues preventing to use it
 
 VIDEOREC_DESC=	Enable video recording (requires ffmpeg)
 
 VIDEOREC_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 VIDEOREC_PLIST_FILES=	lib/libavwrapper.so \
 			lib/libavwrapper.so.1.0
 VIDEOREC_CMAKE_OFF=	-DNOVIDEOREC=1
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
 BUILD_DEPENDS+=	ghc:lang/ghc
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/cmake_modules/*.cmake
 	@${REINPLACE_CMD} -e "s|'liblua'|'liblua-${LUA_VER}'|" ${WRKSRC}/hedgewars/LuaPas.pas
 	@${REINPLACE_CMD} -e "/linklib/ s|lua|&-${LUA_VER}|" ${WRKSRC}/hedgewars/LuaPas.pas
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	${INSTALL_DATA} ${WRKSRC}/share/hedgewars/Data/misc/hedgewars.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/misc/hedgewars.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .include <bsd.port.post.mk>
diff --git a/graphics/fpc-rsvg/Makefile b/graphics/fpc-rsvg/Makefile
index 4a06d935a981..c2debddef3f0 100644
--- a/graphics/fpc-rsvg/Makefile
+++ b/graphics/fpc-rsvg/Makefile
@@ -1,23 +1,23 @@
 # Created by: Christopher Key <cjk32@cam.ac.uk>
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-rsvg
 
 COMMENT=	Free Pascal interface to librsvg2 library
 
 USES=		fpc
 USE_FPC=	cairo fcl-base fcl-image fcl-res gtk2 pasjpeg rtl-objpas x11
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//:S/^/lib/}
 EXTRACTUNITDIR=	${WRKUNITDIR}
 
 OPTIONS_DEFINE=	LIBRSVG2
 LIBRSVG2_DESC=	Install librsvg2 library
 OPTIONS_DEFAULT=	LIBRSVG2
 
 LIBRSVG2_USES=	gnome
 LIBRSVG2_USE=	GNOME=librsvg2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/lazpaint/Makefile b/graphics/lazpaint/Makefile
index 0e90e7b502ca..2e14a2f6097c 100644
--- a/graphics/lazpaint/Makefile
+++ b/graphics/lazpaint/Makefile
@@ -1,56 +1,56 @@
 PORTNAME=	lazpaint
 PORTVERSION=	7.1.6
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Image editor written in Lazarus
 
 LICENSE=	GPLv3
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 USES=		desktop-file-utils dos2unix fpc gnome lazarus:flavors xorg
 USE_FPC=	chm fcl-base fcl-image fcl-json fcl-net fcl-web fcl-xml \
 		opengl openssl pasjpeg rtl-extra rtl-objpas x11
 USE_XORG=	x11
 DOS2UNIX_REGEX=	.*\.([txt]|pas|lpi|txt)
 USE_GITHUB=	yes
 GH_TAGNAME=	426f74adc0fc5bca31213c2e7c3ae772ba49769a
 GH_ACCOUNT=	bgrabitmap
 GH_TUPLE=	bgrabitmap:bgracontrols:2797120:bgracontrols/bgracontrols \
 		bgrabitmap:bgrabitmap:d52b5b7:bgrabitmap/bgrabitmapnew
 
 USE_FPC_gtk2=	cairo
 USE_GNOME_gtk2=	cairo
 USE_FPC+=	${USE_FPC_${FLAVOR}}
 USE_GNOME+=	${USE_GNOME_${FLAVOR}}
 
 DESKTOP_ENTRIES="LazPaint" \
 		"Image editor written in Lazarus" \
 		"lazpaint" \
 		"${PREFIX}/bin/lazpaint" \
 		"Graphics;" \
 		${TRUE}
 
 LAZARUS_PROJECT_FILES=	bgrabitmapnew/bgrabitmap/bgrabitmappack.lpk
 LAZARUS_PROJECT_FILES+=	bgracontrols/bgracontrols.lpk
 LAZARUS_PROJECT_FILES+=	lazpaintcontrols/lazpaintcontrols.lpk
 LAZARUS_PROJECT_FILES+=	lazpaint/lazpaint.lpi
 
 LAZBUILD_ARGS=	-d --bm=Release
 
 post-patch:
 	${REINPLACE_CMD} 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/lazpaint/utranslation.pas
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lazpaint/release/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps
 	${INSTALL_DATA} ${WRKSRC}/resources/icon/48x48.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/lazpaint/release/bin && ${COPYTREE_SHARE} "i18n models" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/lang/fpc-source/Makefile b/lang/fpc-source/Makefile
index 3eab6d0a4af1..4c88d5fc3ea5 100644
--- a/lang/fpc-source/Makefile
+++ b/lang/fpc-source/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	fpc
 PORTVERSION=	3.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONSUFFIX=.source
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/ \
 		ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/ \
 		ftp://ftp.jp.freepascal.org/mirror/fpc/dist/${PORTVERSION}/source/ \
 		ftp://freepascal.stack.nl/pub/fpc/dist/${PORTVERSION}/source/ \
 		ftp://ftp.no.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/ \
 		ftp://ftp.us.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/ \
 		SF/freepascal/Source/${PORTVERSION}
 PKGNAMESUFFIX=	-source
 DIST_SUBDIR=	freepascal
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal compiler with Turbo and Delphi compatibility (source)
 
 ONLY_FOR_ARCHS=	amd64 i386
 NO_BUILD=	yes
 
 PORTDATA=	*
 
 PATCHDIR=	${PORTSDIR}/lang/fpc/files
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 2e89ee58da7a..10c27dd83437 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -1,193 +1,194 @@
 # Created by: John Merryweather Cooper et al
 
 PORTNAME=	fpc
 PORTVERSION=	3.2.2
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES?=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
 		ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/:source \
 		ftp://ftp.jp.freepascal.org/mirror/fpc/dist/${PORTVERSION}/source/:source \
 		ftp://freepascal.stack.nl/pub/fpc/dist/${PORTVERSION}/source/:source \
 		ftp://ftp.no.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
 		ftp://ftp.us.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
 		SF/freepascal/Source/${PORTVERSION}:source \
 		http://leaf.dragonflybsd.org/~marino/dports-src/:DragonFlybootstrap \
 		LOCAL/acm/freepascal/:bootstrap \
 		LOCAL/acm/freepascal/:man
 DISTFILES=	${DISTNAME:S/$/.source/}${EXTRACT_SUFX}:source
 DIST_SUBDIR=	freepascal
 
 MAINTAINER?=	acm@FreeBSD.org
 COMMENT?=	Free Pascal compiler with Turbo and Delphi compatibility
 
 RUN_DEPENDS?=	${LOCALBASE}/bin/as:devel/binutils
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 USES+=		gmake iconv
 USE_BINUTILS=	yes
 BOOTVER=	${PORTVERSION}
 MANVER=		${PORTVERSION}
 
 FPC_LDPATH?=	"${LOCALBASE}/bin/ld.bfd"
 
 FPCSRCDIR=	${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 PPNAME=		ppc386
 FPC_ARCH=	i386
-OPT=		"-dFPC_USE_LIBC"
+#OPT=		"-dFPC_USE_LIBC"
 PLIST_SUB+=	FPC_I386="" \
 		FPC_AMD64="@comment "
 .elif ${ARCH} == "amd64"
 PPNAME=		ppcx64
 FPC_ARCH=	x86_64
+#OPT=		"-dFPC_USE_LIBC"
 PLIST_SUB+=	FPC_I386="@comment " \
 		FPC_AMD64=""
 .endif
 
 .if ${OPSYS} == FreeBSD
 PLIST_SUB+=	FREEBSD=""
 .else
 PLIST_SUB+=	FREEBSD="@comment "
 .endif
 
 .if !defined(PKGNAMESUFFIX)
 SUB_FILES=	pkg-message
 
 BUILDNAME=	${FPC_ARCH}-${OPSYS:tl}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		BUILDNAME=${BUILDNAME}
 DISTFILES+=	${BOOTDIR}.tar.gz:${OPSYS:MDragonFly}bootstrap \
 		fpc-${MANVER}.man.tar.gz:man
 NEWFPCMAKE=	${WRKDIR}/${FPCSRCDIR}/utils/fpcm/bin/${BUILDNAME}/fpcmake
 MAKE_ARGS+=	FPCMAKE=${NEWFPCMAKE} \
 		FPCTARGET=${BUILDNAME} \
 		ARCH=${FPC_ARCH} \
 		OPT="${OPT}" \
 		BSDHIER=1 \
 		INSTALL="${INSTALL_DATA}" \
 		INSTALLEXE="${INSTALL_PROGRAM}" \
 		INSTALLSCR="${INSTALL_SCRIPT}" \
 		INSTALL_PREFIX=${STAGEDIR}${PREFIX} \
 		FPC_LDPATH=${FPC_LDPATH}
 NEWPPC=		PP=${WRKSRC}/compiler/${PPNAME}
 NEWFPC=		FPC=${WRKSRC}/compiler/${PPNAME}
 BOOTDIR=	${PPNAME}-${BOOTVER}-${OPSYS:tl}
 BOOTPPC=	PP=${WRKDIR}/${BOOTDIR}
 
 do-extract:
 # unpack binary distribution
 	@${MKDIR} ${WRKDIR}
 	@${TAR} -xzf ${_DISTDIR}/${BOOTDIR}.tar.gz \
 		--directory ${WRKDIR} && ${CHMOD} +x ${WRKDIR}/${BOOTDIR}
 # unpack man files
 	@${TAR} -xzf ${_DISTDIR}/fpc-${MANVER}.man.tar.gz --directory ${WRKDIR}
 # unpack source distribution
 	@(cd ${WRKDIR} && ${GZIP_CMD} -dc \
 		${_DISTDIR}/${DISTNAME:S/$/.source/}${EXTRACT_SUFX} | \
 		${TAR} -xf - \
 		${FPCSRCDIR}/compiler \
 		${FPCSRCDIR}/rtl \
 		${FPCSRCDIR}/utils/fpcmkcfg \
 		${FPCSRCDIR}/packages/fcl-base \
 		${FPCSRCDIR}/packages/fcl-process \
 		${FPCSRCDIR}/packages/fcl-res \
 		${FPCSRCDIR}/packages/fpmkunit \
 		${FPCSRCDIR}/packages/hash \
 		${FPCSRCDIR}/packages/libtar \
 		${FPCSRCDIR}/packages/paszlib \
 		${FPCSRCDIR}/packages/rtl-objpas \
 		${FPCSRCDIR}/packages/tplylib \
 		${FPCSRCDIR}/utils/fpcm)
 
 post-patch:
 .if ${OPSYS} == FreeBSD
 	@${REINPLACE_CMD} -i "" -e 's|900044|${OSVERSION}|g' \
 		${WRKSRC}/rtl/freebsd/${FPC_ARCH}/*.as \
 		${WRKSRC}/rtl/freebsd/${FPC_ARCH}/*.inc
 .else
 	@${REINPLACE_CMD} -i "" -e 's|400000|${DFLYVERSION}|g' \
 		${WRKSRC}/rtl/dragonfly/${FPC_ARCH}/*.as
 .endif
 .if empty(ICONV_LIB)
 	@${REINPLACE_CMD} -e "s|s<>'c'|(s<>'c') and (s<>'iconv')|" \
 			-e "s|%%FPC_LDPATH%%|${FPC_LDPATH}|g" \
 				${WRKDIR}/${FPCSRCDIR}/compiler/systems/t_bsd.pas
 	@${REINPLACE_CMD} -e 's|defined(bsd) and not ||' \
 		${WRKDIR}/${FPCSRCDIR}/rtl/unix/cwstring.pp
 .endif
 	@${REINPLACE_CMD} -e '/samplecfg/ {s/INSTALLEXE/INSTALLSCR/;}' \
 		${WRKDIR}/${FPCSRCDIR}/compiler/Makefile
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
 		${WRKDIR}/${FPCSRCDIR}/packages/fpmkunit/src/fpmkunit.pp
 
 do-build:
 # build fpc compiler
 	@${ECHO_MSG} "##### STARTING COMPILER #####"
 	(cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} cycle ${MAKE_ARGS} ${BOOTPPC})
 	@${ECHO_MSG} "##### COMPLETE COMPILER #####"
 
 # build fpcmkcfg
 	@${ECHO_MSG} "##### STARTING BOOTSTRAP FPMKUNIT #####"
 	(cd ${WRKDIR}/${FPCSRCDIR}/packages/fpmkunit && ${SETENV} \
 		${MAKE_ENV} ${MAKE_CMD} bootstrap ${MAKE_ARGS} ${NEWPPC})
 	@${ECHO_MSG} "##### COMPLETE BOOTSTRAP FPMKUNIT #####"
 .for component in rtl-objpas fcl-base tplylib fcl-res
 	@${ECHO_MSG} "##### STARTING ${component:tu} #####"
 	(cd ${WRKDIR}/${FPCSRCDIR}/packages/${component} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${NEWPPC})
 	@${ECHO_MSG} "##### COMPLETE ${component:tu} #####"
 .endfor
 	@${ECHO_MSG} "##### STARTING FPMAKE #####"
 	(cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcm && ${SETENV} \
 		${MAKE_ENV} ${MAKE_CMD} release ${MAKE_ARGS} ${NEWPPC})
 	@${ECHO_MSG} "##### COMPLETE FPMAKE #####"
 .for component in hash paszlib libtar fcl-process fpmkunit
 	@${ECHO_MSG} "##### STARTING ${component:tu} #####"
 	(cd ${WRKDIR}/${FPCSRCDIR}/packages/${component} && ${SETENV} \
 		${MAKE_ENV} ${MAKE_CMD} release ${MAKE_ARGS} ${NEWPPC})
 	@${ECHO_MSG} "##### COMPLETE ${component:tu} #####"
 .endfor
 	@${ECHO_MSG} "##### STARTING FPCMKCFG #####"
 	(cd ${WRKDIR}/${FPCSRCDIR}/utils/fpcmkcfg && ${SETENV} \
 		${MAKE_ENV} ${MAKE_CMD} release ${MAKE_ARGS} ${NEWPPC})
 	@${ECHO_MSG} "##### COMPLETE FPCMKCFG #####"
 
 do-install:
 	# Installing fpc compiler
 	(cd ${WRKDIR}/${FPCSRCDIR}/rtl && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} install ${MAKE_ARGS} ${NEWFPC})
 	# Installing fpc runtime
 	(cd ${WRKDIR}/${FPCSRCDIR}/compiler && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} install ${MAKE_ARGS} ${NEWFPC})
 	# Installing fpmkunit and its dependencies
 .for component in hash paszlib libtar fcl-process fpmkunit
 	(cd ${WRKDIR}/${FPCSRCDIR}/packages/${component} && ${SETENV} \
 		${MAKE_ENV} ${MAKE_CMD} install ${MAKE_ARGS} ${NEWPPC})
 .endfor
 	# Installing fpcmkcfg
 	${INSTALL_PROGRAM} ${WRKDIR}/${FPCSRCDIR}/utils/fpcmkcfg/bin/${BUILDNAME}/fpcmkcfg \
 		${STAGEDIR}${PREFIX}/bin
 	# Installing fpcmake
 	${INSTALL_PROGRAM} ${NEWFPCMAKE} ${STAGEDIR}${PREFIX}/bin
 	# Installing manpages
 	${INSTALL_MAN} ${WRKDIR}/man/man1/* ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKDIR}/man/man5/* ${STAGEDIR}${MAN1PREFIX}/man/man5
 	# symlinking compiler
 	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ../lib/fpc/${PORTVERSION}/${PPNAME})
 	# creating sample configuration file
 	${SH} "${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}/samplecfg" \
 		"${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}" \
 		"${STAGEDIR}${PREFIX}/etc"
 	@${REINPLACE_CMD} -i "" -e 's|${STAGEDIR}||' \
 		-e 's|^#-Fl/lib;/usr/lib|-Fl${LOCALBASE}/lib;${LOCALBASE}/lib/qt5|g' \
 		${STAGEDIR}${PREFIX}/etc/fpc.cfg.sample
 
 .else
 .include "${MASTERDIR}/Makefile.units"
 .endif
 .include <bsd.port.post.mk>
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index a457da702aa3..e95c432f9872 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1655522950
+TIMESTAMP = 1655772890
 SHA256 (freepascal/fpc-3.2.2.source.tar.gz) = d542e349de246843d4f164829953d1f5b864126c5b62fd17c9b45b33e23d2f44
 SIZE (freepascal/fpc-3.2.2.source.tar.gz) = 52240052
-SHA256 (freepascal/ppc386-3.2.2-freebsd.tar.gz) = 146ed6ce89d3e566a89608021efe79774ca2ce6d996abf9f00bb5ac070cd060e
-SIZE (freepascal/ppc386-3.2.2-freebsd.tar.gz) = 1361735
-SHA256 (freepascal/ppcx64-3.2.2-freebsd.tar.gz) = ea29622ec89148d6d24360ca093e33b4d067fd1596c654c5371d7e870fb03342
-SIZE (freepascal/ppcx64-3.2.2-freebsd.tar.gz) = 2052926
+SHA256 (freepascal/ppc386-3.2.2-freebsd.tar.gz) = 2e175954442e28799edfe08c01635d209298b992f1062d03872571d58aa9f43a
+SIZE (freepascal/ppc386-3.2.2-freebsd.tar.gz) = 1364288
+SHA256 (freepascal/ppcx64-3.2.2-freebsd.tar.gz) = 8cf6258688c3457f27bcec18e6993443ed2fcfe7d7c8697d54a13f32965e8fb0
+SIZE (freepascal/ppcx64-3.2.2-freebsd.tar.gz) = 2052903
 SHA256 (freepascal/fpc-3.2.2.man.tar.gz) = 4b7d7d50922531fa01e00d0bc913abb40426ba3001579240bf3db3f4ad640584
 SIZE (freepascal/fpc-3.2.2.man.tar.gz) = 47334
diff --git a/lang/fpc/files/patch-rtl_bsd_ossysc.inc b/lang/fpc/files/patch-rtl_bsd_ossysc.inc
index f51a375198cc..096bcaecd656 100644
--- a/lang/fpc/files/patch-rtl_bsd_ossysc.inc
+++ b/lang/fpc/files/patch-rtl_bsd_ossysc.inc
@@ -1,85 +1,85 @@
 --- rtl/bsd/ossysc	2019-11-05 11:17:53.000000000 -0500
 +++ rtl/bsd/ossysc.inc	2022-05-28 16:58:54.884379000 -0500
 @@ -76,9 +76,9 @@
  
  begin
    {$ifdef CPU64}
 -    Fplseek:=do_syscall(syscall_nr___syscall,syscall_nr_lseek,TSysParam(fd),0,Offset,whence);
 +    Fplseek:=do_syscall(syscall_nr___syscall,syscall_nr_lseek,TSysParam(fd),Offset,whence);
    {$else}
 -    Fplseek:=do_syscall(syscall_nr___syscall,syscall_nr_lseek,0,TSysParam(fd),0,
 +    Fplseek:=do_syscall(syscall_nr___syscall,syscall_nr_lseek,0,TSysParam(fd),
         {$ifdef ENDIAN_BIG}hi(offset),lo(offset){$endif}
         {$ifdef ENDIAN_LITTLE}lo(Offset),hi(offset){$endif},
         Whence);
 @@ -90,9 +90,9 @@
  
  begin
   {$ifdef CPU64}
 -   Fpftruncate:=Do_syscall(syscall_nr___syscall,syscall_nr_ftruncate, fd  ,0   ,flength);
 +   Fpftruncate:=Do_syscall(syscall_nr___syscall,syscall_nr_ftruncate, fd  ,flength);
   {$else}
 -   Fpftruncate:=Do_syscall(syscall_nr___syscall,syscall_nr_ftruncate,0,fd,0,lo(flength),hi(flength));
 +   Fpftruncate:=Do_syscall(syscall_nr___syscall,syscall_nr_ftruncate,0,fd,lo(flength),hi(flength));
   {$endif}
  
  end;
 @@ -102,9 +102,9 @@
  
  begin
   {$ifdef CPU64}
 -  Fpmmap:=pointer(ptruint(do_syscall(TSysParam(syscall_nr_mmap),TSysParam(Start),TSysParam(Len),TSysParam(Prot),TSysParam(Flags),TSysParam(fd),0,TSysParam(offst))));
 +  Fpmmap:=pointer(ptruint(do_syscall(TSysParam(syscall_nr_mmap),TSysParam(Start),TSysParam(Len),TSysParam(Prot),TSysParam(Flags),TSysParam(fd),TSysParam(offst))));
  {$else}
 - Fpmmap:=pointer(ptruint(do_syscall(syscall_nr_mmap,TSysParam(Start),Len,Prot,Flags,fd,0,
 + Fpmmap:=pointer(ptruint(do_syscall(syscall_nr_mmap,TSysParam(Start),Len,Prot,Flags,fd,
           {$ifdef FPC_BIG_ENDIAN}    hi(offst),lo(offst){$endif}
           {$ifdef FPC_LITTLE_ENDIAN} lo(offst),hi(offst){$endif}
           )));
 @@ -138,10 +138,20 @@
    Fprename:=do_syscall(syscall_nr_rename,TSysParam(old),TSysParam(newpath));
  end;
  
 -function Fpstat(const path: pchar; var buf : stat):cint; [public, alias : 'FPC_SYSC_STAT'];
 +Function fpFstatat(fd: cint; path: pchar; var sb: stat; flag: cint):cint;
 +begin
 + fpFStatat:=do_syscall(syscall_nr_fstatat,fd,TSysParam(path),TSysParam(@sb),flag);
 +end;
  
 +function Fpstat(const path: pchar; var buf : stat):cint; [public, alias : 'FPC_SYSC_STAT'];
 +const
 + AT_FDCWD=-100;
  begin
 +{$ifdef freebsd}
 + Fpstat:=FpFstatat(AT_FDCWD, path, buf, 0);
 +{$else}
   Fpstat:=do_syscall(syscall_nr_stat,TSysParam(path),TSysParam(@buf));
 +{$endif}
  end;
  
  
 @@ -171,6 +181,12 @@
  
  const DIRBLKSIZ=1024;
  
 +{$ifdef freebsd}
 +function FpGetdirentries(fd : cint; buf : pchar; nbytes : clong) : cint;
 +begin
-+  FpGetdirentries:=do_syscall(syscall_nr_getdirentries,fd,TSysParam(buf), nbytes);
++  FpGetdirentries:=do_syscall(syscall_nr_getdirentries,fd,TSysParam(buf), nbytes, TSysParam(0));
 +end;
 +{$endif}
  
  function Fpfstat(fd : cint; var sb : stat): cint; forward;
  
 @@ -247,7 +263,11 @@
  
  var retval :longint;
  begin
 +{$ifdef freebsd}
 + Retval:=FpGetdirentries(dirp^.dd_fd, @dirp^.dd_buf^, DIRBLKSIZ {sizeof(getdentsbuffer)});
 +{$else}
   Retval:=do_syscall(syscall_nr_getdents,TSysParam(dirp^.dd_fd),TSysParam(@dirp^.dd_buf^),DIRBLKSIZ {sizeof(getdentsbuffer)});
 +{$endif}
     dirp^.dd_rewind:=TSysParam(dirp^.dd_buf);
     if retval=0 then
      begin
diff --git a/multimedia/winff/Makefile b/multimedia/winff/Makefile
index 773cadc305cd..bbfeba1185f1 100644
--- a/multimedia/winff/Makefile
+++ b/multimedia/winff/Makefile
@@ -1,65 +1,65 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 
 PORTNAME=	WinFF
 PORTVERSION=	1.5.5
-PORTREVISION=	23
+PORTREVISION=	24
 CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL/thierry
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 DISTNAME=	${_PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Convert your videos quickly, easily, and all at once
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libavutil.so:multimedia/ffmpeg
 
 USES=		fpc lazarus:flavors xorg
 USE_XORG=	x11
 USE_FPC=	chm fcl-base fcl-image fcl-json fcl-xml pasjpeg regexpr x11
 
 NO_WRKSUBDIR=	yes
 _PORTNAME=	${PORTNAME:tl}
 DATADIR=	${PREFIX}/share/${_PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${_PORTNAME}
 
 DESKTOP_ENTRIES=	"${PORTNAME}"	\
 			"${COMMENT}"	\
 			"${_PORTNAME}"	\
 			"${_PORTNAME}"	\
 			"AudioVideo;"	\
 			true
 
 LAZARUS_NO_FLAVORS=	qt5
 LAZARUS_PROJECT_FILES=	winff.lpr
 LAZBUILD_ARGS=		-d
 
 BUILD_WRKSRC=	${WRKDIR}/${PKGNAME}/${_PORTNAME}
 
 .if ${FLAVOR:Ugtk2:Mgtk2}
 USES+=		gnome
 USE_FPC+=	cairo
 USE_GNOME+=	cairo
 .endif
 
 OPTIONS_DEFINE=	DOCS
 
 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-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>
diff --git a/net-p2p/awgg/Makefile b/net-p2p/awgg/Makefile
index 3a0731b6cbb9..545e89cb02dd 100644
--- a/net-p2p/awgg/Makefile
+++ b/net-p2p/awgg/Makefile
@@ -1,53 +1,53 @@
 PORTNAME=	awgg
 PORTVERSION=	0.6.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net-p2p
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Advanced wget GUI
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	aria2c:www/aria2 \
 		wget:ftp/wget \
 		curl:ftp/curl \
 		yt-dlp:www/yt-dlp \
 		axel:ftp/axel
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 USES=		fpc gnome lazarus:flavors xorg
 USE_FPC=	chm fcl-base fcl-db fcl-image fcl-json fcl-net fcl-registry \
 		fcl-web fcl-xml openssl pasjpeg regexpr rtl-extra rtl-objpas x11
 USE_XORG=	x11
 USE_GITHUB=	yes
 GH_ACCOUNT=	Nenirey
 GH_PROJECT=	AWGG
 GH_TAGNAME=	5dc1329
 
 DESKTOP_ENTRIES="AWGG" \
 		"Advanced wget GUI" \
 		"${PREFIX}/share/pixmaps/AWGG16x16.png" \
 		"${PORTNAME}" \
 		"Network;P2P;" \
 		${TRUE}
 
 USE_FPC_gtk2=	cairo
 USE_GNOME_gtk2=	cairo
 USE_FPC+=	${USE_FPC_${FLAVOR}}
 USE_GNOME+=	${USE_GNOME_${FLAVOR}}
 
 LAZBUILD_ARGS=	-d
 LAZARUS_PROJECT_FILES=	src/awgg.lpi
 
 post-patch:
 	${REINPLACE_CMD} 's|/usr/bin/shutdown|/sbin/shutdown|g' ${WRKSRC}/src/fmain.pas
 	${REINPLACE_CMD} 's|/usr|${LOCALBASE}|g' ${WRKSRC}/src/fmain.pas
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	cd ${WRKSRC}/pixmaps && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile
index 01ca4b3832e5..74bcfb74d8b6 100644
--- a/net-p2p/transmission-remote-gui/Makefile
+++ b/net-p2p/transmission-remote-gui/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	transmission-remote-gui
 PORTVERSION=	5.18.0
-PORTREVISION=	9
+PORTREVISION=	10
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-p2p
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 USE_GITHUB=	yes
 GH_PROJECT=	transgui
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Remote GUI for transmission daemon
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 USES=		desktop-file-utils fpc iconv lazarus:flavors
 USE_FPC=	cairo chm fcl-base fcl-image fcl-json fcl-net fcl-xml pasjpeg \
 		rtl-objpas rtl-extra x11
 
 DESKTOP_ENTRIES="Transmission Remote GUI" \
                 "Remote GUI for transmission daemon" \
                 "transgui" \
                 "${PREFIX}/bin/transgui" \
                 "Application;Network;" \
                 ${TRUE}
 
 PLIST_FILES=	bin/transgui \
 		share/icons/hicolor/48x48/apps/transgui.png
 PORTDATA=	*
 SUB_FILES=	pkg-message
 
 LAZARUS_PROJECT_FILES=	transgui.lpi
 LAZBUILD_ARGS=		-d
 PROJECT_NAME=		transgui
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/restranslator.pas
 
 do-install:
 	@cd ${WRKSRC}/units && \
 		${INSTALL_PROGRAM} transgui ${STAGEDIR}${PREFIX}/bin
 	@cd ${WRKSRC} && \
 		${COPYTREE_SHARE} lang ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps
 	${INSTALL_DATA} ${WRKSRC}/transgui.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/transgui.png
 
 .include <bsd.port.mk>
diff --git a/net/fpc-ldap/Makefile b/net/fpc-ldap/Makefile
index f96508a6613c..c3a44bf08ed9 100644
--- a/net/fpc-ldap/Makefile
+++ b/net/fpc-ldap/Makefile
@@ -1,21 +1,21 @@
 # Created by: Christopher Key <cjk32@cam.ac.uk>
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net lang
 PKGNAMESUFFIX=	-ldap
 
 COMMENT=	Free Pascal interface to OpenLDAP
 
 USES=		fpc
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR=	${WRKUNITDIR}
 
 OPTIONS_DEFINE=	OPENLDAP
 OPENLDAP_DESC=	Install OpenLDAP libraries
 OPTIONS_DEFAULT=	OPENLDAP
 
 OPENLDAP_USE=	OPENLDAP=yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/russian/emkatic/Makefile b/russian/emkatic/Makefile
index eac7ffbb2420..bb87950a9626 100644
--- a/russian/emkatic/Makefile
+++ b/russian/emkatic/Makefile
@@ -1,49 +1,49 @@
 # Created by: Andrey Fesenko <andrey@bsdnir.info>
 
 PORTNAME=	emkatic
 PORTVERSION=	0.41
-PORTREVISION=	1
+PORTREVISION=	2
 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
 
 USES=		fpc lazarus:flavors xorg
 USE_FPC=	cairo chm fcl-base fcl-image fcl-json fcl-registry fcl-xml \
 		pasjpeg regexpr rtl-extra x11
 USE_XORG=	x11
 
 LAZARUS_PROJECT_FILES=	emkatic.lpi
 LAZBUILD_ARGS=		-d --pcp=${WRKSRC}/tmppcp
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDATA=	*
 PORTDOCS=	CHANGELOG.*.txt README.*.txt
 
 gtk2_CONFLICTS_INSTALL=	ru-${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	ru-${PORTNAME}-gtk2
 
 OPTIONS_DEFINE=		DOCS PORTAUDIO
 OPTIONS_DEFAULT=	PORTAUDIO
 
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
 
 .if ${FLAVOR:Ugtk2:Mgtk2}
 USES+=		gnome
 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>
diff --git a/science/checkmol/Makefile b/science/checkmol/Makefile
index 95ad7cfc9f39..663967d6a6b1 100644
--- a/science/checkmol/Makefile
+++ b/science/checkmol/Makefile
@@ -1,33 +1,33 @@
 # Created by: Fernan Aguero <fernan@iib.unsam.edu.ar>
 
 PORTNAME=	checkmol
 PORTVERSION=	0.5
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	science
 MASTER_SITES=	https://homepage.univie.ac.at/norbert.haider/download/chemistry/checkmol/
 DISTFILES=	${PORTNAME}
 EXTRACT_SUFX=	.pas
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Analyze molecules for the presence of functional groups
 
 LICENSE=	GPLv2+
 
 NO_WRKSUBDIR=	yes
 
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	#
 EXTRACT_AFTER_ARGS=	${WRKSRC}
 
 USES=		fpc
 
 PLIST_FILES=	bin/checkmol bin/matchmol
 
 do-build:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/fpc ${EXTRACT_ONLY} -S2 -O3)
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME})
 	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} ${PORTNAME} matchmol)
 
 .include <bsd.port.mk>
diff --git a/science/mol2ps/Makefile b/science/mol2ps/Makefile
index faafb12945e5..900ba3fff3c1 100644
--- a/science/mol2ps/Makefile
+++ b/science/mol2ps/Makefile
@@ -1,38 +1,38 @@
 # Created by: Fernan Aguero <fernan@iib.unsam.edu.ar>
 
 PORTNAME=	mol2ps
 PORTVERSION=	0.4b
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	science
 MASTER_SITES=	https://homepage.univie.ac.at/norbert.haider/download/chemistry/mol2ps/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.pas
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Read molecular structure files and generate Postscript output
 
 LICENSE=	GPLv2+
 
 NO_WRKSUBDIR=	yes
 
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	#
 EXTRACT_AFTER_ARGS=	${WRKSRC}
 
 USES=		fpc
 USE_FPC=	rtl-objpas
 
 PLIST_FILES=	bin/mol2eps bin/mol2ps bin/mol2svg %%DATADIR%%/color.conf
 
 do-build:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/fpc mol2ps -S2 -O3)
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} mol2ps ${STAGEDIR}${PREFIX}/bin)
 	(cd ${STAGEDIR}${PREFIX}/bin && \
 		${LN} mol2ps mol2eps && ${LN} mol2ps mol2svg)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${FILESDIR} && ${INSTALL_DATA} color.conf ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/textproc/fpc-libxml2/Makefile b/textproc/fpc-libxml2/Makefile
index 969104bccff3..af96ae82fc79 100644
--- a/textproc/fpc-libxml2/Makefile
+++ b/textproc/fpc-libxml2/Makefile
@@ -1,22 +1,22 @@
 # Created by: Christoper Key <cjk32@cam.ac.uk>
 
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc lang
 PKGNAMESUFFIX=	-libxml2
 
 COMMENT=	Interface to xml2 library
 
 USES=		fpc
 USE_FPC=	rtl-objpas
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//:S/2//}
 EXTRACTUNITDIR=	${WRKUNITDIR}
 
 OPTIONS_DEFINE=	LIBXML2
 LIBXML2_DESC=	Install xml2 library
 OPTIONS_DEFAULT=	LIBXML2
 
 LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile
index 5036b7293c77..298633f938f1 100644
--- a/x11-fm/doublecmd/Makefile
+++ b/x11-fm/doublecmd/Makefile
@@ -1,355 +1,355 @@
 # Created by: Beñat Gonzalez Etxepare <bbtruk@users.sourceforge.net>
 
 PORTNAME=	doublecmd
 PORTVERSION=	1.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11-fm
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	bbtruk@users.sourceforge.net
 COMMENT=	Total Commander like file manager for the X Window System
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 USES=		desktop-file-utils dos2unix fpc gnome lazarus:flavors xorg
 DOS2UNIX_FILES=	components/multithreadprocs/mtpcpu.pas src/dmhelpmanager.pas
 USE_FPC=	cairo chm fcl-base fcl-db fcl-image fcl-json fcl-registry \
 		fcl-xml iconvenc pasjpeg rtl-extra x11 regexpr fcl-extra
 USE_GITHUB=	yes
 GH_PROJECT=	doublecmd.github.io:help
 GH_TAGNAME=	1.0.0:help
 USE_GNOME=	cairo glib20
 USE_XORG=	x11
 
 LAZARUS_PROJECT_FILES=	components/chsdet/chsdet.lpk \
 			components/CmdLine/cmdbox.lpk \
 			components/multithreadprocs/multithreadprocslaz.lpk \
 			components/dcpcrypt/dcpcrypt.lpk \
 			components/doublecmd/doublecmd_common.lpk \
 			components/KASToolBar/kascomp.lpk \
 			components/viewer/viewerpackage.lpk \
 			components/gifanim/pkg_gifanim.lpk \
 			components/synunihighlighter/synuni.lpk
 LAZBUILD_ARGS=		--pcp=${WRKSRC}/tmppcp -d
 
 MAKE_ENV+=	LDVER=ld.bfd # for DragonFly
 
 PLIST=		${WRKDIR}/pkg-plist
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DEBUG DOCS
 OPTIONS_DEFAULT=	DSX_LOCATE WCX_CPIO WCX_DEB WCX_RPM WCX_UNRAR WCX_ZIP \
 			WDX_AUDIOINFO WDX_DEB WDX_RPM WDX_SCRIPTS WDX_TEXTLINE \
 			WDX_XPI WFX_FTP WFX_SAMBA
 
 OPTIONS_GROUP=		DSX WCX WDX WFX WLX
 OPTIONS_GROUP_DSX=	DSX_LOCATE
 OPTIONS_GROUP_WCX=	WCX_CPIO WCX_DEB WCX_RPM WCX_UNBZ2 WCX_UNRAR WCX_ZIP
 OPTIONS_GROUP_WDX=	WDX_AUDIOINFO WDX_DEB WDX_RPM WDX_SCRIPTS WDX_TEXTLINE \
 			WDX_XPI
 OPTIONS_GROUP_WFX=	WFX_FTP WFX_SAMBA
 OPTIONS_GROUP_WLX=	WLX_MPLAYER
 
 DSX_DESC=		Search plugins
 DSX_LOCATE_DESC=	Support locate command
 
 WCX_CPIO_DESC=	CPIO format support
 WCX_DEB_DESC=	Debian package archive support
 WCX_DESC=	Packer plugins to work with archives
 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_AUDIOINFO_DESC=	Information about audio files
 WDX_DEB_DESC=		Debian package file information
 WDX_DESC=		Plugins to display and search extended file attributes
 WDX_RPM_DESC=		Red Hat package file information
 WDX_SCRIPTS_DESC=	Add support to use custom Lua scripts
 WDX_TEXTLINE_DESC=	Show and replace single lines in text files
 WDX_XPI_DESC=		Mozilla plugin file information
 
 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
 
 WCX_UNRAR_LIB_DEPENDS=		libunrar.so.6:archivers/libunrar6
 WFX_SAMBA_USES=			samba:lib
 WLX_MPLAYER_RUN_DEPENDS=	mplayer:multimedia/mplayer
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 LAZBUILD_ARGS+=	--bm="Debug"
 .endif
 
 .if ${PORT_OPTIONS:MWFX_FTP}
 USE_FPC+=		fcl-net
 LAZARUS_PROJECT_FILES+=	plugins/wfx/ftp/src/ftp.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWCX_CPIO}
 LAZARUS_PROJECT_FILES+=	plugins/wcx/cpio/src/cpio.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWCX_DEB}
 LAZARUS_PROJECT_FILES+=	plugins/wcx/deb/src/deb.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWCX_UNBZ2}
 LAZARUS_PROJECT_FILES+=	plugins/wcx/unbz2/src/unbz2.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWCX_RPM}
 LAZARUS_PROJECT_FILES+=	plugins/wcx/rpm/src/rpm.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWCX_UNRAR}
 LAZARUS_PROJECT_FILES+=	plugins/wcx/unrar/src/unrar.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWCX_ZIP}
 LAZARUS_PROJECT_FILES+=	plugins/wcx/zip/src/Zip.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWDX_AUDIOINFO}
 LAZARUS_PROJECT_FILES+=	plugins/wdx/audioinfo/src/AudioInfo.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWDX_RPM}
 LAZARUS_PROJECT_FILES+=	plugins/wdx/rpm_wdx/src/rpm_wdx.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWDX_DEB}
 LAZARUS_PROJECT_FILES+=	plugins/wdx/deb_wdx/src/deb_wdx.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWDX_XPI}
 LAZARUS_PROJECT_FILES+=	plugins/wdx/xpi_wdx/src/xpi_wdx.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWDX_TEXTLINE}
 LAZARUS_PROJECT_FILES+=	plugins/wdx/textline/src/TextLine.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWFX_SAMBA}
 LAZARUS_PROJECT_FILES+=	plugins/wfx/samba/src/samba.lpi
 .endif
 
 .if ${PORT_OPTIONS:MWLX_MPLAYER}
 LAZARUS_PROJECT_FILES+=	plugins/wlx/WlxMplayer/src/wlxMplayer.lpi
 .endif
 
 .if ${PORT_OPTIONS:MDSX_LOCATE}
 LAZARUS_PROJECT_FILES+=	plugins/dsx/DSXLocate/src/DSXLocate.lpi
 .endif
 
 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 's| Default="True"||g' \
 		-e 's|Name="NoDebug Full Optimizations"|Name="NoDebug Full Optimizations" Default="True"|g' \
 			${WRKSRC}/src/${PORTNAME}.lpi
 
 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_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
 	@${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}
 
 	@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/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/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/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/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/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/deb_wdx.wdx ${STAGEDIR}${DATADIR}/plugins/wdx/deb_wdx/
 .endif
 .if ${PORT_OPTIONS:MWDX_XPI}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/plugins/wdx/xpi_wdx/
 	${INSTALL_LIB} ${WRKSRC}/plugins/wdx/xpi_wdx/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/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/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/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_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 ${WRKSRC_help} && \
 		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/{}" \; && \
 			${FIND} * -type f -exec ${INSTALL_DATA} {} "${STAGEDIR}${DOCSDIR}/{}" \;
 .endif
 
 .include <bsd.port.mk>