print/fontforge: Update to 20220308

ChangeLog:	https://github.com/fontforge/fontforge/releases/tag/20220308
PR:		268060

3 files changed, 48 insertions, 37 deletions

diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index f214217b8d5c..be1a9b95a91c 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	fontforge
-DISTVERSION=	20201107
-PORTREVISION=	3
+DISTVERSION=	20220308
 CATEGORIES=	print
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
 
@@ -46,6 +45,7 @@ FREETYPE_CMAKE_ON=	-DENABLE_FREETYPE_DEBUGGER:PATH=${WRKSRC}/freetype
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_CMAKE_BOOL=	ENABLE_LIBGIF
 
+GTK3_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 GTK3_USE=	gnome=gdkpixbuf2,gtk30
 
 JPEG_USES=	jpeg
@@ -91,7 +91,8 @@ WRITEPFM_CMAKE_BOOL=	ENABLE_WRITE_PFM
 
 X11_USES=	xorg
 X11_USE=	gnome=pango xorg=ice,sm,x11,xext,xft,xi
-X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
+X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+			libharfbuzz.so:print/harfbuzz
 X11_RUN_DEPENDS=	${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:x11-fonts/gnu-unifont
 X11_CMAKE_BOOL=	ENABLE_X11
 
diff --git a/print/fontforge/distinfo b/print/fontforge/distinfo
index 2a4474a0a601..710a0f21a962 100644
--- a/print/fontforge/distinfo
+++ b/print/fontforge/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642458860
-SHA256 (fontforge-20201107.tar.xz) = 68bcba8f602819eddc29cd356ee13fafbad7a80d19b652d354c6791343476c78
-SIZE (fontforge-20201107.tar.xz) = 14163424
+TIMESTAMP = 1669682293
+SHA256 (fontforge-20220308.tar.xz) = 01e4017f7a0ccecf436c74b8e1f6b374fc04a5283c1d68967996782e15618e59
+SIZE (fontforge-20220308.tar.xz) = 13719032
diff --git a/print/fontforge/pkg-plist b/print/fontforge/pkg-plist
index cd504ef0ae63..80477d9a6105 100644
--- a/print/fontforge/pkg-plist
+++ b/print/fontforge/pkg-plist
@@ -10,21 +10,29 @@ share/man/man1/fontforge.1.gz
 share/man/man1/fontimage.1.gz
 share/man/man1/fontlint.1.gz
 share/man/man1/sfddiff.1.gz
-%%X11%%share/applications/org.fontforge.FontForge.desktop
+share/applications/org.fontforge.FontForge.desktop
+%%DATADIR%%/cidmap/Adobe-CNS1-6.cidmap
+%%DATADIR%%/cidmap/Adobe-GB1-5.cidmap
+%%DATADIR%%/cidmap/Adobe-Identity-0.cidmap
+%%DATADIR%%/cidmap/Adobe-Japan1-5.cidmap
+%%DATADIR%%/cidmap/Adobe-Japan1-6.cidmap
+%%DATADIR%%/cidmap/Adobe-Japan1-7.cidmap
+%%DATADIR%%/cidmap/Adobe-Japan2-0.cidmap
+%%DATADIR%%/cidmap/Adobe-Korea1-2.cidmap
 %%DATADIR%%/hotkeys/default
-%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-Bold.ttf
-%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-BoldOblique.ttf
-%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-Oblique.ttf
-%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-Regular.ttf
-%%TANGO%%%%DATADIR%%/pixmaps/Inconsolata-Bold.ttf
-%%TANGO%%%%DATADIR%%/pixmaps/Inconsolata-Regular.ttf
+%%DATADIR%%/pixmaps/Cantarell-Bold.ttf
+%%DATADIR%%/pixmaps/Cantarell-BoldOblique.ttf
+%%DATADIR%%/pixmaps/Cantarell-Oblique.ttf
+%%DATADIR%%/pixmaps/Cantarell-Regular.ttf
+%%DATADIR%%/pixmaps/Inconsolata-Bold.ttf
+%%DATADIR%%/pixmaps/Inconsolata-Regular.ttf
 %%TANGO%%%%DATADIR%%/pixmaps/OFL.txt
 %%DATADIR%%/pixmaps/changeweight.png
 %%DATADIR%%/pixmaps/charviewicon.xbm
-%%TANGO%%%%DATADIR%%/pixmaps/check_off.png
-%%TANGO%%%%DATADIR%%/pixmaps/check_off_disabled.png
-%%TANGO%%%%DATADIR%%/pixmaps/check_on.png
-%%TANGO%%%%DATADIR%%/pixmaps/check_on_disabled.png
+%%DATADIR%%/pixmaps/check_off.png
+%%DATADIR%%/pixmaps/check_off_disabled.png
+%%DATADIR%%/pixmaps/check_on.png
+%%DATADIR%%/pixmaps/check_on_disabled.png
 %%DATADIR%%/pixmaps/chooseraudio.png
 %%DATADIR%%/pixmaps/chooserback.png
 %%DATADIR%%/pixmaps/chooserbookmark.png
@@ -58,7 +66,8 @@ share/man/man1/sfddiff.1.gz
 %%DATADIR%%/pixmaps/chooserupdir.png
 %%DATADIR%%/pixmaps/chooservideo.png
 %%DATADIR%%/pixmaps/colorwheel.png
-%%TANGO%%%%DATADIR%%/pixmaps/downarrow.png
+%%DATADIR%%/pixmaps/downarrow.png
+%%DATADIR%%/pixmaps/downarrow_disabled.png
 %%DATADIR%%/pixmaps/editclear.png
 %%DATADIR%%/pixmaps/editclearback.png
 %%DATADIR%%/pixmaps/editcopy.png
@@ -86,9 +95,11 @@ share/man/man1/sfddiff.1.gz
 %%DATADIR%%/pixmaps/editundo.png
 %%DATADIR%%/pixmaps/editunlink.png
 %%DATADIR%%/pixmaps/elementaddextrema.png
+%%DATADIR%%/pixmaps/elementaddinflections.png
 %%DATADIR%%/pixmaps/elementalign.png
 %%DATADIR%%/pixmaps/elementanticlock.png
 %%DATADIR%%/pixmaps/elementautotrace.png
+%%DATADIR%%/pixmaps/elementbalance.png
 %%DATADIR%%/pixmaps/elementbdfinfo.png
 %%DATADIR%%/pixmaps/elementbitmapsavail.png
 %%DATADIR%%/pixmaps/elementbuildaccent.png
@@ -102,6 +113,7 @@ share/man/man1/sfddiff.1.gz
 %%DATADIR%%/pixmaps/elementfontinfo.png
 %%DATADIR%%/pixmaps/elementgetinfo.png
 %%DATADIR%%/pixmaps/elementglyphinfo.png
+%%DATADIR%%/pixmaps/elementharmonize.png
 %%DATADIR%%/pixmaps/elementhbaselines.png
 %%DATADIR%%/pixmaps/elementinterpolatefonts.png
 %%DATADIR%%/pixmaps/elementmathinfo.png
@@ -282,11 +294,11 @@ share/man/man1/sfddiff.1.gz
 %%DATADIR%%/pixmaps/ptinfohvcurve.png
 %%DATADIR%%/pixmaps/ptinfotangent.png
 %%DATADIR%%/pixmaps/python.png
-%%TANGO%%%%DATADIR%%/pixmaps/radio_off.png
-%%TANGO%%%%DATADIR%%/pixmaps/radio_off_disabled.png
-%%TANGO%%%%DATADIR%%/pixmaps/radio_on.png
-%%TANGO%%%%DATADIR%%/pixmaps/radio_on_disabled.png
-%%TANGO%%%%DATADIR%%/pixmaps/resources
+%%DATADIR%%/pixmaps/radio_off.png
+%%DATADIR%%/pixmaps/radio_off_disabled.png
+%%DATADIR%%/pixmaps/radio_on.png
+%%DATADIR%%/pixmaps/radio_on_disabled.png
+%%DATADIR%%/pixmaps/resources
 %%DATADIR%%/pixmaps/rmoverlap.png
 %%DATADIR%%/pixmaps/rotate180.png
 %%DATADIR%%/pixmaps/rotateccw.png
@@ -368,16 +380,16 @@ share/man/man1/sfddiff.1.gz
 %%DATADIR%%/pixmaps/wireframe.png
 %%DATADIR%%/prefs
 %%PYTHON%%%%DATADIR%%/python/excepthook.py
-%%X11%%share/icons/hicolor/128x128/apps/org.fontforge.FontForge.png
-%%X11%%share/icons/hicolor/16x16/apps/org.fontforge.FontForge.png
-%%X11%%share/icons/hicolor/22x22/apps/org.fontforge.FontForge.png
-%%X11%%share/icons/hicolor/24x24/apps/org.fontforge.FontForge.png
-%%X11%%share/icons/hicolor/256x256/apps/org.fontforge.FontForge.png
-%%X11%%share/icons/hicolor/32x32/apps/org.fontforge.FontForge.png
-%%X11%%share/icons/hicolor/48x48/apps/org.fontforge.FontForge.png
-%%X11%%share/icons/hicolor/512x512/apps/org.fontforge.FontForge.png
-%%X11%%share/icons/hicolor/64x64/apps/org.fontforge.FontForge.png
-%%X11%%share/icons/hicolor/scalable/apps/org.fontforge.FontForge.svg
+share/icons/hicolor/128x128/apps/org.fontforge.FontForge.png
+share/icons/hicolor/16x16/apps/org.fontforge.FontForge.png
+share/icons/hicolor/22x22/apps/org.fontforge.FontForge.png
+share/icons/hicolor/24x24/apps/org.fontforge.FontForge.png
+share/icons/hicolor/256x256/apps/org.fontforge.FontForge.png
+share/icons/hicolor/32x32/apps/org.fontforge.FontForge.png
+share/icons/hicolor/48x48/apps/org.fontforge.FontForge.png
+share/icons/hicolor/512x512/apps/org.fontforge.FontForge.png
+share/icons/hicolor/64x64/apps/org.fontforge.FontForge.png
+share/icons/hicolor/scalable/apps/org.fontforge.FontForge.svg
 share/locale/ca/LC_MESSAGES/FontForge.mo
 share/locale/de/LC_MESSAGES/FontForge.mo
 share/locale/el/LC_MESSAGES/FontForge.mo
@@ -397,7 +409,5 @@ share/locale/uk/LC_MESSAGES/FontForge.mo
 share/locale/vi/LC_MESSAGES/FontForge.mo
 share/locale/zh_CN/LC_MESSAGES/FontForge.mo
 share/locale/zh_TW/LC_MESSAGES/FontForge.mo
-%%X11%%share/metainfo/org.fontforge.FontForge.appdata.xml
-%%X11%%share/mime/packages/fontforge.xml
-%%X11%%share/pixmaps/org.fontforge.FontForge.png
-%%X11%%share/pixmaps/org.fontforge.FontForge.xpm
+share/metainfo/org.fontforge.FontForge.appdata.xml
+share/mime/packages/fontforge.xml