Index: head/misc/xiphos/Makefile
===================================================================
--- head/misc/xiphos/Makefile
+++ head/misc/xiphos/Makefile
@@ -1,9 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xiphos
-DISTVERSION=	4.1.0-72
-DISTVERSIONSUFFIX=	-g9e573336
-PORTREVISION=	2
+DISTVERSION=	4.2.1
 CATEGORIES=	misc gnome
 
 MAINTAINER=	salvadore@FreeBSD.org
@@ -21,11 +19,13 @@
 		libdbus-glib-1.so:devel/dbus-glib \
 		libenchant.so:textproc/enchant \
 		libicui18n.so:devel/icu \
+		libminizip.so:archivers/minizip \
 		libsoup-2.4.so:devel/libsoup \
 		libsword.so:misc/sword \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
+# gettext is always needed, even if NLS is off
 USES=		cmake gettext gnome pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	crosswire
@@ -37,5 +37,14 @@
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	NLS
+
+post-patch:
+# Xiphos should be normally built using either the full git repository
+# (with history) or the source packages prepared for the release, however
+# USE_GITUB does not download any of those: it downloads instead an
+# archive with the sources from the git repository without history. As a
+# result the file source_version.txt is missing: we create it manually.
+# See also: https://github.com/crosswire/xiphos/issues/1037
+	${ECHO} ${DISTVERSION} > ${WRKSRC}/cmake/source_version.txt
 
 .include <bsd.port.mk>
Index: head/misc/xiphos/distinfo
===================================================================
--- head/misc/xiphos/distinfo
+++ head/misc/xiphos/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1584113731
-SHA256 (crosswire-xiphos-4.1.0-72-g9e573336_GH0.tar.gz) = 316b41a400638dca784d53d2e0292fc693a3f61744ca488a523fe78f52fb7e09
-SIZE (crosswire-xiphos-4.1.0-72-g9e573336_GH0.tar.gz) = 28353269
+TIMESTAMP = 1590615038
+SHA256 (crosswire-xiphos-4.2.1_GH0.tar.gz) = c34323d63d2c59de2f1c0139ec6aa391534e7f7e9ebfeda2c3685678235fdf76
+SIZE (crosswire-xiphos-4.2.1_GH0.tar.gz) = 28379172
Index: head/misc/xiphos/pkg-descr
===================================================================
--- head/misc/xiphos/pkg-descr
+++ head/misc/xiphos/pkg-descr
@@ -4,4 +4,4 @@
 such as searching, biblesync, bookmarks, parallel study, and original language
 study.
 
-WWW: http://xiphos.org
+WWW: https://xiphos.org
Index: head/misc/xiphos/pkg-plist
===================================================================
--- head/misc/xiphos/pkg-plist
+++ head/misc/xiphos/pkg-plist
@@ -234,6 +234,7 @@
 share/help/it/xiphos/xiphos-90-credits.page
 share/icons/hicolor/scalable/apps/xiphos.svg
 %%NLS%%share/locale/ar/LC_MESSAGES/xiphos.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xiphos.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/xiphos.mo
 %%NLS%%share/locale/cy/LC_MESSAGES/xiphos.mo
 %%NLS%%share/locale/da/LC_MESSAGES/xiphos.mo
@@ -250,6 +251,7 @@
 %%NLS%%share/locale/ko_KR/LC_MESSAGES/xiphos.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/xiphos.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/xiphos.mo
+%%NLS%%share/locale/my/LC_MESSAGES/xiphos.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/xiphos.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/xiphos.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/xiphos.mo