editors/lazarus-*: update to 2.2.0

- Bump PORTREVISION
- archivers/peazip update to 8.4.0
- editors/cudatext update to 1.155.3
- russian/emkatic update to 0.41
- x11-toolkits/qt5pas to latest version included into lazarus 2.2.0

ChangeLog at:	https://wiki.lazarus.freepascal.org/Lazarus_2.2.0_release_notes

3 files changed, 87 insertions, 79 deletions

diff --git a/archivers/peazip/Makefile b/archivers/peazip/Makefile
index f0766154600f..ba80cb94d79d 100644
--- a/archivers/peazip/Makefile
+++ b/archivers/peazip/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	peazip
-PORTVERSION=	8.1.0
+PORTVERSION=	8.4.0
 CATEGORIES=	archivers
 MASTER_SITES=	https://github.com/giorgiotani/PeaZip/releases/download/${PORTVERSION}/
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
@@ -45,7 +45,7 @@ USE_GNOME+=	cairo
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:M7Z}
-RUN_DEPENDS+=	7z:archivers/p7zip
+RUN_DEPENDS+=	7zz:archivers/7-zip
 ARCHIVER_FILES+=7z
 PLIST_SUB+=	7Z=""
 .else
@@ -76,6 +76,8 @@ PLIST_SUB+=	UNACE=""
 PLIST_SUB+=	UNACE="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	${REINPLACE_CMD} 's|GetSelectedNodePath|Path|g' ${WRKSRC}/peach.pas
 
@@ -84,19 +86,24 @@ pre-install:
 	@${ECHO_CMD} "appdata" >> ${WRKSRC}/altconf.txt
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/res
+	@${MKDIR} ${STAGEDIR}${DATADIR}/res/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}/res/share
 .for ARCHIVER in ${ARCHIVER_FILES}
-	@${MKDIR} ${STAGEDIR}${DATADIR}/res/${ARCHIVER}
-	@${LN} -s ${LOCALBASE}/bin/${ARCHIVER} ${STAGEDIR}${DATADIR}/res/${ARCHIVER}/${ARCHIVER}
+	@${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 && ${COPYTREE_SHARE} "icons lang themes" ${STAGEDIR}${DATADIR}/res
+	@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}/FreeDesktop_integration && \
+	@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.mk>
+.include <bsd.port.post.mk>
diff --git a/archivers/peazip/distinfo b/archivers/peazip/distinfo
index ac3d1b9c5361..3d0e01406db8 100644
--- a/archivers/peazip/distinfo
+++ b/archivers/peazip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627749414
-SHA256 (peazip-8.1.0.src.zip) = d5093539ff70d3f58f599f146385b891704cb3e3dd6f325f0b76b5043d8a0c60
-SIZE (peazip-8.1.0.src.zip) = 5807059
+TIMESTAMP = 1643850876
+SHA256 (peazip-8.4.0.src.zip) = f4ffb4ca1e912eb89d8d32338166bad2bdb0dc86fffb747921eb2c2b90c8aa74
+SIZE (peazip-8.4.0.src.zip) = 6896758
diff --git a/archivers/peazip/pkg-plist b/archivers/peazip/pkg-plist
index d71910ea6c51..26cb9d7f49c9 100644
--- a/archivers/peazip/pkg-plist
+++ b/archivers/peazip/pkg-plist
@@ -3,73 +3,74 @@ bin/peazip
 share/applications/peazip.desktop
 share/icons/hicolor/256x256/apps/peazip.png
 %%DATADIR%%/peazip
-%%7Z%%%%DATADIR%%/res/7z/7z
-%%ARC%%%%DATADIR%%/res/arc/arc
-%%UNACE%%%%DATADIR%%/res/unace/unace
-%%ZPAQ%%%%DATADIR%%/res/zpaq/zpaq
+%%7Z%%%%DATADIR%%/res/bin/7z/7z
+%%ARC%%%%DATADIR%%/res/bin/arc/arc
+%%UNACE%%%%DATADIR%%/res/bin/unace/unace
+%%ZPAQ%%%%DATADIR%%/res/bin/zpaq/zpaq
 %%DATADIR%%/res/altconf.txt
