Index: head/deskutils/foliate/Makefile
===================================================================
--- head/deskutils/foliate/Makefile	(revision 530917)
+++ head/deskutils/foliate/Makefile	(revision 530918)
@@ -1,47 +1,47 @@
 # $FreeBSD$
 
 PORTNAME=	foliate
-PORTVERSION=	1.5.3
+PORTVERSION=	2.0.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/main.js
+		${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
 
 .include <bsd.port.mk>
Index: head/deskutils/foliate/distinfo
===================================================================
--- head/deskutils/foliate/distinfo	(revision 530917)
+++ head/deskutils/foliate/distinfo	(revision 530918)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1570210540
-SHA256 (johnfactotum-foliate-1.5.3_GH0.tar.gz) = 95f45c0511493a3c732f9a199ddc2b5851a220d74d93e6d14976f29f243ee2d7
-SIZE (johnfactotum-foliate-1.5.3_GH0.tar.gz) = 1486573
+TIMESTAMP = 1586179297
+SHA256 (johnfactotum-foliate-2.0.0_GH0.tar.gz) = e3f7ab5242aa6d936b66d6a41147bf17c0334d7675b5e38e64829d204fd3712a
+SIZE (johnfactotum-foliate-2.0.0_GH0.tar.gz) = 3098652
Index: head/deskutils/foliate/files/patch-src_main.js
===================================================================
--- head/deskutils/foliate/files/patch-src_main.js	(revision 530917)
+++ head/deskutils/foliate/files/patch-src_main.js	(nonexistent)
@@ -1,13 +0,0 @@
-Adds variable to help substitute the correct python version suffix.
-
---- src/main.js.orig	2019-10-07 20:11:48 UTC
-+++ src/main.js
-@@ -1796,7 +1796,7 @@ class BookViewerWindow {
-     }
-     open(fileName, realFileName, inputType = 'epub') {
-         if (kindleExts.some(x => fileName.endsWith(x))) {
--            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 dir = GLib.dir_make_tmp(null)

Property changes on: head/deskutils/foliate/files/patch-src_main.js
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-on
\ 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/deskutils/foliate/files/patch-src_epubView.js
===================================================================
--- head/deskutils/foliate/files/patch-src_epubView.js	(nonexistent)
+++ head/deskutils/foliate/files/patch-src_epubView.js	(revision 530918)
@@ -0,0 +1,11 @@
+--- src/epubView.js.orig	2020-04-06 13:22:39 UTC
++++ src/epubView.js
+@@ -21,7 +21,7 @@ const {
+     mimetypes, execCommand, recursivelyDeleteDir
+ } = imports.utils
+ 
+-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' })

Property changes on: head/deskutils/foliate/files/patch-src_epubView.js
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/deskutils/foliate/pkg-plist
===================================================================
--- head/deskutils/foliate/pkg-plist	(revision 530917)
+++ head/deskutils/foliate/pkg-plist	(revision 530918)
@@ -1,45 +1,50 @@
 bin/foliate
 libexec/foliate/com.github.johnfactotum.Foliate
 share/applications/com.github.johnfactotum.Foliate.desktop
-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/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/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/viewer-nocsp.html
-share/com.github.johnfactotum.Foliate/assets/viewer.css
-share/com.github.johnfactotum.Foliate/assets/viewer.html
-share/com.github.johnfactotum.Foliate/assets/viewer.js
-share/com.github.johnfactotum.Foliate/com.github.johnfactotum.Foliate.src.gresource
+%%DATADIR%%/assets/.eslintrc.json
+%%DATADIR%%/assets/KindleUnpack/__init__.py
+%%DATADIR%%/assets/KindleUnpack/compatibility_utils.py
+%%DATADIR%%/assets/KindleUnpack/kindleunpack.py
+%%DATADIR%%/assets/KindleUnpack/kindleunpack.py.orig
+%%DATADIR%%/assets/KindleUnpack/mobi_cover.py
+%%DATADIR%%/assets/KindleUnpack/mobi_dict.py
+%%DATADIR%%/assets/KindleUnpack/mobi_header.py
+%%DATADIR%%/assets/KindleUnpack/mobi_html.py
+%%DATADIR%%/assets/KindleUnpack/mobi_index.py
+%%DATADIR%%/assets/KindleUnpack/mobi_k8proc.py
+%%DATADIR%%/assets/KindleUnpack/mobi_k8resc.py
+%%DATADIR%%/assets/KindleUnpack/mobi_nav.py
+%%DATADIR%%/assets/KindleUnpack/mobi_ncx.py
+%%DATADIR%%/assets/KindleUnpack/mobi_opf.py
+%%DATADIR%%/assets/KindleUnpack/mobi_pagemap.py
+%%DATADIR%%/assets/KindleUnpack/mobi_sectioner.py
+%%DATADIR%%/assets/KindleUnpack/mobi_split.py
+%%DATADIR%%/assets/KindleUnpack/mobi_uncompress.py
+%%DATADIR%%/assets/KindleUnpack/mobi_utils.py
+%%DATADIR%%/assets/KindleUnpack/mobiml2xhtml.py
+%%DATADIR%%/assets/KindleUnpack/unipath.py
+%%DATADIR%%/assets/KindleUnpack/unpack_structure.py
+%%DATADIR%%/assets/epub-viewer-nocsp.html
+%%DATADIR%%/assets/epub-viewer.css
+%%DATADIR%%/assets/epub-viewer.html
+%%DATADIR%%/assets/epub-viewer.js
+%%DATADIR%%/assets/epub.js
+%%DATADIR%%/assets/jszip.min.js
+%%DATADIR%%/assets/lookup.html
+%%DATADIR%%/assets/utils.js
+%%DATADIR%%/com.github.johnfactotum.Foliate.data.gresource
+%%DATADIR%%/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/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_NL/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_TW/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/metainfo/com.github.johnfactotum.Foliate.appdata.xml