diff --git a/deskutils/calendar/Makefile b/deskutils/calendar/Makefile
index 33fe05a466b0..474a61deec49 100644
--- a/deskutils/calendar/Makefile
+++ b/deskutils/calendar/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	calendar
-DISTVERSION=	0.9.2
+DISTVERSION=	0.9.3
 CATEGORIES=	deskutils
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Port of the FreeBSD calendar program
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${LOCALBASE}/share/calendar/calendar.all:deskutils/calendar-data
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	stesser
 
 CFLAGS+=	-D_PATH_LOCALBASE='\"${LOCALBASE}\"'
 LDFLAGS+=	-lm -lutil
 
 PLIST_FILES=	bin/calendar \
 		share/man/man1/calendar.1.gz
 
 OPTIONS_DEFINE=	NLS
 NLS_CFLAGS=	-DWITH_ICONV
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/calendar ${STAGEDIR}${PREFIX}/bin
 		${INSTALL_DATA} ${WRKSRC}/calendar.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/deskutils/calendar/distinfo b/deskutils/calendar/distinfo
index 746fe68773f8..a5ac7d72c0ec 100644
--- a/deskutils/calendar/distinfo
+++ b/deskutils/calendar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623072818
-SHA256 (stesser-calendar-0.9.2_GH0.tar.gz) = 3b71fdfcc3e01e115ed61ee4454875f302593d3ddc91e606fcfb3fce5c17c492
-SIZE (stesser-calendar-0.9.2_GH0.tar.gz) = 45458
+TIMESTAMP = 1659945346
+SHA256 (stesser-calendar-0.9.3_GH0.tar.gz) = b84ff1d95f094428e888aa72172d6112fd071e4effee6e3ec490af0b40b1ff20
+SIZE (stesser-calendar-0.9.3_GH0.tar.gz) = 45480
diff --git a/java/openjdk11/files/patch-src_java.desktop_share_native_libharfbuzz_hb-ot-layout-gpos-table.hh b/java/openjdk11/files/patch-src_java.desktop_share_native_libharfbuzz_hb-ot-layout-gpos-table.hh
new file mode 100644
index 000000000000..786d03c4dd8a
--- /dev/null
+++ b/java/openjdk11/files/patch-src_java.desktop_share_native_libharfbuzz_hb-ot-layout-gpos-table.hh
@@ -0,0 +1,20 @@
+--- src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gpos-table.hh.orig	2022-07-20 05:18:35 UTC
++++ src/java.desktop/share/native/libharfbuzz/hb-ot-layout-gpos-table.hh
+@@ -1128,7 +1128,7 @@ struct PairSet
+     if (record)
+     {
+       /* Note the intentional use of "|" instead of short-circuit "||". */
+-      if (valueFormats[0].apply_value (c, this, &record->values[0], buffer->cur_pos()) |
++	    if ((int)valueFormats[0].apply_value (c, this, &record->values[0], buffer->cur_pos()) |
+           valueFormats[1].apply_value (c, this, &record->values[len1], buffer->pos[pos]))
+         buffer->unsafe_to_break (buffer->idx, pos + 1);
+       if (len2)
+@@ -1414,7 +1414,7 @@ struct PairPosFormat2
+ 
+     const Value *v = &values[record_len * (klass1 * class2Count + klass2)];
+     /* Note the intentional use of "|" instead of short-circuit "||". */
+-    if (valueFormat1.apply_value (c, this, v, buffer->cur_pos()) |
++    if ((int)valueFormat1.apply_value (c, this, v, buffer->cur_pos()) |
+         valueFormat2.apply_value (c, this, v + len1, buffer->pos[skippy_iter.idx]))
+       buffer->unsafe_to_break (buffer->idx, skippy_iter.idx + 1);
+