Index: branches/2020Q3/x11-toolkits/pango/Makefile
===================================================================
--- branches/2020Q3/x11-toolkits/pango/Makefile	(revision 550179)
+++ branches/2020Q3/x11-toolkits/pango/Makefile	(revision 550180)
@@ -1,56 +1,56 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pango
 PORTVERSION=	1.42.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Open-source framework for the layout and rendering of i18n text
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	help2man:misc/help2man
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfribidi.so:converters/fribidi
 RUN_DEPENDS=	xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype \
 		${FONTENCOD}:x11-fonts/encodings
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 gettext gnome localbase meson pkgconfig tar:xz
 USE_LDCONFIG=	yes
 USE_GNOME=	cairo glib20 introspection:build
 
 VERSION=	1.8.0
 LIBVERSION=	0.4200.3
 PLIST_SUB+=     VERSION=${VERSION} LIBVERSION=${LIBVERSION}
 
 FONTSCALE=	${LOCALBASE}/share/fonts/TTF/luximb.ttf
 FONTENCOD=	${LOCALBASE}/share/fonts/encodings/encodings.dir
 
 OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	X11 DOCS
 OPTIONS_DEFAULT=X11
 
 DOCS_MESON_TRUE=	enable_docs
 DOCS_BUILD_DEPENDS=	gtk-doc>=0:textproc/gtk-doc
 
 X11_MESON_TRUE=	xft
 X11_USES=	xorg
 X11_USE=	XORG=x11,xft,xrender
 
 pre-configure:
 # .if !exists() evaluates too early before cairo has a chance to be installed
 	@if ! pkg-config --exists cairo-gobject; then \
 		${ECHO_MSG} "${PKGNAME}: Needs cairo with GLIB (GObject) support enabled."; \
 		${FALSE}; \
 	fi
 
 .include <bsd.port.mk>
Index: branches/2020Q3/x11-toolkits/pango/files/CVE-20191010238
===================================================================
--- branches/2020Q3/x11-toolkits/pango/files/CVE-20191010238	(revision 550179)
+++ branches/2020Q3/x11-toolkits/pango/files/CVE-20191010238	(nonexistent)
@@ -1,16 +0,0 @@
---- ../pango/pango-bidi-type.c.orig	2020-07-23 19:10:14.338937000 +0200
-+++ ../pango/pango-bidi-type.c	2020-07-23 19:12:15.511836000 +0200
-@@ -179,8 +179,11 @@ pango_log2vis_get_embedding_levels (const gchar    *te
-   for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++)
-     {
-       gunichar ch = g_utf8_get_char (p);
--      FriBidiCharType char_type;
--      char_type = fribidi_get_bidi_type (ch);
-+	  FriBidiCharType char_type = fribidi_get_bidi_type (ch);
-+		  
-+	  	if (i == n_chars)
-+			break;
-+
-       bidi_types[i] = char_type;
-       ored_types |= char_type;
-       if (FRIBIDI_IS_STRONG (char_type))

Property changes on: branches/2020Q3/x11-toolkits/pango/files/CVE-20191010238
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ 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: branches/2020Q3/x11-toolkits/pango/files/patch-CVE-20191010238.c
===================================================================
--- branches/2020Q3/x11-toolkits/pango/files/patch-CVE-20191010238.c	(nonexistent)
+++ branches/2020Q3/x11-toolkits/pango/files/patch-CVE-20191010238.c	(revision 550180)
@@ -0,0 +1,16 @@
+--- pango/pango-bidi-type.c.orig	2018-07-28 15:15:28 UTC
++++ pango/pango-bidi-type.c
+@@ -179,8 +179,11 @@ pango_log2vis_get_embedding_levels (const gchar    *te
+   for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++)
+     {
+       gunichar ch = g_utf8_get_char (p);
+-      FriBidiCharType char_type;
+-      char_type = fribidi_get_bidi_type (ch);
++	  FriBidiCharType char_type = fribidi_get_bidi_type (ch);
++		  
++	  	if (i == n_chars)
++			break;
++
+       bidi_types[i] = char_type;
+       ored_types |= char_type;
+       if (FRIBIDI_IS_STRONG (char_type))

Property changes on: branches/2020Q3/x11-toolkits/pango/files/patch-CVE-20191010238.c
___________________________________________________________________
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: branches/2020Q3
===================================================================
--- branches/2020Q3	(revision 550179)
+++ branches/2020Q3	(revision 550180)

Property changes on: branches/2020Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r550179