-%%DATADIR%%/res/icons/PeaZip.ico
-%%DATADIR%%/res/icons/PeaZip_7z.ico
-%%DATADIR%%/res/icons/PeaZip_app.ico
-%%DATADIR%%/res/icons/PeaZip_block.ico
-%%DATADIR%%/res/icons/PeaZip_cd.ico
-%%DATADIR%%/res/icons/PeaZip_package.ico
-%%DATADIR%%/res/icons/PeaZip_rar.ico
-%%DATADIR%%/res/icons/PeaZip_zip.ico
-%%DATADIR%%/res/icons/peazip_seven.icl
-%%DATADIR%%/res/lang/ar.txt
-%%DATADIR%%/res/lang/bg.txt
-%%DATADIR%%/res/lang/by-cr.txt
-%%DATADIR%%/res/lang/by-lt.txt
-%%DATADIR%%/res/lang/chs.txt
-%%DATADIR%%/res/lang/cht.txt
-%%DATADIR%%/res/lang/cz.txt
-%%DATADIR%%/res/lang/de-uml.txt
-%%DATADIR%%/res/lang/default.txt
-%%DATADIR%%/res/lang/en-gb.txt
-%%DATADIR%%/res/lang/en.txt
-%%DATADIR%%/res/lang/es-es.txt
-%%DATADIR%%/res/lang/es-la.txt
-%%DATADIR%%/res/lang/eu.txt
-%%DATADIR%%/res/lang/fi.txt
-%%DATADIR%%/res/lang/fr.txt
-%%DATADIR%%/res/lang/gl.txt
-%%DATADIR%%/res/lang/gr.txt
-%%DATADIR%%/res/lang/he-prototype.txt
-%%DATADIR%%/res/lang/hu.txt
-%%DATADIR%%/res/lang/id.txt
-%%DATADIR%%/res/lang/it.txt
-%%DATADIR%%/res/lang/ja.txt
-%%DATADIR%%/res/lang/ko.txt
-%%DATADIR%%/res/lang/lv.txt
-%%DATADIR%%/res/lang/nl.txt
-%%DATADIR%%/res/lang/no.txt
-%%DATADIR%%/res/lang/pl.txt
-%%DATADIR%%/res/lang/pt-br.txt
-%%DATADIR%%/res/lang/pt-pt.txt
-%%DATADIR%%/res/lang/ro.txt
-%%DATADIR%%/res/lang/ru.txt
-%%DATADIR%%/res/lang/si.txt
-%%DATADIR%%/res/lang/sk.txt
-%%DATADIR%%/res/lang/sl.txt
-%%DATADIR%%/res/lang/sv.txt
-%%DATADIR%%/res/lang/tj.txt
-%%DATADIR%%/res/lang/tr.txt
-%%DATADIR%%/res/lang/uk.txt
-%%DATADIR%%/res/lang/uz.txt
-%%DATADIR%%/res/lang/vn.txt
+%%DATADIR%%/res/share/icons/PeaZip.ico
+%%DATADIR%%/res/share/icons/PeaZip_7z.ico
+%%DATADIR%%/res/share/icons/PeaZip_app.ico
+%%DATADIR%%/res/share/icons/PeaZip_block.ico
+%%DATADIR%%/res/share/icons/PeaZip_cd.ico
+%%DATADIR%%/res/share/icons/PeaZip_package.ico
+%%DATADIR%%/res/share/icons/PeaZip_rar.ico
+%%DATADIR%%/res/share/icons/PeaZip_zip.ico
+%%DATADIR%%/res/share/icons/peazip_seven.icl
+%%DATADIR%%/res/share/lang/ar.txt
+%%DATADIR%%/res/share/lang/bg.txt
+%%DATADIR%%/res/share/lang/by-cr.txt
+%%DATADIR%%/res/share/lang/by-lt.txt
+%%DATADIR%%/res/share/lang/ca.txt
+%%DATADIR%%/res/share/lang/chs.txt
+%%DATADIR%%/res/share/lang/cht.txt
+%%DATADIR%%/res/share/lang/cz.txt
+%%DATADIR%%/res/share/lang/de-uml.txt
+%%DATADIR%%/res/share/lang/default.txt
+%%DATADIR%%/res/share/lang/en-gb.txt
+%%DATADIR%%/res/share/lang/en.txt
+%%DATADIR%%/res/share/lang/es-es.txt
+%%DATADIR%%/res/share/lang/es-la.txt
+%%DATADIR%%/res/share/lang/eu.txt
+%%DATADIR%%/res/share/lang/fi.txt
+%%DATADIR%%/res/share/lang/fr.txt
+%%DATADIR%%/res/share/lang/gl.txt
+%%DATADIR%%/res/share/lang/gr.txt
+%%DATADIR%%/res/share/lang/he-prototype.txt
+%%DATADIR%%/res/share/lang/hu.txt
+%%DATADIR%%/res/share/lang/id.txt
+%%DATADIR%%/res/share/lang/it.txt
+%%DATADIR%%/res/share/lang/ja.txt
+%%DATADIR%%/res/share/lang/ko.txt
+%%DATADIR%%/res/share/lang/lv.txt
+%%DATADIR%%/res/share/lang/nl.txt
+%%DATADIR%%/res/share/lang/no.txt
+%%DATADIR%%/res/share/lang/pl.txt
+%%DATADIR%%/res/share/lang/pt-br.txt
+%%DATADIR%%/res/share/lang/pt-pt.txt
+%%DATADIR%%/res/share/lang/ro.txt
+%%DATADIR%%/res/share/lang/ru.txt
+%%DATADIR%%/res/share/lang/si.txt
+%%DATADIR%%/res/share/lang/sk.txt
+%%DATADIR%%/res/share/lang/sl.txt
+%%DATADIR%%/res/share/lang/sv.txt
+%%DATADIR%%/res/share/lang/tj.txt
+%%DATADIR%%/res/share/lang/tr.txt
+%%DATADIR%%/res/share/lang/uk.txt
+%%DATADIR%%/res/share/lang/uz.txt
+%%DATADIR%%/res/share/lang/vn.txt
 %%DATADIR%%/res/pea
