Date: Thu, 3 Feb 2022 05:07:26 GMT From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: daa23dba69ea - main - editors/lazarus-*: update to 2.2.0 Message-ID: <202202030507.21357Qi6075712@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=daa23dba69ea27a2e101b04738b9d0abcf34ac74 commit daa23dba69ea27a2e101b04738b9d0abcf34ac74 Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2022-02-03 05:03:11 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2022-02-03 05:07:13 +0000 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 --- Mk/bsd.default-versions.mk | 2 +- archivers/peazip/Makefile | 23 ++-- archivers/peazip/distinfo | 6 +- archivers/peazip/pkg-plist | 137 +++++++++++---------- cad/zcad/Makefile | 2 +- comms/cqrlog/Makefile | 1 + editors/cudatext/Makefile | 8 +- editors/cudatext/distinfo | 18 +-- editors/cudatext/pkg-plist | 2 + editors/lazarus/Makefile | 9 +- editors/lazarus/distinfo | 6 +- editors/lazarus/files/patch-ide_lazbuild.lpr | 33 ----- .../files/patch-lcl-interfaces-qt5_qtobjects.pas | 14 --- editors/picpas/Makefile | 2 +- graphics/lazpaint/Makefile | 2 +- multimedia/winff/Makefile | 2 +- net-p2p/awgg/Makefile | 2 +- net-p2p/transmission-remote-gui/Makefile | 2 +- russian/emkatic/Makefile | 3 +- russian/emkatic/distinfo | 6 +- russian/emkatic/files/patch-globe.pas | 11 ++ x11-fm/doublecmd/Makefile | 1 + x11-toolkits/qt5pas/Makefile | 2 +- x11-toolkits/qt5pas/distinfo | 6 +- x11-toolkits/qt5pas/pkg-plist | 8 +- 25 files changed, 144 insertions(+), 164 deletions(-) diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index ce3c5fca1587..42322a77cb9a 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -62,7 +62,7 @@ IMAGEMAGICK_DEFAULT?= 7 JAVA_DEFAULT?= 8 # Possible values: 2.0.12, 2.3.0 .if !defined(WANT_LAZARUS_DEVEL) -LAZARUS_DEFAULT?= 2.0.12 +LAZARUS_DEFAULT?= 2.2.0 .else LAZARUS_DEFAULT?= 2.3.0 .endif 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 diff --git a/cad/zcad/Makefile b/cad/zcad/Makefile index 009a5c5e0463..dad2f2859b09 100644 --- a/cad/zcad/Makefile +++ b/cad/zcad/Makefile @@ -2,7 +2,7 @@ PORTNAME= zcad PORTVERSION= 0.9.8.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile index 3f81bf41b157..20da93cc24d6 100644 --- a/comms/cqrlog/Makefile +++ b/comms/cqrlog/Makefile @@ -3,6 +3,7 @@ PORTNAME= cqrlog PORTVERSION= 2.5.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= comms hamradio PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} diff --git a/editors/cudatext/Makefile b/editors/cudatext/Makefile index bdad2b033413..64a05730deb5 100644 --- a/editors/cudatext/Makefile +++ b/editors/cudatext/Makefile @@ -1,5 +1,5 @@ PORTNAME= cudatext -PORTVERSION= 1.151.0 +PORTVERSION= 1.155.3 CATEGORIES= editors PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} @@ -17,10 +17,10 @@ GH_PROJECT= CudaText GH_TUPLE= bgrabitmap:bgrabitmap:ace7e0e:bgrabitmap/bgrabitmap \ Alexey-T:Python-for-Lazarus:24d15bb:python4lazarus/python4lazarus \ Alexey-T:ATFlatControls:c536aa6:atflatcontrols/atflatcontrols \ - Alexey-T:ATSynEdit:dd39ef6:atsynedit/atsynedit \ + Alexey-T:ATSynEdit:12d0a60:atsynedit/atsynedit \ Alexey-T:Emmet-Pascal:fb5b116:emmet/emmet \ - Alexey-T:EControl:f59bc3a:econtrol/econtrol \ - Alexey-T:ATSynEdit_Ex:4b17f2e:atsyneditex/atsyneditex \ + Alexey-T:EControl:6debc32:econtrol/econtrol \ + Alexey-T:ATSynEdit_Ex:c32f515:atsyneditex/atsyneditex \ Alexey-T:ATSynEdit_Cmp:58c613e:atsyneditcmp/atsyneditcmp \ Alexey-T:ATBinHex-Lazarus:c63346b:atbinhex/atbinhex \ Alexey-T:UniqueInstance:753f823:uniqueinstance/uniqueinstance \ diff --git a/editors/cudatext/distinfo b/editors/cudatext/distinfo index 6f6b1f5e80a2..c54daf7aba89 100644 --- a/editors/cudatext/distinfo +++ b/editors/cudatext/distinfo @@ -1,20 +1,20 @@ -TIMESTAMP = 1638926794 -SHA256 (Alexey-T-CudaText-1.151.0_GH0.tar.gz) = 1b314972e0208979adb67950f6cb8718291653c1ae9a1573e713f6790a8598b9 -SIZE (Alexey-T-CudaText-1.151.0_GH0.tar.gz) = 6702164 +TIMESTAMP = 1643863343 +SHA256 (Alexey-T-CudaText-1.155.3_GH0.tar.gz) = 251eb9c19a32054663aab4e5b32f7534ccc8e33adaef687bef93e08ced89b8ec +SIZE (Alexey-T-CudaText-1.155.3_GH0.tar.gz) = 6728801 SHA256 (bgrabitmap-bgrabitmap-ace7e0e_GH0.tar.gz) = ae3f28596c2a5f44bc468f6c3380fc1ceb27e95afea579f09b1d340c781bbef2 SIZE (bgrabitmap-bgrabitmap-ace7e0e_GH0.tar.gz) = 6983967 SHA256 (Alexey-T-Python-for-Lazarus-24d15bb_GH0.tar.gz) = 5ee4a511e6c4cbd8d5105203acbcb04fbeb180160b9cdff7dac2ce0e3cce04f4 SIZE (Alexey-T-Python-for-Lazarus-24d15bb_GH0.tar.gz) = 94717 SHA256 (Alexey-T-ATFlatControls-c536aa6_GH0.tar.gz) = e829704a18fa2f6c1133ea27d97ea04824e3e3bc8e9f045373f0565da1ebd672 SIZE (Alexey-T-ATFlatControls-c536aa6_GH0.tar.gz) = 532112 -SHA256 (Alexey-T-ATSynEdit-dd39ef6_GH0.tar.gz) = 17501f0585fdc1f2634c46a5b23cf05aa712e49f7543b550010ce6c26a04cefa -SIZE (Alexey-T-ATSynEdit-dd39ef6_GH0.tar.gz) = 1391495 +SHA256 (Alexey-T-ATSynEdit-12d0a60_GH0.tar.gz) = 5c6cf0c439adf13337401f76a0e5f764d1b41a787e2ba8a0ff7c192679dc29ad +SIZE (Alexey-T-ATSynEdit-12d0a60_GH0.tar.gz) = 1393022 SHA256 (Alexey-T-Emmet-Pascal-fb5b116_GH0.tar.gz) = 295598366827234dedf7338d2e5878cdd7058fde6117e8c7cd65e7a3aa81a671 SIZE (Alexey-T-Emmet-Pascal-fb5b116_GH0.tar.gz) = 82395 -SHA256 (Alexey-T-EControl-f59bc3a_GH0.tar.gz) = d189f28e7b220318669500975ccf2f0777cd82f0feefd0a58eb0607270cb0927 -SIZE (Alexey-T-EControl-f59bc3a_GH0.tar.gz) = 67131 -SHA256 (Alexey-T-ATSynEdit_Ex-4b17f2e_GH0.tar.gz) = 142c2b9155e107060cb78a2b03cc41aa838b8071db411f203f6d904a0b1ee2ff -SIZE (Alexey-T-ATSynEdit_Ex-4b17f2e_GH0.tar.gz) = 42919 +SHA256 (Alexey-T-EControl-6debc32_GH0.tar.gz) = fe9c12fe6435628015db314a3613d2c0d0e6f65c8d7d642724573ee873c766d8 +SIZE (Alexey-T-EControl-6debc32_GH0.tar.gz) = 66502 +SHA256 (Alexey-T-ATSynEdit_Ex-c32f515_GH0.tar.gz) = 7039a37b4d73ed08d4d7417fb876e121a9b4597662f7313487066c50a456b3d5 +SIZE (Alexey-T-ATSynEdit_Ex-c32f515_GH0.tar.gz) = 43425 SHA256 (Alexey-T-ATSynEdit_Cmp-58c613e_GH0.tar.gz) = 7c58161b5b6bd8b0af6727271afd4ed6ba2f958f377b7e2386cac753c4f96475 SIZE (Alexey-T-ATSynEdit_Cmp-58c613e_GH0.tar.gz) = 19083 SHA256 (Alexey-T-ATBinHex-Lazarus-c63346b_GH0.tar.gz) = e37ccd44148a7a1e9af8d6588b8f199e53efb271938b8a7d5514c2183ceb172a diff --git a/editors/cudatext/pkg-plist b/editors/cudatext/pkg-plist index 8ddb6327aca1..95a82cdc827c 100644 --- a/editors/cudatext/pkg-plist +++ b/editors/cudatext/pkg-plist @@ -357,6 +357,8 @@ share/applications/cudatext.desktop %%DATADIR%%/data/lexlib/C.lcf %%DATADIR%%/data/lexlib/CSS.cuda-lexmap %%DATADIR%%/data/lexlib/CSS.lcf +%%DATADIR%%/data/lexlib/HTML style.cuda-lexmap +%%DATADIR%%/data/lexlib/HTML style.lcf %%DATADIR%%/data/lexlib/HTML.cuda-lexmap %%DATADIR%%/data/lexlib/HTML.lcf %%DATADIR%%/data/lexlib/Ini files.cuda-lexmap diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile index f88473a75e7e..03511a031bbb 100644 --- a/editors/lazarus/Makefile +++ b/editors/lazarus/Makefile @@ -1,6 +1,6 @@ PORTNAME= lazarus -PORTVERSION= 2.0.12 -#DISTVERSIONSUFFIX= -2 +PORTVERSION= 2.2.0 +DISTVERSIONSUFFIX= -0 PKGNAMESUFFIX?= -gtk2 PORTREVISION?= 0 CATEGORIES= editors devel @@ -17,6 +17,7 @@ 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 @@ -81,6 +82,10 @@ 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 diff --git a/editors/lazarus/distinfo b/editors/lazarus/distinfo index 80348a92039a..13f5c4351ea2 100644 --- a/editors/lazarus/distinfo +++ b/editors/lazarus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1627717078 -SHA256 (freepascal/lazarus-2.0.12.tar.gz) = ba6cef7f823a2d28166229982efc926039d42313c40e22fe0c6776c13d0015b2 -SIZE (freepascal/lazarus-2.0.12.tar.gz) = 69560778 +TIMESTAMP = 1642785718 +SHA256 (freepascal/lazarus-2.2.0-0.tar.gz) = b6b5d516511e3dfb34910d7656db068d4bba80f009692500aebbcae79cb12160 +SIZE (freepascal/lazarus-2.2.0-0.tar.gz) = 76777421 diff --git a/editors/lazarus/files/patch-ide_lazbuild.lpr b/editors/lazarus/files/patch-ide_lazbuild.lpr deleted file mode 100644 index f41760802e71..000000000000 --- a/editors/lazarus/files/patch-ide_lazbuild.lpr +++ /dev/null @@ -1,33 +0,0 @@ ---- ide/lazbuild.lpr 2018-07-28 08:38:06.000000000 -0500 -+++ ide/lazbuild.lpr 2020-11-19 20:38:27.421396000 -0500 -@@ -372,7 +372,7 @@ - if not FileExistsUTF8(Filename) then - begin - // Check for packages if the specified name is a valid identifier -- if LazIsValidIdent(OriginalFileName) then begin -+ if PackageFileNameIsValid(OriginalFileName) then begin - if PackageAction=lpaAddPkgLinks then begin - Error(ErrorFileNotFound,'lpk file expected, but '+OriginalFilename+' found'); - Exit; -@@ -487,11 +487,10 @@ - XMLConfig.Free; - end; - // check Package Name -- if (Result.Name='') or (not LazIsValidIdent(Result.Name)) then begin -+ if (Result.Name='') or (not IsValidPkgName(Result.Name)) then - Error(ErrorPackageNameInvalid, - Format(lisPkgMangThePackageNameOfTheFileIsInvalid, - [Result.Name, LineEnding, Result.Filename])); -- end; - // check if Package with same name is already loaded - ConflictPkg:=PackageGraph.FindPackageWithName(Result.Name,nil); - if ConflictPkg<>nil then begin -@@ -1051,7 +1050,7 @@ - PkgFilename:=''; - if CompareFileExt(PackageNamesOrFiles[i],'.lpk')=0 then - PkgFilename:=ExpandFileNameUTF8(PackageNamesOrFiles[i]) -- else if LazIsValidIdent(PackageNamesOrFiles[i]) then begin -+ else if IsValidPkgName(PackageNamesOrFiles[i]) then begin - PackageLink:=TLazPackageLink(LazPackageLinks.FindLinkWithPkgName(PackageNamesOrFiles[i])); - if PackageLink=nil then - begin diff --git a/editors/lazarus/files/patch-lcl-interfaces-qt5_qtobjects.pas b/editors/lazarus/files/patch-lcl-interfaces-qt5_qtobjects.pas deleted file mode 100644 index bc4c5e0c9957..000000000000 --- a/editors/lazarus/files/patch-lcl-interfaces-qt5_qtobjects.pas +++ /dev/null @@ -1,14 +0,0 @@ ---- lcl/interfaces/qt5/qtobjects.pas 2020-11-23 21:01:09.916716000 -0500 -+++ lcl/interfaces/qt5/qtobjects.pas 2020-11-23 21:02:33.484592000 -0500 -@@ -3115,8 +3115,9 @@ - SelFont := AFont; - if (AFont.FHandle <> nil) and (Widget <> nil) then - begin -- QFnt := QPainter_font(Widget); -- AssignQtFont(AFont.FHandle, QFnt); -+ QFnt := QFont_Create(AFont.FHandle); -+ QPainter_setFont(Widget, QFnt); -+ QFont_destroy(QFnt); - vFont.Angle := AFont.Angle; - end; - end; diff --git a/editors/picpas/Makefile b/editors/picpas/Makefile index 331cc39714f3..fd0bcbe2f9d5 100644 --- a/editors/picpas/Makefile +++ b/editors/picpas/Makefile @@ -1,6 +1,6 @@ PORTNAME= picpas PORTVERSION= 0.9.0 -PORTREVISION= 3 +PORTREVISION= 4 DISTVERSIONPREFIX= v CATEGORIES= editors PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} diff --git a/graphics/lazpaint/Makefile b/graphics/lazpaint/Makefile index b8a8301888cf..26fffcd986da 100644 --- a/graphics/lazpaint/Makefile +++ b/graphics/lazpaint/Makefile @@ -1,6 +1,6 @@ PORTNAME= lazpaint PORTVERSION= 7.1.6 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= graphics PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} diff --git a/multimedia/winff/Makefile b/multimedia/winff/Makefile index 6dde77abe794..5090103d923b 100644 --- a/multimedia/winff/Makefile +++ b/multimedia/winff/Makefile @@ -2,7 +2,7 @@ PORTNAME= WinFF PORTVERSION= 1.5.5 -PORTREVISION= 21 +PORTREVISION= 22 CATEGORIES= multimedia MASTER_SITES= LOCAL/thierry PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} diff --git a/net-p2p/awgg/Makefile b/net-p2p/awgg/Makefile index 3ed705cbd1c0..264f5540f856 100644 --- a/net-p2p/awgg/Makefile +++ b/net-p2p/awgg/Makefile @@ -1,6 +1,6 @@ PORTNAME= awgg PORTVERSION= 0.6.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-p2p PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile index da36a6136e1a..d1501c0a3bb8 100644 --- a/net-p2p/transmission-remote-gui/Makefile +++ b/net-p2p/transmission-remote-gui/Makefile @@ -1,6 +1,6 @@ PORTNAME= transmission-remote-gui PORTVERSION= 5.18.0 -PORTREVISION= 7 +PORTREVISION= 8 DISTVERSIONPREFIX= v CATEGORIES= net-p2p PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} diff --git a/russian/emkatic/Makefile b/russian/emkatic/Makefile index 149f7bde553d..ca1b75cdf278 100644 --- a/russian/emkatic/Makefile +++ b/russian/emkatic/Makefile @@ -1,8 +1,7 @@ # Created by: Andrey Fesenko <andrey@bsdnir.info> PORTNAME= emkatic -PORTVERSION= 0.38 -PORTREVISION= 5 +PORTVERSION= 0.41 CATEGORIES= russian emulators PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} MASTER_SITES= SF/${PORTNAME}/eMKatic%20Source diff --git a/russian/emkatic/distinfo b/russian/emkatic/distinfo index 15a91a34eb1e..0a71b5d98827 100644 --- a/russian/emkatic/distinfo +++ b/russian/emkatic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1577761190 -SHA256 (emkatic-0.38-src.tar.gz) = bbc892ccea727d2d79f66ceb840669402d32e7a4678de490f7c944a1c079e310 -SIZE (emkatic-0.38-src.tar.gz) = 664660 +TIMESTAMP = 1643858819 +SHA256 (emkatic-0.41-src.tar.gz) = 788c72bb8a33ad32d5d51963094dcf8cd07989d508f60f41d6e317d48755a1c9 +SIZE (emkatic-0.41-src.tar.gz) = 664779 diff --git a/russian/emkatic/files/patch-globe.pas b/russian/emkatic/files/patch-globe.pas new file mode 100644 index 000000000000..d91e93e447c1 --- /dev/null +++ b/russian/emkatic/files/patch-globe.pas @@ -0,0 +1,11 @@ +--- globe.pas 2022-02-02 23:19:19.035871000 -0500 ++++ globe.pas 2022-02-02 23:19:31.522474000 -0500 +@@ -26,7 +26,7 @@ + + uses + Classes,SysUtils,Forms,Controls,ComCtrls,StdCtrls,Buttons,Graphics, +- SynEdit,Math,Serial,InstrSet,DecNorm,eMKaticIPC,ResStr; ++ SynEdit,SynEditTypes,Math,Serial,InstrSet,DecNorm,eMKaticIPC,ResStr; + + type + TAltMod = (amUnknown,amNoSave,amTemporary,amShow,amClean,amDefault, diff --git a/x11-fm/doublecmd/Makefile b/x11-fm/doublecmd/Makefile index 165cbdc43d08..7465195ec00d 100644 --- a/x11-fm/doublecmd/Makefile +++ b/x11-fm/doublecmd/Makefile @@ -3,6 +3,7 @@ PORTNAME= doublecmd PORTVERSION= 1.0.2 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= x11-fm PKGNAMESUFFIX= ${LAZARUS_PKGNAMESUFFIX} diff --git a/x11-toolkits/qt5pas/Makefile b/x11-toolkits/qt5pas/Makefile index cd869824eb3e..43b699f5168a 100644 --- a/x11-toolkits/qt5pas/Makefile +++ b/x11-toolkits/qt5pas/Makefile @@ -1,6 +1,6 @@ PORTNAME= qt5pas PORTVERSION= 2.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= LOCAL/acm/ diff --git a/x11-toolkits/qt5pas/distinfo b/x11-toolkits/qt5pas/distinfo index 0b9963087762..676d13a2346b 100644 --- a/x11-toolkits/qt5pas/distinfo +++ b/x11-toolkits/qt5pas/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1601930319 -SHA256 (qt5pas-2.6.tar.gz) = ba4094d3aa1b937f2684d5032546d1d3b1b5bb0f38f8e0d59d0423cea0fc26b5 -SIZE (qt5pas-2.6.tar.gz) = 531099 +TIMESTAMP = 1643846022 +SHA256 (qt5pas-2.6.tar.gz) = e916be3feba390d15b66039b0d98cc569c9b57a306eea416f18b662768c24bdc +SIZE (qt5pas-2.6.tar.gz) = 536398 diff --git a/x11-toolkits/qt5pas/pkg-plist b/x11-toolkits/qt5pas/pkg-plist index 803c21b42981..d8fa40fc676c 100644 --- a/x11-toolkits/qt5pas/pkg-plist +++ b/x11-toolkits/qt5pas/pkg-plist @@ -1,4 +1,4 @@ -lib/qt5/libQt5Pas.so -lib/qt5/libQt5Pas.so.1 -lib/qt5/libQt5Pas.so.1.2 -lib/qt5/libQt5Pas.so.1.2.6 +%%QT_LIBDIR%%/libQt5Pas.so +%%QT_LIBDIR%%/libQt5Pas.so.1 +%%QT_LIBDIR%%/libQt5Pas.so.1.2 +%%QT_LIBDIR%%/libQt5Pas.so.1.2.9
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202030507.21357Qi6075712>