Index: head/deskutils/foliate/Makefile
===================================================================
--- head/deskutils/foliate/Makefile	(revision 536978)
+++ head/deskutils/foliate/Makefile	(revision 536979)
@@ -1,50 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	foliate
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	deskutils
 
 MAINTAINER=	fox@FreeBSD.org
 COMMENT=	Simple and modern GTK eBook viewer
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	appstream-util:devel/appstream-glib \
 		gjs-console:lang/gjs
 LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
 RUN_DEPENDS=	gjs-console:lang/gjs
 
 USES=		desktop-file-utils gnome localbase meson python:3.6+ shebangfix
 USE_GNOME=	cairo gtk30 introspection
 
 INSTALLS_ICONS=	yes
 
 SHEBANG_FILES=	${WRKSRC}/build-aux/meson/postinstall.py \
 		${WRKSRC}/src/assets/KindleUnpack/*.py
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	johnfactotum
 
 GLIB_SCHEMAS=	com.github.johnfactotum.Foliate.gschema.xml
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/@PYTHON_VERSION@/${PYTHON_VERSION}/g' \
 		${WRKSRC}/src/epubView.js
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/foliate
 	@${MV} ${STAGEDIR}${PREFIX}/bin/com.github.johnfactotum.Foliate \
 		${STAGEDIR}${PREFIX}/libexec/foliate/com.github.johnfactotum.Foliate
 	@${RLN} ${STAGEDIR}${PREFIX}/libexec/foliate/com.github.johnfactotum.Foliate \
 		${STAGEDIR}${PREFIX}/bin/foliate
-	@${REINPLACE_CMD} -e 's/Exec=com.github.johnfactotum.Foliate %F/Exec=foliate %F/g' \
+	@${REINPLACE_CMD} -e 's/Exec=com.github.johnfactotum.Foliate %U/Exec=foliate %U/g' \
 		${STAGEDIR}${PREFIX}/share/applications/com.github.johnfactotum.Foliate.desktop
 
 .include <bsd.port.mk>
Index: head/deskutils/foliate/distinfo
===================================================================
--- head/deskutils/foliate/distinfo	(revision 536978)
+++ head/deskutils/foliate/distinfo	(revision 536979)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586435575
-SHA256 (johnfactotum-foliate-2.1.1_GH0.tar.gz) = 6260e61886bc89b7798b9b1154daac5e0a8e17a572e8d8fea0f480ec874097cd
-SIZE (johnfactotum-foliate-2.1.1_GH0.tar.gz) = 3123638
+TIMESTAMP = 1590764134
+SHA256 (johnfactotum-foliate-2.2.0_GH0.tar.gz) = 667bf8a7205ad3b9c3359cf47a35fa80945175b30442437da7f4efffba3a5e78
+SIZE (johnfactotum-foliate-2.2.0_GH0.tar.gz) = 4293578
Index: head/deskutils/foliate/files/patch-src_epubView.js
===================================================================
--- head/deskutils/foliate/files/patch-src_epubView.js	(revision 536978)
+++ head/deskutils/foliate/files/patch-src_epubView.js	(revision 536979)
@@ -1,11 +1,13 @@
---- src/epubView.js.orig	2020-04-06 13:22:39 UTC
+Adds variable to help substitute the correct python version suffix.
+
+--- src/epubView.js.orig	2020-05-29 07:10:48 UTC
 +++ src/epubView.js
-@@ -21,7 +21,7 @@ const {
-     mimetypes, execCommand, recursivelyDeleteDir
- } = imports.utils
+@@ -36,7 +36,7 @@ var enableAnnotations = [
+     mimetypes.kindleAlias,
+ ]
  
 -const python = GLib.find_program_in_path('python') || GLib.find_program_in_path('python3')
 +const python = GLib.find_program_in_path('@PYTHON_VERSION@')
  const kindleUnpack = pkg.pkgdatadir + '/assets/KindleUnpack/kindleunpack.py'
  
  const settings = new Gio.Settings({ schema_id: pkg.name + '.view' })
Index: head/deskutils/foliate/pkg-plist
===================================================================
--- head/deskutils/foliate/pkg-plist	(revision 536978)
+++ head/deskutils/foliate/pkg-plist	(revision 536979)
@@ -1,50 +1,64 @@
 bin/foliate
 libexec/foliate/com.github.johnfactotum.Foliate
 share/applications/com.github.johnfactotum.Foliate.desktop
+share/applications/com.github.johnfactotum.Foliate.desktop.bak
 share/com.github.johnfactotum.Foliate/assets/.eslintrc.json
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/__init__.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/compatibility_utils.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/kindleunpack.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/kindleunpack.py.orig
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_cover.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_dict.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_header.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_html.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_index.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_k8proc.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_k8resc.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_nav.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_ncx.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_opf.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_pagemap.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_sectioner.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_split.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_uncompress.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_utils.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobiml2xhtml.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/unipath.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/unpack_structure.py
+share/com.github.johnfactotum.Foliate/assets/client.html
+share/com.github.johnfactotum.Foliate/assets/epub-viewer-cb.html
 share/com.github.johnfactotum.Foliate/assets/epub-viewer-nocsp.html
 share/com.github.johnfactotum.Foliate/assets/epub-viewer.css
 share/com.github.johnfactotum.Foliate/assets/epub-viewer.html
-share/com.github.johnfactotum.Foliate/assets/epub-viewer.js
-share/com.github.johnfactotum.Foliate/assets/epub.js
-share/com.github.johnfactotum.Foliate/assets/jszip.min.js
-share/com.github.johnfactotum.Foliate/assets/lookup.html
-share/com.github.johnfactotum.Foliate/assets/utils.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/LICENSE
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/README.md
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/dist/wasm-gen/libarchive.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/dist/wasm-gen/libarchive.wasm
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/dist/worker-bundle.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/package.json
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/compressed-file.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/libarchive.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/archive-reader.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/wasm-gen/libarchive.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/wasm-gen/libarchive.wasm
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/wasm-module.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/worker.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/main.js
 share/com.github.johnfactotum.Foliate/com.github.johnfactotum.Foliate.data.gresource
 share/com.github.johnfactotum.Foliate/com.github.johnfactotum.Foliate.src.gresource
 share/glib-2.0/schemas/com.github.johnfactotum.Foliate.gschema.xml
 share/icons/hicolor/scalable/apps/com.github.johnfactotum.Foliate.svg
 share/icons/hicolor/symbolic/apps/com.github.johnfactotum.Foliate-symbolic.svg
 share/locale/cs_CS/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
+share/locale/de_DE/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/es/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/fr_FR/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/id_ID/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/it/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/nl/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/pt_BR/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/ru_RU/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/sv/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
+share/locale/zh_CN/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/zh_TW/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/metainfo/com.github.johnfactotum.Foliate.appdata.xml