-%%DATADIR%%/res/themes/KDE Breeze.theme.7z
-%%DATADIR%%/res/themes/Oxygen.theme.7z
-%%DATADIR%%/res/themes/classic.theme.7z
-%%DATADIR%%/res/themes/experience.theme.7z
-%%DATADIR%%/res/themes/firecrystal.theme.7z
-%%DATADIR%%/res/themes/graphite.theme.7z
-%%DATADIR%%/res/themes/mocha.theme.7z
-%%DATADIR%%/res/themes/nographic-embedded/fm-theme.bmp
-%%DATADIR%%/res/themes/nographic-embedded/readme.txt
-%%DATADIR%%/res/themes/senape.theme.7z
-%%DATADIR%%/res/themes/seven.theme.7z
-%%DATADIR%%/res/themes/ten-embedded/fm-theme.bmp
-%%DATADIR%%/res/themes/ten-embedded/readme.txt
-%%DATADIR%%/res/themes/ten.theme.7z
+%%DATADIR%%/res/share/themes/KDE Breeze.theme.7z
+%%DATADIR%%/res/share/themes/Oxygen.theme.7z
+%%DATADIR%%/res/share/themes/classic.theme.7z
+%%DATADIR%%/res/share/themes/experience.theme.7z
+%%DATADIR%%/res/share/themes/firecrystal.theme.7z
+%%DATADIR%%/res/share/themes/graphite.theme.7z
+%%DATADIR%%/res/share/themes/mocha.theme.7z
+%%DATADIR%%/res/share/themes/nographic-embedded/fm-theme.bmp
+%%DATADIR%%/res/share/themes/nographic-embedded/readme.txt
+%%DATADIR%%/res/share/themes/senape.theme.7z
+%%DATADIR%%/res/share/themes/seven.theme.7z
+%%DATADIR%%/res/share/themes/ten-embedded/fm-theme.bmp
+%%DATADIR%%/res/share/themes/ten-embedded/readme.txt
+%%DATADIR%%/res/share/themes/ten.theme.7z