Index: head/graphics/lazpaint/Makefile =================================================================== --- head/graphics/lazpaint/Makefile (revision 535208) +++ head/graphics/lazpaint/Makefile (revision 535209) @@ -1,49 +1,57 @@ # $FreeBSD$ PORTNAME= lazpaint -PORTVERSION= 7.0.7 +PORTVERSION= 7.1.2 DISTVERSIONPREFIX= v -PORTREVISION= 1 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= dos2unix fpc gnome lazarus:flavors xorg +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_ACCOUNT= bgrabitmap GH_PROJECT= lazpaint -GH_TUPLE= bgrabitmap:bgracontrols:272a141:bgracontrols/bgracontrols \ - bgrabitmap:bgrabitmap:e709548:bgrabitmap/bgrabitmapnew +GH_TUPLE= bgrabitmap:bgracontrols:a0a5a40:bgracontrols/bgracontrols \ + bgrabitmap:bgrabitmap:1ea4cb9: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}/lazpaint/release/debian/linux32/usr/share/pixmaps/${PORTNAME}.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 Index: head/graphics/lazpaint/distinfo =================================================================== --- head/graphics/lazpaint/distinfo (revision 535208) +++ head/graphics/lazpaint/distinfo (revision 535209) @@ -1,7 +1,7 @@ -TIMESTAMP = 1577767927 -SHA256 (bgrabitmap-lazpaint-v7.0.7_GH0.tar.gz) = 11aa845762ea4ad34c244479fd457bd44c11d64189811e610d37dad6779e5d07 -SIZE (bgrabitmap-lazpaint-v7.0.7_GH0.tar.gz) = 28897384 -SHA256 (bgrabitmap-bgracontrols-272a141_GH0.tar.gz) = 0e2ab6392df4f95ba267b60715d71baf0b0bd5144ad48c16396431754b05fbb1 -SIZE (bgrabitmap-bgracontrols-272a141_GH0.tar.gz) = 5553048 -SHA256 (bgrabitmap-bgrabitmap-e709548_GH0.tar.gz) = a18fb1abbc5a4dd5f57b8c6913c4d80a2767fd6944faf39bafc78f84fbf67747 -SIZE (bgrabitmap-bgrabitmap-e709548_GH0.tar.gz) = 6159285 +TIMESTAMP = 1589406976 +SHA256 (bgrabitmap-lazpaint-v7.1.2_GH0.tar.gz) = 5c49642ce60d0c4fd9028fc6089b2459776d4de159c08bbce76230822802e456 +SIZE (bgrabitmap-lazpaint-v7.1.2_GH0.tar.gz) = 30506649 +SHA256 (bgrabitmap-bgracontrols-a0a5a40_GH0.tar.gz) = dbcafcc1cf56be70a88985e2f0cbc8aa5511eec6091fdec71cd743359c22980f +SIZE (bgrabitmap-bgracontrols-a0a5a40_GH0.tar.gz) = 5553889 +SHA256 (bgrabitmap-bgrabitmap-1ea4cb9_GH0.tar.gz) = 9279f248de7adaca645cfe063ae0013a118b011e2dc13f17a557e4102a7113dc +SIZE (bgrabitmap-bgrabitmap-1ea4cb9_GH0.tar.gz) = 6655652 Index: head/graphics/lazpaint/files/patch-lazpaint_lazpainttype.pas =================================================================== --- head/graphics/lazpaint/files/patch-lazpaint_lazpainttype.pas (revision 535208) +++ head/graphics/lazpaint/files/patch-lazpaint_lazpainttype.pas (nonexistent) @@ -1,11 +0,0 @@ ---- lazpaint/lazpainttype.pas 2018-04-25 23:41:19.922862000 -0500 -+++ lazpaint/lazpainttype.pas 2018-04-25 23:41:36.179325000 -0500 -@@ -6,7 +6,7 @@ - - uses - Classes, SysUtils, Inifiles, BGRABitmap, BGRABitmapTypes, uconfig, uimage, utool, Forms, BGRALayers, Graphics, Menus, -- uscripting, Dialogs, Controls -+ uscripting, Dialogs, LazUTF8, LazFileUtils, Controls - {$IFDEF LINUX}, InterfaceBase{$ENDIF}; - - const Property changes on: head/graphics/lazpaint/files/patch-lazpaint_lazpainttype.pas ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/lazpaint/files/patch-lazpaint_utranslation.pas =================================================================== --- head/graphics/lazpaint/files/patch-lazpaint_utranslation.pas (revision 535208) +++ head/graphics/lazpaint/files/patch-lazpaint_utranslation.pas (revision 535209) @@ -1,19 +1,19 @@ ---- lazpaint/utranslation.pas 2019-12-30 23:16:40.903045000 -0500 -+++ lazpaint/utranslation.pas 2019-12-30 23:26:13.503822000 -0500 +--- lazpaint/utranslation.pas 2020-05-13 16:32:15.701490000 -0500 ++++ lazpaint/utranslation.pas 2020-05-13 16:51:08.348905000 -0500 @@ -60,10 +60,13 @@ {$ELSE} {$IFDEF DARWIN} - if DirectoryExists(GetResourcesPath+'i18n') then -- result := GetResourcesPath+'i18n'+PathDelim + if DirectoryExists(GetDarwinResourcesPath+AResource) then +- result := GetDarwinResourcesPath+AResource+PathDelim - else -+ result := GetResourcesPath+'i18n'+PathDelim; ++ result := GetDarwinResourcesPath+AResource+PathDelim; {$ENDIF} -- result:=ExtractFilePath(Application.ExeName)+'i18n'+PathDelim; +- result:=ExtractFilePath(Application.ExeName)+AResource+PathDelim; + {$IFDEF FREEBSD} -+ result:='%%DATADIR%%'+PathDelim+'i18n'+PathDelim; ++ result:='%%DATADIR%%'+PathDelim+AResource+PathDelim; + {$ELSE} -+ result:=ExtractFilePath(Application.ExeName)+'i18n'+PathDelim; ++ result:=ExtractFilePath(Application.ExeName)+AResource+PathDelim; + {$ENDIF} {$ENDIF} end; Index: head/graphics/lazpaint/pkg-plist =================================================================== --- head/graphics/lazpaint/pkg-plist (revision 535208) +++ head/graphics/lazpaint/pkg-plist (revision 535209) @@ -1,42 +1,62 @@ bin/lazpaint +share/icons/hicolor/48x48/apps/lazpaint.png %%DATADIR%%/i18n/lazpaint.ar.po +%%DATADIR%%/i18n/lazpaint.bg.po %%DATADIR%%/i18n/lazpaint.cs.po %%DATADIR%%/i18n/lazpaint.de.po %%DATADIR%%/i18n/lazpaint.es.po %%DATADIR%%/i18n/lazpaint.fi.po %%DATADIR%%/i18n/lazpaint.fr.po %%DATADIR%%/i18n/lazpaint.ja.po +%%DATADIR%%/i18n/lazpaint.kab.po %%DATADIR%%/i18n/lazpaint.lv.po %%DATADIR%%/i18n/lazpaint.nl.po %%DATADIR%%/i18n/lazpaint.po -%%DATADIR%%/i18n/lazpaint.pot %%DATADIR%%/i18n/lazpaint.pt_BR.po %%DATADIR%%/i18n/lazpaint.ru.po %%DATADIR%%/i18n/lazpaint.sv.po +%%DATADIR%%/i18n/lazpaint.zh_CN.po %%DATADIR%%/i18n/lclstrconsts.ca.po %%DATADIR%%/i18n/lclstrconsts.cs.po %%DATADIR%%/i18n/lclstrconsts.de.po %%DATADIR%%/i18n/lclstrconsts.es.po %%DATADIR%%/i18n/lclstrconsts.fi.po %%DATADIR%%/i18n/lclstrconsts.fr.po %%DATADIR%%/i18n/lclstrconsts.he.po %%DATADIR%%/i18n/lclstrconsts.id.po %%DATADIR%%/i18n/lclstrconsts.it.po +%%DATADIR%%/i18n/lclstrconsts.kab.po %%DATADIR%%/i18n/lclstrconsts.lt.po %%DATADIR%%/i18n/lclstrconsts.nl.po %%DATADIR%%/i18n/lclstrconsts.pb.po %%DATADIR%%/i18n/lclstrconsts.pl.po %%DATADIR%%/i18n/lclstrconsts.po %%DATADIR%%/i18n/lclstrconsts.ru.po %%DATADIR%%/i18n/lclstrconsts.sk.po %%DATADIR%%/i18n/lclstrconsts.tr.po %%DATADIR%%/i18n/lclstrconsts.ua.po %%DATADIR%%/i18n/lclstrconsts.zh_CN.po +%%DATADIR%%/i18n/lcresourcestring.ar.po +%%DATADIR%%/i18n/lcresourcestring.bg.po +%%DATADIR%%/i18n/lcresourcestring.cs.po +%%DATADIR%%/i18n/lcresourcestring.de.po +%%DATADIR%%/i18n/lcresourcestring.es.po +%%DATADIR%%/i18n/lcresourcestring.fi.po +%%DATADIR%%/i18n/lcresourcestring.fr.po +%%DATADIR%%/i18n/lcresourcestring.ja.po +%%DATADIR%%/i18n/lcresourcestring.kab.po +%%DATADIR%%/i18n/lcresourcestring.lv.po +%%DATADIR%%/i18n/lcresourcestring.nl.po +%%DATADIR%%/i18n/lcresourcestring.po +%%DATADIR%%/i18n/lcresourcestring.pt_BR.po +%%DATADIR%%/i18n/lcresourcestring.ru.po +%%DATADIR%%/i18n/lcresourcestring.sv.po +%%DATADIR%%/i18n/lcresourcestring.zh_CN.po %%DATADIR%%/models/cube.obj %%DATADIR%%/models/dodecahedron.obj %%DATADIR%%/models/greek_vase.jpg %%DATADIR%%/models/greek_vase.mtl %%DATADIR%%/models/greek_vase.obj %%DATADIR%%/models/table.jpg %%DATADIR%%/models/table.mtl %%DATADIR%%/models/table.obj