WANTLIB: pcre -> pcre2-8 after recent glib2 update.

2022-11-05 17:07:21 +00:00 · 2022-11-05 17:07:21 +00:00 · 477a45da5b
parent d3aaddb10c
commit 477a45da5b
184 changed files with 394 additions and 341 deletions
--- a/net/avahi/Makefile
+++ b/net/avahi/Makefile
@ -18,12 +18,12 @@ PKGNAME-gui=		avahi-gui-${V}
 PKGNAME-libs=		avahi-libs-${V}
 PKGNAME-python=		py3-avahi-${V}

-REVISION-python=	4
-REVISION-gui=		7
-REVISION-gtk3=		3
-REVISION-main=		8
-REVISION-libs=		2
-REVISION-glib=		1
+REVISION-python=	5
+REVISION-gui=		8
+REVISION-gtk3=		4
+REVISION-main=		9
+REVISION-libs=		3
+REVISION-glib=		2

 CATEGORIES=		net devel

@ -78,7 +78,7 @@ CONFIGURE_ARGS=		--disable-mono \
 			--disable-monodoc

 WANTLIB-glib += avahi-client avahi-common dbus-1 execinfo ffi glib-2.0
-WANTLIB-glib += gobject-2.0 iconv intl pcre pthread
+WANTLIB-glib += gobject-2.0 iconv intl pcre2-8 pthread

 LIB_DEPENDS-glib=	devel/glib2 \
 			${BUILD_PKGPATH},-libs
@ -110,7 +110,7 @@ WANTLIB-gtk3 += avahi-common avahi-glib cairo cairo-gobject
 WANTLIB-gtk3 += dbus-1 expat fontconfig freetype gdbm gdk-3 gdk_pixbuf-2.0
 WANTLIB-gtk3 += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 epoxy
 WANTLIB-gtk3 += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB-gtk3 += pcre pixman-1 png pthread xcb xcb-render graphite2
+WANTLIB-gtk3 += pcre2-8 pixman-1 png pthread xcb xcb-render graphite2
 WANTLIB-gtk3 += xcb-shm z ffi iconv intl fribidi atk-bridge-2.0 harfbuzz
 WANTLIB-gtk3 += ${COMPILER_LIBCXX} execinfo jpeg Xau Xdmcp

@ -128,7 +128,7 @@ WANTLIB-gui += avahi-common avahi-core avahi-glib avahi-ui-gtk3 c
 WANTLIB-gui += cairo cairo-gobject dbus-1 expat fontconfig freetype
 WANTLIB-gui += gdbm gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB-gui += gobject-2.0 gtk-3 m pango-1.0 fribidi atk-bridge-2.0
-WANTLIB-gui += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
+WANTLIB-gui += pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png pthread
 WANTLIB-gui += xcb xcb-render xcb-shm z ffi graphite2 epoxy iconv intl
 WANTLIB-gui += ${COMPILER_LIBCXX} execinfo jpeg Xau Xdmcp

--- a/net/bitlbee-facebook/Makefile
+++ b/net/bitlbee-facebook/Makefile
@ -2,7 +2,7 @@ COMMENT=		Facebook Messenger protocol plugin for bitlbee

 V=			1.2.2
 DISTNAME=		bitlbee-facebook-$V
-REVISION=		0
+REVISION=		1

 CATEGORIES=		net

@ -12,7 +12,7 @@ HOMEPAGE=		https://github.com/bitlbee/bitlbee-facebook
 PERMIT_PACKAGE=		Yes

 WANTLIB +=		ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 iconv
-WANTLIB +=		intl json-glib-1.0 pcre pthread z
+WANTLIB +=		intl json-glib-1.0 pcre2-8 pthread z

 MASTER_SITES=		https://github.com/bitlbee/bitlbee-facebook/releases/download/v$V/

--- a/net/bitlbee-mastodon/Makefile
+++ b/net/bitlbee-mastodon/Makefile
@ -3,6 +3,7 @@ COMMENT =		mastodon plugin for Bitlbee
 GH_ACCOUNT =		kensanata
 GH_PROJECT =		bitlbee-mastodon
 GH_TAGNAME =		v1.4.3
+REVISION =		0

 CATEGORIES =		net

@ -11,7 +12,7 @@ HOMEPAGE =		https://github.com/kensanata/bitlbee-mastodon
 # Mixed: LGPLv2.1 and GPLv2+
 PERMIT_PACKAGE =	Yes

-WANTLIB += glib-2.0 iconv intl pcre pthread
+WANTLIB += glib-2.0 iconv intl pcre2-8 pthread

 USE_GMAKE =		Yes

--- a/net/castget/Makefile
+++ b/net/castget/Makefile
@ -2,6 +2,7 @@ COMMENT=		command-line podcast downloader

 DISTNAME=		castget-2.0.1
 CATEGORIES=		net
+REVISION=		0

 HOMEPAGE=		https://castget.johndal.com/

@ -14,7 +15,7 @@ MAINTAINER=		Caspar Schutijser <caspar@schutijser.com>
 # GPLv2
 PERMIT_PACKAGE=	Yes

-WANTLIB += c crypto curl glib-2.0 iconv id3 intl lzma m nghttp2 pcre pthread
+WANTLIB += c crypto curl glib-2.0 iconv id3 intl lzma m nghttp2 pcre2-8 pthread
 WANTLIB += ssl xml2 z

 COMPILER =		base-clang ports-gcc base-gcc
--- a/net/filezilla/Makefile
+++ b/net/filezilla/Makefile
@ -6,6 +6,7 @@ COMMENT=	fast FTP and SFTP GUI client with a lot of features
 V=		3.62.0
 PKGNAME=	filezilla-$V
 DISTNAME=	FileZilla_$V_src
+REVISION=	0

 SHARED_LIBS+=	fzclient-commonui-private	4.0
 SHARED_LIBS+=	fzclient-private		6.0
@ -27,7 +28,7 @@ WANTLIB +=	filezilla fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0
 WANTLIB +=	gio-2.0 glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0
 WANTLIB +=	graphite2 gthread-2.0 gtk-3 harfbuzz hogweed iconv
 WANTLIB +=	idn idn2 intl jpeg lzma m mspack nettle notify p11-kit
-WANTLIB +=	pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB +=	pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
 WANTLIB +=	png pugixml samplerate sndio sqlite3 tasn1 tiff unistring
 WANTLIB +=	usbhid wx_baseu-3.0 wx_baseu_xml-3.0 wx_gtk3u_adv-3.0
 WANTLIB +=	wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0 wx_gtk3u_html-3.0
--- a/net/librest/Makefile
+++ b/net/librest/Makefile
@ -3,7 +3,7 @@ COMMENT =	access web services that claim to be RESTful
 GNOME_VERSION =	0.8.1
 GNOME_PROJECT =	rest
 PKGNAME =	lib${DISTNAME}
-REVISION =	2
+REVISION =	3

 CATEGORIES =	net devel

@ -16,7 +16,7 @@ MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
 PERMIT_PACKAGE =	Yes

 WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB += iconv intl lzma m pcre pthread soup-2.4 soup-gnome-2.4
+WANTLIB += iconv intl lzma m pcre2-8 pthread soup-2.4 soup-gnome-2.4
 WANTLIB += sqlite3 xml2 z idn2 psl unistring brotlicommon brotlidec

 MODULES =		x11/gnome
--- a/net/loudmouth/Makefile
+++ b/net/loudmouth/Makefile
@ -2,7 +2,7 @@ COMMENT=		lightweight Jabber client library

 V=			1.4.3
 DISTNAME=       	loudmouth-$V
-REVISION=		7
+REVISION=		8
 SHARED_LIBS +=	loudmouth-1          3.0      # .1.0
 CATEGORIES=		net devel

@ -11,7 +11,7 @@ HOMEPAGE=       	http://groups.google.com/group/loudmouth-dev/
 # LGPLv2.1
 PERMIT_PACKAGE=	Yes

-WANTLIB =  crypto glib-2.0 iconv idn>=16 intl pcre pthread ssl
+WANTLIB =  crypto glib-2.0 iconv idn>=16 intl pcre2-8 pthread ssl

 MASTER_SITES=   	${MASTER_SITE_GNOME:=sources/loudmouth/${V:C/^([0-9]+\.[0-9]+).*/\1/}/}
 EXTRACT_SUFX=   	.tar.bz2
--- a/net/mcabber/Makefile
+++ b/net/mcabber/Makefile
@ -1,6 +1,7 @@
 COMMENT=		console jabber client
 DISTNAME=		mcabber-1.1.2
 CATEGORIES=		net
+REVISION=		0

 HOMEPAGE=		https://mcabber.com/

@ -10,7 +11,7 @@ MAINTAINER=		Markus Hennecke <markus-hennecke@markus-hennecke.de>
 PERMIT_PACKAGE=	Yes

 WANTLIB += assuan c crypto curses gcrypt glib-2.0 gpg-error gpgme iconv
-WANTLIB += idn intl loudmouth-1>=3 otr panel pcre pthread ssl
+WANTLIB += idn intl loudmouth-1>=3 otr panel pcre2-8 pthread ssl

 MASTER_SITES=		${HOMEPAGE}/files/
 EXTRACT_SUFX=		.tar.bz2
--- a/net/meanwhile/Makefile
+++ b/net/meanwhile/Makefile
@ -1,7 +1,7 @@
 COMMENT=	implementation of Lotus Sametime Community Client protocol

 DISTNAME=	meanwhile-1.0.2
-REVISION=	6
+REVISION=	7
 SHARED_LIBS=	meanwhile 1.2
 CATEGORIES=	devel net

@ -10,7 +10,7 @@ HOMEPAGE=	http://meanwhile.sourceforge.net/
 # GPL
 PERMIT_PACKAGE=	Yes

-WANTLIB =  glib-2.0>=800 iconv intl m pcre pthread
+WANTLIB =  glib-2.0>=800 iconv intl m pcre2-8 pthread

 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=meanwhile/}

--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@ -6,7 +6,7 @@ EXTRACT_SUFX=		.tar.bz2
 PKGSPEC=		netatalk->=3,<4
 EPOCH=			0

-REVISION=		0
+REVISION=		1

 # https://github.com/Netatalk/Netatalk/pull/174
 MASTER_SITES0=		https://src.fedoraproject.org/rpms/netatalk/raw/rawhide/f/
@ -26,7 +26,7 @@ PERMIT_PACKAGE=	Yes

 WANTLIB += avahi-client avahi-common c crypto db dbus-1 dbus-glib-1
 WANTLIB += event_core event_extra ffi gcrypt gio-2.0 glib-2.0
-WANTLIB += gobject-2.0 gpg-error gthread-2.0 iconv intl pcre pthread
+WANTLIB += gobject-2.0 gpg-error gthread-2.0 iconv intl pcre2-8 pthread
 WANTLIB += tdb execinfo

 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=netatalk/}
--- a/net/pidgin-sipe/Makefile
+++ b/net/pidgin-sipe/Makefile
@ -3,6 +3,7 @@ BROKEN-hppa =	-Werror + sip-csta.c:707: warning: cast increases required alignme
 COMMENT =		SIPE plugin for Pidgin

 DISTNAME =		pidgin-sipe-1.25.0
+REVISION =		0

 CATEGORIES =		net

@ -16,7 +17,7 @@ PERMIT_PACKAGE =	Yes
 WANTLIB += assuan crypto dbus-1 dbus-glib-1 execinfo ffi gadu
 WANTLIB += gio-2.0 glib-2.0 gmime-3.0 gmodule-2.0 gobject-2.0
 WANTLIB += gpg-error gpgme gthread-2.0 iconv idn idn2 intl lzma
-WANTLIB += m nspr4 nss3 nssutil3 pcre plc4 plds4 pthread purple
+WANTLIB += m nspr4 nss3 nssutil3 pcre2-8 plc4 plds4 pthread purple
 WANTLIB += smime3 ssl3 unistring xml2 z

 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=sipe/}
--- a/net/pidgin-window-merge/Makefile
+++ b/net/pidgin-window-merge/Makefile
@ -4,7 +4,7 @@ GH_ACCOUNT =		dm0-
 GH_PROJECT =		window_merge
 GH_COMMIT =		b4811ae1807a6c124fb06a717951bb2541be19f7
 CATEGORIES =		net
-REVISION =		3
+REVISION =		4

 # GPLv3+
 PERMIT_PACKAGE =	Yes
@ -14,7 +14,7 @@ WANTLIB += Xrender atk-1.0 cairo dbus-1 dbus-glib-1 expat ffi fontconfig
 WANTLIB += freetype fribidi gadu gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
 WANTLIB += gtk-x11-2.0 harfbuzz iconv idn intl lzma m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread purple
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png pthread purple
 WANTLIB += xcb xcb-render xcb-shm xml2 z Xau Xdmcp ${COMPILER_LIBCXX}
 WANTLIB += execinfo jpeg

--- a/net/pidgin/Makefile
+++ b/net/pidgin/Makefile
@ -3,7 +3,7 @@ COMMENT-finch=	multi-protocol instant messaging client, console client
 COMMENT-libpurple= multi-protocol instant messaging library

 VERSION=	2.14.8
-REVISION-finch= 1
+REVISION-finch= 2
 DISTNAME=	pidgin-${VERSION}
 PKGNAME-main=	pidgin-${VERSION}
 PKGNAME-finch=	finch-${VERSION}
@ -15,8 +15,8 @@ FULLPKGPATH$i= ${PKGPATH},$i${FLAVOR_EXT:S/-gtkspell//:S/-/,/g}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pidgin/}
 EXTRACT_SUFX=	.tar.bz2
-REVISION-libpurple=0
-REVISION-main=	1
+REVISION-libpurple=1
+REVISION-main=	2

 SHARED_LIBS=	jabber		0.0 \
 		purple		7.1 \
@ -33,7 +33,7 @@ COMPILER=	base-clang ports-gcc base-gcc

 WANTLIB=	c dbus-1 dbus-glib-1 execinfo ffi gadu gio-2.0 glib-2.0 \
 		gmodule-2.0 gobject-2.0 gthread-2.0 iconv idn intl lzma m \
-		pcre pthread xml2 z
+		pcre2-8 pthread xml2 z
 WANTLIB-main=	X11 ICE SM Xcomposite Xcursor Xdamage Xext Xfixes Xi \
 		Xinerama Xrandr Xrender Xss atk-1.0 cairo expat fontconfig \
 		freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0 graphite2 \
--- a/net/profanity/Makefile
+++ b/net/profanity/Makefile
@ -1,6 +1,7 @@
 COMMENT =	console based XMPP client
 DISTNAME =	profanity-0.13.1
 CATEGORIES =	net
+REVISION =	0

 HOMEPAGE =	https://profanity-im.github.io/

@ -15,7 +16,7 @@ MASTER_SITES =	https://profanity-im.github.io/tarballs/

 WANTLIB += assuan c crypto curl curses ereadline expat ffi gcrypt
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
-WANTLIB += gpgme iconv intl m nghttp2 otr pcre pthread ${MODPY_WANTLIB}
+WANTLIB += gpgme iconv intl m nghttp2 otr pcre2-8 pthread ${MODPY_WANTLIB}
 WANTLIB += qrencode signal-protocol-c sqlite3 ssl strophe util
 WANTLIB += z

--- a/net/purple-rocketchat/Makefile
+++ b/net/purple-rocketchat/Makefile
@ -6,6 +6,7 @@ GH_COMMIT=	484e5bf9c7579b681f297fea7a1fa36c91a54baf
 V =		0.20220130
 DISTNAME =	${GH_PROJECT}-$V
 CATEGORIES =	net
+REVISION =	0

 # GPLv3
 PERMIT_PACKAGE =	Yes
@ -15,7 +16,7 @@ LIB_DEPENDS =	net/pidgin,-libpurple \
 		textproc/discount>=2.2.4p0

 WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 intl json-glib-1.0
-WANTLIB += markdown pcre pthread purple z
+WANTLIB += markdown pcre2-8 pthread purple z

 USE_GMAKE =	Yes

--- a/net/seafile/libsearpc/Makefile
+++ b/net/seafile/libsearpc/Makefile
@ -5,13 +5,14 @@ GH_PROJECT =		libsearpc
 # this commit is from the "v3.2-latest" tag
 GH_COMMIT =		54145b03f4240222e336a9a2f402e93facefde65
 DISTNAME =		libsearpc-3.2.0pl20220504
+REVISION =		0

 SHARED_LIBS +=		searpc		0.0 # 1.2

 # LGPLv3
 PERMIT_PACKAGE =	Yes

-WANTLIB += ffi glib-2.0 gobject-2.0 iconv intl jansson pcre pthread
+WANTLIB += ffi glib-2.0 gobject-2.0 iconv intl jansson pcre2-8 pthread

 MODULES =		lang/python

--- a/net/seafile/seafile/Makefile
+++ b/net/seafile/seafile/Makefile
@ -5,12 +5,13 @@ GH_PROJECT =		seafile
 # this commit is from the "v8.0.8" tag
 GH_COMMIT =		f57dae37854acab74b08b0891584cb7ecb98cd18
 DISTNAME =		seafile-daemon-8.0.8pl20220706
+REVISION =		0

 SHARED_LIBS =		seafile 4.0

 WANTLIB += c crypto curl event_core event_extra event_pthreads
 WANTLIB += execinfo ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += iconv intl jansson m nghttp2 pcre pthread searpc sqlite3
+WANTLIB += iconv intl jansson m nghttp2 pcre2-8 pthread searpc sqlite3
 WANTLIB += ssl uuid z lib/inotify/inotify

 MODULES =		lang/python
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@ -1,7 +1,7 @@
 COMMENT=	Secure Internet Live Conferencing (SILC) client

 DISTNAME=	silc-client-1.1.11
-REVISION=	6
+REVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=silc/}
 EXTRACT_SUFX=	.tar.bz2
@ -14,7 +14,7 @@ MAINTAINER=	Brad Smith <brad@comstyle.com>
 PERMIT_PACKAGE=	Yes

 WANTLIB=  c crypto glib-2.0>=1000 gmodule-2.0>=1000 iconv intl curses
-WANTLIB+= pcre pthread ssl
+WANTLIB+= pcre2-8 pthread ssl

 LIB_DEPENDS+=	devel/glib2

--- a/net/telepathy/telepathy-logger/Makefile
+++ b/net/telepathy/telepathy-logger/Makefile
@ -1,7 +1,7 @@
 COMMENT=	flexible communications framework, logger component

 DISTNAME=	telepathy-logger-0.8.2
-REVISION=	8
+REVISION=	9

 SHARED_LIBS +=  telepathy-logger     4.1      # 6.0

@ -11,7 +11,7 @@ MASTER_SITES=	${MASTER_SITES_TP:=telepathy-logger/}
 EXTRACT_SUFX=	.tar.bz2

 WANTLIB =  c dbus-1 dbus-glib-1 execinfo ffi gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 iconv intl lzma m pcre pthread
+WANTLIB += gmodule-2.0 gobject-2.0 iconv intl lzma m pcre2-8 pthread
 WANTLIB += sqlite3 telepathy-glib xml2 z

 MODULES=	devel/dconf \
--- a/net/telepathy/telepathy-mission-control/Makefile
+++ b/net/telepathy/telepathy-mission-control/Makefile
@ -1,7 +1,7 @@
 COMMENT=		abstraction layer between apps and connection managers

 DISTNAME=		telepathy-mission-control-5.16.6
-REVISION=		1
+REVISION=		2

 SHARED_LIBS +=  mission-control-plugins 3.0      # 5.1

@ -10,7 +10,7 @@ HOMEPAGE=		https://telepathy.freedesktop.org/components/telepathy-mission-contro
 MASTER_SITES=		${MASTER_SITES_TP:=telepathy-mission-control/}

 WANTLIB =  c dbus-1 dbus-glib-1 execinfo ffi gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 iconv intl pcre pthread
+WANTLIB += gmodule-2.0 gobject-2.0 iconv intl pcre2-8 pthread
 WANTLIB += telepathy-glib z

 MODULES=		devel/dconf \
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@ -13,9 +13,9 @@ PKGNAME-qt=	transmission-qt-${VER}
 CATEGORIES=	net
 HOMEPAGE=	https://transmissionbt.com/
 MAINTAINER=	Josh Grosse <josh@jggimi.net>
-REVISION-gtk=	0
-REVISION-main=	0
-REVISION-qt=	0
+REVISION-gtk=	1
+REVISION-main=	1
+REVISION-qt=	1

 # GPLv2+
 PERMIT_PACKAGE=	Yes
@ -46,7 +46,7 @@ WANTLIB-gtk=	${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
 		gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
 		gobject-2.0 graphite2 gthread-2.0 gtk-3 \
 		harfbuzz pango-1.0 pangoft2-1.0 \
-		pangocairo-1.0 pixman-1 png pcre xcb \
+		pangocairo-1.0 pixman-1 png pcre2-8 xcb \
 		xcb-render xcb-shm epoxy nghttp2 iconv \
 		Xau Xdmcp execinfo jpeg ${COMPILER_LIBCXX}
 WANTLIB-qt=	${WANTLIB-common} ${MODQT_WANTLIB} \
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@ -4,6 +4,7 @@ BROKEN-hppa=	ICE on filter/pdftopdf/qpdf_pdftopdf.cc:147
 COMMENT=	OpenPrinting CUPS filters

 DISTNAME=	cups-filters-1.28.16
+REVISION=	0

 CATEGORIES=	print

@ -21,7 +22,7 @@ WANTLIB += ${COMPILER_LIBCXX} avahi-client avahi-common avahi-glib
 WANTLIB += brotlidec brotlienc c crypto cups dbus-1 execinfo exif
 WANTLIB += expat ffi fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gmp gnutls gobject-2.0 hogweed iconv idn2 intl jpeg
-WANTLIB += lcms2 lzma m nettle openjp2 p11-kit pcre png poppler
+WANTLIB += lcms2 lzma m nettle openjp2 p11-kit pcre2-8 png poppler
 WANTLIB += poppler-cpp qpdf ssl tasn1 tiff unistring z zstd

 MASTER_SITES=	https://www.openprinting.org/download/cups-filters/
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@ -10,7 +10,7 @@ SHARED_LIBS=		fontforge	4.0 \
 			gioftp		2.1 \
 			gunicode	5.1 \
 			gutils		2.1
-REVISION=		5
+REVISION=		6

 CATEGORIES=		print

@ -25,7 +25,7 @@ WANTLIB =  ${COMPILER_LIBCXX} ${MODPY_WANTLIB}
 WANTLIB += ICE SM X11 Xext Xft Xi Xrender c cairo expat ffi fontconfig
 WANTLIB += freetype fribidi gif gio-2.0 gmodule-2.0 glib-2.0
 WANTLIB += gobject-2.0 graphite2 harfbuzz iconv intl jpeg lzma m
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pangoxft-1.0 pcre
+WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pangoxft-1.0 pcre2-8
 WANTLIB += pixman-1 png pthread spiro tiff util xcb xcb-render
 WANTLIB += xcb-shm xml2 z zstd

--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@ -2,7 +2,7 @@ COMMENT=		GTK+ frontend to CUPS

 DISTNAME=		gtklp-1.3.4
 EXTRACT_SUFX=		.src.tar.gz
-REVISION=		2
+REVISION=		3

 CATEGORIES=		print sysutils x11

@ -19,7 +19,7 @@ WANTLIB += avahi-client avahi-common c cairo crypto cups dbus-1
 WANTLIB += execinfo expat ffi fontconfig freetype fribidi gdk-x11-2.0
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += graphite2 gtk-x11-2.0 harfbuzz iconv intl jpeg m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png ssl xcb
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png ssl xcb
 WANTLIB += xcb-render xcb-shm z

 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtklp/}
--- a/print/sile/Makefile
+++ b/print/sile/Makefile
@ -2,7 +2,7 @@ COMMENT =	typesetting system and improved layout engine

 V =		0.9.4
 PKGNAME =	sile-$V
-REVISION =	4
+REVISION =	5

 SHARED_LIBS +=  texpdf                    0.0 # 0.0

@ -14,7 +14,7 @@ HOMEPAGE =	http://sile-typesetter.org/
 PERMIT_PACKAGE =	Yes

 WANTLIB += ${COMPILER_LIBCXX} expat fontconfig freetype glib-2.0 graphite2
-WANTLIB += harfbuzz iconv icudata icui18n icuio icuuc intl m pcre
+WANTLIB += harfbuzz iconv icudata icui18n icuio icuuc intl m pcre2-8
 WANTLIB += png pthread z ${MODLUA_WANTLIB}

 COMPILER =		base-clang ports-gcc base-gcc
--- a/print/texlive/base/Makefile
+++ b/print/texlive/base/Makefile
@ -6,12 +6,14 @@ DISTNAME =		texlive-${DIST_V}-source
 PKGNAME =		texlive_base-${V}
 WRKDIST =		${WRKDIR}/texlive-${DIST_V}-source

-REVISION-main =		2
+REVISION-main =		3

 MULTI_PACKAGES =	-main -mktexlsr -synctex
 PKGNAME-mktexlsr =	texlive_mktexlsr-${V}
 PKGNAME-main =		${PKGNAME}
 PKGNAME-synctex =	texlive_synctex-${V}
+REVISION-mktexlsr =	0
+REVISION-synctex =	0

 DISTFILES =		${DISTNAME}${EXTRACT_SUFX} \
 			texlive-${DIST_V}-extra${EXTRACT_SUFX}
@ -26,7 +28,7 @@ WANTLIB += Xmu Xpm Xrender Xt avahi-client avahi-common c cairo
 WANTLIB += cups dbus-1 expat fontconfig freetype gd glib-2.0
 WANTLIB += graphite2 gs harfbuzz iconv icudata crypto ssl
 WANTLIB += icui18n icuio icuuc ijs intl jbig2dec jpeg kpathsea
-WANTLIB += lzma m paper pcre pixman-1 png
+WANTLIB += lzma m paper pcre2-8 pixman-1 png
 WANTLIB += tiff webp xcb xcb-render xcb-shm z zstd zzip
 WANTLIB += execinfo idn openjp2

--- a/productivity/glabels/Makefile
+++ b/productivity/glabels/Makefile
@ -2,7 +2,7 @@ COMMENT =		labels and business card designer

 GNOME_PROJECT =		glabels
 GNOME_VERSION =		3.4.1
-REVISION =		12
+REVISION =		13

 CATEGORIES =		productivity graphics

@ -25,7 +25,7 @@ WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 goa-1.0 gobject-2.0 gpg-error
 WANTLIB += graphite2 gtk-3 harfbuzz iconv icudata icui18n icuuc
 WANTLIB += idn2 iec16022 intl json-glib-1.0 lzma m nspr4 nss3
 WANTLIB += nssutil3 p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pcre pixman-1 plc4 plds4 png psl qrencode rsvg-2 secret-1
+WANTLIB += pcre2-8 pixman-1 plc4 plds4 png psl qrencode rsvg-2 secret-1
 WANTLIB += smime3 soup-2.4 sqlite3 ssl3 unistring xcb xcb-render
 WANTLIB += xcb-shm xml2 z protobuf
 WANTLIB += Xau Xdmcp boost_atomic-mt boost_chrono-mt boost_date_time-mt
--- a/productivity/grisbi/Makefile
+++ b/productivity/grisbi/Makefile
@ -1,7 +1,7 @@
 COMMENT=	personal accounting application

 DISTNAME=	grisbi-2.0.5
-REVISION=	2
+REVISION=	3

 EXTRACT_SUFX=	.tar.bz2
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=grisbi/}
@ -22,7 +22,7 @@ WANTLIB += crypto dbus-1 epoxy execinfo expat ffi fontconfig freetype
 WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 goffice-0.10 graphite2 gs gsf-1 gtk-3 harfbuzz
 WANTLIB += iconv intl jpeg lzma m ofx osp pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png rsvg-2 spectre xcb xcb-render
+WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png rsvg-2 spectre xcb xcb-render
 WANTLIB += xcb-shm xml2 xslt z zstd

 COMPILER =		base-clang ports-gcc base-gcc
--- a/productivity/rubrica2/Makefile
+++ b/productivity/rubrica2/Makefile
@ -2,7 +2,7 @@ COMMENT=	addressbook manager

 DISTNAME=	rubrica2-2.0.8
 EPOCH=		0
-REVISION=	0
+REVISION=	1

 CATEGORIES=	productivity x11

@ -19,7 +19,7 @@ WANTLIB += dbus-glib-1 execinfo expat ffi fontconfig freetype
 WANTLIB += fribidi gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glade-2.0
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
 WANTLIB += gtk-x11-2.0 harfbuzz iconv intl jpeg lzma m notify
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
 WANTLIB += png xcb xcb-render xcb-shm xml2 z Xau Xdmcp

 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rubrica.berlios/}
--- a/productivity/workrave/Makefile
+++ b/productivity/workrave/Makefile
@ -2,7 +2,7 @@ COMMENT=		RSI prevention tool

 V=			1.10.44
 DISTNAME=		workrave-${V}
-REVISION=		2
+REVISION=		3

 SHARED_LIBS +=  workrave-private-1.0 1.0      # unknown

@ -20,7 +20,7 @@ WANTLIB += epoxy expat ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0
 WANTLIB += gdkmm-3.0 gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0
 WANTLIB += gobject-2.0 graphite2 gstreamer-1.0 gthread-2.0 gtk-3
 WANTLIB += gtkmm-3.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pangomm-1.4 pcre pixman-1 png sigc-2.0
+WANTLIB += pangoft2-1.0 pangomm-1.4 pcre2-8 pixman-1 png sigc-2.0
 WANTLIB += xcb xcb-render xcb-shm z Xau Xdmcp execinfo jpeg

 MASTER_SITES=		https://github.com/rcaelers/workrave/releases/download/v${V:S/./_/g}/
--- a/security/opensc/Makefile
+++ b/security/opensc/Makefile
@ -1,7 +1,7 @@
 COMMENT=	set of libraries and utilities to access smart cards

 V=		0.22.0
-REVISION=	2
+REVISION=	3
 DISTNAME=	opensc-${V}

 SHARED_LIBS +=	opensc 7.3	# 8.0
@ -15,7 +15,7 @@ HOMEPAGE=	https://github.com/OpenSC/OpenSC/wiki
 PERMIT_PACKAGE=	Yes

 WANTLIB=	c crypto curses ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
-		iconv intl pcre pthread readline z
+		iconv intl pcre2-8 pthread readline z

 MASTER_SITES=	https://github.com/OpenSC/OpenSC/releases/download/${V}/

--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@ -1,7 +1,7 @@
 COMMENT=		framework for defining and tracking users, sessions & seats

 PKGNAME=		${DISTNAME:L}
-REVISION=		0
+REVISION=		1

 GH_TAGNAME=		1.2.4
 GH_ACCOUNT=		ConsoleKit2
@ -18,7 +18,7 @@ MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 PERMIT_PACKAGE=	Yes

 WANTLIB =  ICE SM X11 c dbus-1 drm execinfo ffi gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 iconv intl kvm pcre polkit-gobject-1
+WANTLIB += gmodule-2.0 gobject-2.0 iconv intl kvm pcre2-8 polkit-gobject-1
 WANTLIB += pthread xcb z

 USE_GMAKE=		Yes
--- a/sysutils/curlftpfs/Makefile
+++ b/sysutils/curlftpfs/Makefile
@ -2,12 +2,12 @@ COMMENT=	FUSE FTP driver

 DISTNAME=	curlftpfs-0.9.2
 CATEGORIES=	sysutils
-REVISION=	2
+REVISION=	3

 # GPLv2
 PERMIT_PACKAGE=	Yes

-WANTLIB =  c crypto curl fuse glib-2.0 iconv intl nghttp2 pcre pthread
+WANTLIB =  c crypto curl fuse glib-2.0 iconv intl nghttp2 pcre2-8 pthread
 WANTLIB += ssl z

 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=curlftpfs/}
--- a/sysutils/fprintd/Makefile
+++ b/sysutils/fprintd/Makefile
@ -2,7 +2,7 @@ COMMENT=		fingerprint scanning functionality over D-Bus

 DISTNAME=		fprintd-0.8.1
 EXTRACT_SUFX=		.tar.xz
-REVISION=		1
+REVISION=		2

 CATEGORIES=    		sysutils

@ -14,7 +14,7 @@ MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 PERMIT_PACKAGE=	Yes

 WANTLIB =  c dbus-1 dbus-glib-1 execinfo ffi fprint gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 iconv intl m pcre polkit-gobject-1
+WANTLIB += gmodule-2.0 gobject-2.0 iconv intl m pcre2-8 polkit-gobject-1
 WANTLIB += pthread

 MASTER_SITES=		https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@ -2,7 +2,7 @@ COMMENT=		graphical hard drive inspection tool (smartctl front-end)

 DISTNAME=		gsmartcontrol-1.1.3
 EXTRACT_SUFX=		.tar.bz2
-REVISION=		3
+REVISION=		4

 CATEGORIES=		sysutils x11

@ -26,7 +26,8 @@ RUN_DEPENDS=		devel/desktop-file-utils \
 			sysutils/smartmontools \
 			x11/gtk+3,-guic

-LIB_DEPENDS=		x11/gtk3mm
+LIB_DEPENDS=		devel/pcre \
+			x11/gtk3mm

 AUTOCONF_VERSION=	2.69
 AUTOMAKE_VERSION=	1.13
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@ -4,6 +4,7 @@ V =		3.38.1
 REL =		3.38.1
 DISTNAME =	syslog-ng-$V
 CATEGORIES =	sysutils
+REVISION =	0

 MAINTAINER =	Steven Mestdagh <steven@openbsd.org>

@ -13,8 +14,8 @@ HOMEPAGE =	https://syslog-ng.com/
 PERMIT_PACKAGE =		Yes

 WANTLIB += c crypto curl dbi glib-2.0 gmodule-2.0 gthread-2.0
-WANTLIB += iconv intl ivykis json-c m maxminddb nghttp2 pcre pthread
-WANTLIB += ssl z
+WANTLIB += iconv intl ivykis json-c m maxminddb nghttp2 pcre pcre2-8
+WANTLIB += pthread ssl z

 MASTER_SITES =	https://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/

@ -36,6 +37,7 @@ BUILD_DEPENDS=	devel/bison>=3.4.2
 LIB_DEPENDS =	devel/glib2 \
 		devel/json-c \
 		devel/libivykis \
+		devel/pcre \
 		databases/libdbi>=0.9.0 \
 		net/curl \
 		net/libmaxminddb
--- a/telephony/iaxclient/Makefile
+++ b/telephony/iaxclient/Makefile
@ -4,7 +4,7 @@ COMMENT-tcl=	IAX client library, tcl bindings
 DISTNAME=	iaxclient-2.1beta3
 PKGNAME-main=	${DISTNAME}
 PKGNAME-tcl=	${DISTNAME:S/iaxclient/iaxclient-tcl/}
-REVISION=	30
+REVISION=	31

 CATEGORIES=	telephony
 SHARED_LIBS=	tcliaxclient02 0.0 \
@ -34,7 +34,7 @@ WANTLIB-tcl	+= Xi Xinerama Xrandr Xrender atk-1.0 c cairo
 WANTLIB-tcl	+= expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
 WANTLIB-tcl	+= gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
 WANTLIB-tcl	+= gtk-x11-2.0 iaxclient iconv intl pango-1.0 pangocairo-1.0
-WANTLIB-tcl	+= pangoft2-1.0 pcre pixman-1 png xcb xcb-render
+WANTLIB-tcl	+= pangoft2-1.0 pcre2-8 pixman-1 png xcb xcb-render
 WANTLIB-tcl	+= graphite2 harfbuzz vorbis fribidi
 WANTLIB-tcl	+= xcb-shm ffi ${cWANTLIB} Xau Xdmcp jpeg ${COMPILER_LIBCXX}

--- a/telephony/sofia-sip/Makefile
+++ b/telephony/sofia-sip/Makefile
@ -3,7 +3,7 @@ COMMENT=	open source SIP User-Agent library
 DISTNAME=	sofia-sip-1.12.11
 SHARED_LIBS +=  sofia-sip-ua-glib         0.0 # 3.0
 SHARED_LIBS +=  sofia-sip-ua              0.0 # 6.0
-REVISION=	1
+REVISION=	2

 API=		1.12

@ -14,7 +14,7 @@ HOMEPAGE=	http://sofia-sip.sourceforge.net/
 # LGPLv2.1
 PERMIT_PACKAGE=	Yes

-WANTLIB =  c crypto glib-2.0 iconv intl pcre pthread ssl
+WANTLIB =  c crypto glib-2.0 iconv intl pcre2-8 pthread ssl

 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sofia-sip/}

--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@ -6,7 +6,7 @@ V=			1.6.1
 GH_ACCOUNT=		AbiWord
 GH_PROJECT=		enchant
 GH_TAGNAME=		enchant-${V:S/./-/g}
-REVISION=		3
+REVISION=		4

 # XXX needed for portroach (DISTNAME must match the GH_PROJECT-GH_TAGNAME)
 MASTER_SITES=		https://github.com/AbiWord/enchant/releases/download/${GH_PROJECT}-${V:S/./-/g}/
@ -25,7 +25,7 @@ MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 PERMIT_PACKAGE=	Yes

 WANTLIB += aspell c curses glib-2.0 gmodule-2.0 hunspell-1.7 iconv intl
-WANTLIB += m pcre pthread ${LIBCXX}
+WANTLIB += m pcre2-8 pthread ${LIBCXX}

 # c++11
 COMPILER =		base-clang ports-gcc
--- a/textproc/enchant2/Makefile
+++ b/textproc/enchant2/Makefile
@ -3,6 +3,7 @@ COMMENT=		generic spell checking library
 V=			2.3.3
 DISTNAME=		enchant-${V}
 PKGNAME=		enchant2-${V}
+REVISION=		0

 SHARED_LIBS +=  enchant-2            0.1      # 5.3

@ -16,7 +17,7 @@ MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 PERMIT_PACKAGE=	Yes

 WANTLIB += ${COMPILER_LIBCXX} aspell c curses glib-2.0 gmodule-2.0
-WANTLIB += hunspell-1.7 iconv intl m pcre
+WANTLIB += hunspell-1.7 iconv intl m pcre2-8

 MASTER_SITES =		https://github.com/AbiWord/enchant/releases/download/v${V}/

--- a/textproc/gspell/Makefile
+++ b/textproc/gspell/Makefile
@ -2,6 +2,7 @@ COMMENT=		spell-checking library for GTK+

 GNOME_PROJECT=		gspell
 GNOME_VERSION=		1.12.0
+REVISION=		0

 CATEGORIES=		textproc

@ -18,7 +19,7 @@ WANTLIB += atk-1.0 atk-bridge-2.0 c cairo cairo-gobject enchant-2
 WANTLIB += epoxy execinfo expat ffi fontconfig freetype fribidi
 WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += graphite2 gtk-3 harfbuzz iconv icudata icuuc intl jpeg
-WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
 WANTLIB += png xcb xcb-render xcb-shm z

 MODULES=		x11/gnome
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@ -5,7 +5,7 @@ DISTNAME=	gtkspell-2.0.16

 SHARED_LIBS=	gtkspell 1.0 # .0.0

-REVISION=	14
+REVISION=	15

 CATEGORIES=	textproc x11

@ -21,7 +21,7 @@ WANTLIB += Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo drm enchant
 WANTLIB += expat ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
 WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread ${COMPILER_LIBCXX}
+WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png pthread ${COMPILER_LIBCXX}
 WANTLIB += xcb xcb-render xcb-shm z fribidi jpeg

 COMPILER =		base-clang ports-gcc base-gcc
--- a/textproc/gtkspell3/Makefile
+++ b/textproc/gtkspell3/Makefile
@ -3,7 +3,7 @@ COMMENT=	gtk+3 spelling checker
 DISTNAME=	gtkspell3-3.0.10
 EXTRACT_SUFX=	.tar.xz

-REVISION=	0
+REVISION=	1

 SHARED_LIBS +=  gtkspell3-3          0.3      # 2.0

@ -22,7 +22,7 @@ WANTLIB += cairo cairo-gobject dbus-1 enchant-2 epoxy expat ffi
 WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
 WANTLIB += gtk-3 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread xcb xcb-render
+WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png pthread xcb xcb-render
 WANTLIB += xcb-shm z Xau Xdmcp c++ c++abi execinfo jpeg

 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtkspell/}
--- a/textproc/libtranslate/Makefile
+++ b/textproc/libtranslate/Makefile
@ -3,7 +3,7 @@ SHARED_LIBS +=  translate                 0.0 # 0.0
 COMMENT=	library/CLI tool interfacing to online translation services

 DISTNAME=	libtranslate-0.99
-REVISION=	7
+REVISION=	8

 CATEGORIES=	textproc

@ -13,7 +13,7 @@ HOMEPAGE=	http://www.nongnu.org/libtranslate/
 PERMIT_PACKAGE=	Yes

 WANTLIB =  c ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB += iconv intl lzma m pcre pthread soup-2.4 sqlite3 xml2 z
+WANTLIB += iconv intl lzma m pcre2-8 pthread soup-2.4 sqlite3 xml2 z
 WANTLIB += brotlicommon brotlidec idn2 psl unistring

 MASTER_SITES=	${MASTER_SITE_SAVANNAH:=libtranslate/}
--- a/textproc/libwpd/Makefile
+++ b/textproc/libwpd/Makefile
@ -3,7 +3,7 @@ COMMENT=	import and export WordPerfect(tm) documents
 DISTNAME=	libwpd-0.8.9
 CATEGORIES=	textproc

-REVISION=	12
+REVISION=	13

 SHARED_LIBS=	wpd-0.8		8.9 \
 		wpd-stream-0.8	8.9
@ -16,7 +16,7 @@ MAINTAINER=	Robert Nagy <robert@openbsd.org>
 PERMIT_PACKAGE=	Yes

 WANTLIB += bz2 c ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gsf-1
-WANTLIB += gthread-2.0 iconv intl lzma m pcre pthread ${COMPILER_LIBCXX} xml2 z
+WANTLIB += gthread-2.0 iconv intl lzma m pcre2-8 pthread ${COMPILER_LIBCXX} xml2 z

 COMPILER =		base-clang ports-gcc base-gcc

--- a/textproc/ots/Makefile
+++ b/textproc/ots/Makefile
@ -2,7 +2,7 @@ COMMENT=	open source tool for summarizing texts
 DISTNAME=	ots-0.5.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libots/}
-REVISION=	2
+REVISION=	3

 SHARED_LIBS +=  ots-1                5.0      # 5.0

@ -11,7 +11,7 @@ HOMEPAGE=	http://libots.sourceforge.net/
 # GPLv2+
 PERMIT_PACKAGE=	Yes

-WANTLIB =  c glib-2.0 iconv intl lzma m pcre popt pthread xml2 z
+WANTLIB =  c glib-2.0 iconv intl lzma m pcre2-8 popt pthread xml2 z

 LIB_DEPENDS=	devel/glib2 \
 		devel/popt \
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@ -9,6 +9,7 @@ COMMENT=		Chromium browser
 V=			107.0.5304.87

 DISTNAME=		chromium-${V}
+REVISION=		0

 DISTFILES+=		${CHROMIUM_DISTFILES} \
 			${PROFILE_DISTFILES}:0 \
@ -58,7 +59,7 @@ WANTLIB+=	fontconfig freetype fribidi gbm gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB+=	gobject-2.0 graphite2 gthread-2.0 harfbuzz harfbuzz-gobject
 WANTLIB+=	harfbuzz-subset iconv icudata icui18n icuuc intl jpeg kvm lzo2 m
 WANTLIB+=	nspr4 nss3 nssutil3 openh264 pango-1.0 pangocairo-1.0
-WANTLIB+=	pangoft2-1.0 pcre pixman-1 plc4 plds4 png pthread pthread smime3
+WANTLIB+=	pangoft2-1.0 pcre2-8 pixman-1 plc4 plds4 png pthread pthread smime3
 WANTLIB+=	snappy sndio usbhid util xcb xcb-render xcb-shm xkbcommon xml2
 WANTLIB+=	xshmfence xslt z

--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@ -15,6 +15,7 @@ V=			2022.10.106.1
 DISTNAME=		iridium-browser-${V}
 PKGNAME=		iridium-${V}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
+REVISION=		0

 PATCHFILES=		disable-privacy-sandbox.patch:0
 PATCH_DIST_STRIP=	-p1
@ -55,7 +56,7 @@ WANTLIB+=	fontconfig freetype fribidi gbm gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB+=	gobject-2.0 graphite2 gthread-2.0 harfbuzz harfbuzz-gobject
 WANTLIB+=	harfbuzz-subset iconv icudata icui18n icuuc intl jpeg kvm lzo2 m
 WANTLIB+=	nspr4 nss3 nssutil3 openh264 pango-1.0 pangocairo-1.0
-WANTLIB+=	pangoft2-1.0 pcre pixman-1 plc4 plds4 png pthread pthread smime3
+WANTLIB+=	pangoft2-1.0 pcre2-8 pixman-1 plc4 plds4 png pthread pthread smime3
 WANTLIB+=	snappy sndio usbhid util xcb xcb-render xcb-shm xkbcommon xml2
 WANTLIB+=	xshmfence xslt z

--- a/www/libcroco/Makefile
+++ b/www/libcroco/Makefile
@ -4,7 +4,7 @@ COMMENT=		generic CSS parsing library for GNOME project

 GNOME_PROJECT=		libcroco
 GNOME_VERSION=		0.6.13
-REVISION=		0
+REVISION=		1

 SHARED_LIBS +=  croco-0.6            4.0      # 3.1

@ -17,7 +17,7 @@ MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 # LGPLv2.1
 PERMIT_PACKAGE=	Yes

-WANTLIB += c glib-2.0 iconv intl lzma m pcre pthread xml2 z
+WANTLIB += c glib-2.0 iconv intl lzma m pcre2-8 pthread xml2 z

 MODULES=		x11/gnome

--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@ -2,7 +2,7 @@ COMMENT=		simple GTK desktop news aggregator

 V=			1.12.9
 DISTNAME=		liferea-${V}
-REVISION=		3
+REVISION=		4

 CATEGORIES=		www news x11

@ -24,7 +24,7 @@ WANTLIB += gstreamer-1.0 gsttag-1.0 gstvideo-1.0 gthread-2.0 gtk-3
 WANTLIB += harfbuzz harfbuzz-icu hyphen iconv icudata icui18n
 WANTLIB += icuuc idn2 intl javascriptcoregtk-4.0 jpeg json-glib-1.0
 WANTLIB += lzma m notify openjp2 orc-0.4 pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre peas-1.0 peas-gtk-1.0 pixman-1 png
+WANTLIB += pangoft2-1.0 pcre2-8 peas-1.0 peas-gtk-1.0 pixman-1 png
 WANTLIB += psl secret-1 soup-2.4 sqlite3 tasn1 unistring webkit2gtk-4.0
 WANTLIB += webp webpdemux woff2common woff2dec xcb xcb-dri2 xcb-dri3
 WANTLIB += xcb-glx xcb-present xcb-render xcb-shm xcb-sync xcb-xfixes
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@ -11,6 +11,7 @@ V=			107.0.5304.87
 UGV=			${V}-1

 DISTNAME=		ungoogled-chromium-${V}
+REVISION=		0

 DISTFILES+=		${CHROMIUM_DISTFILES} \
 			${UGOOGLE_DISTFILES}:0 \
@ -60,7 +61,7 @@ WANTLIB+=	fontconfig freetype fribidi gbm gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB+=	gobject-2.0 graphite2 gthread-2.0 harfbuzz harfbuzz-gobject
 WANTLIB+=	harfbuzz-subset iconv icudata icui18n icuuc intl jpeg kvm lzo2 m
 WANTLIB+=	nspr4 nss3 nssutil3 openh264 pango-1.0 pangocairo-1.0
-WANTLIB+=	pangoft2-1.0 pcre pixman-1 plc4 plds4 png pthread pthread smime3
+WANTLIB+=	pangoft2-1.0 pcre2-8 pixman-1 plc4 plds4 png pthread pthread smime3
 WANTLIB+=	snappy sndio usbhid util xcb xcb-render xcb-shm xkbcommon xml2
 WANTLIB+=	xshmfence xslt z

--- a/x11/dbus-glib/Makefile
+++ b/x11/dbus-glib/Makefile
@ -2,7 +2,7 @@ COMMENT=		glib bindings for dbus message system

 DISTNAME=		dbus-glib-0.112
 EPOCH=			0
-REVISION=		0
+REVISION=		1

 SHARED_LIBS +=  dbus-glib-1          5.0      # 5.4

@ -16,7 +16,7 @@ MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 PERMIT_PACKAGE=	Yes

 WANTLIB =  c dbus-1 execinfo expat ffi gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 iconv intl pcre pthread z
+WANTLIB += gobject-2.0 iconv intl pcre2-8 pthread z

 MASTER_SITES=		https://dbus.freedesktop.org/releases/dbus-glib/

--- a/x11/enlightenment/Makefile
+++ b/x11/enlightenment/Makefile
@ -5,6 +5,7 @@ DISTNAME=	e16-$V
 PKGNAME=	enlightenment-$V
 DOCS=		e16-docs-0.16.8.0.2
 THEMES=		e16-themes-1.0.2
+REVISION=	0

 CATEGORIES=	x11

@ -17,7 +18,7 @@ WANTLIB =  FLAC ICE Imlib2 SM X11 Xcomposite Xdamage Xext Xfixes Xft
 WANTLIB += Xinerama Xrandr Xrender audiofile c expat ffi fontconfig
 WANTLIB += freetype fribidi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
 WANTLIB += harfbuzz iconv intl m ogg pango-1.0 pangoft2-1.0
-WANTLIB += pangoxft-1.0 pcre pthread sndio xcb z ${COMPILER_LIBCXX}
+WANTLIB += pangoxft-1.0 pcre2-8 pthread sndio xcb z ${COMPILER_LIBCXX}

 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=enlightenment/}

--- a/x11/fsv/Makefile
+++ b/x11/fsv/Makefile
@ -8,7 +8,7 @@ V=			1.1.0
 DISTNAME=		fsv2-$V
 PKGNAME=		fsv-$V
 CATEGORIES=		x11
-REVISION=		5
+REVISION=		6

 SHARED_LIBS +=	fsvui                     0.0 # 0.0

@ -24,7 +24,7 @@ WANTLIB += ffi fontconfig freetype ftgl gdk-x11-2.0 gdk_pixbuf-2.0
 WANTLIB += gdkmm-2.4 gio-2.0 giomm-2.4 glapi glib-2.0 glibmm-2.4
 WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0
 WANTLIB += gtkgl-2.0 gtkmm-2.4 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pangomm-1.4 pcre pixman-1 png pthread xshmfence
+WANTLIB += pangoft2-1.0 pangomm-1.4 pcre2-8 pixman-1 png pthread xshmfence
 WANTLIB += sigc-2.0 ${LIBCXX} xcb xcb-dri2 xcb-glx xcb-sync xcb-xfixes
 WANTLIB += xcb-render xcb-shm z fribidi jpeg xcb-dri3 xcb-present

--- a/x11/gcolor2/Makefile
+++ b/x11/gcolor2/Makefile
@ -1,7 +1,7 @@
 COMMENT =		color selector in GTK2

 DISTNAME =		gcolor2-0.4
-REVISION =		9
+REVISION =		10
 CATEGORIES =		x11

 HOMEPAGE =		http://gcolor2.sourceforge.net/
@ -15,7 +15,7 @@ WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender atk-1.0 c cairo expat ffi fontconfig freetype fribidi
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz iconv
-WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
 WANTLIB += png pthread xcb xcb-render xcb-shm z Xau Xdmcp jpeg
 WANTLIB += ${COMPILER_LIBCXX}

--- a/x11/gmtk/Makefile
+++ b/x11/gmtk/Makefile
@ -1,7 +1,7 @@
 COMMENT =	gnome-mplayer toolkit
 DISTNAME =	gmtk-1.0.9
 EPOCH =		0
-REVISION =	7
+REVISION =	8

 SHARED_LIBS =	gmlib	2.0 \
 		gmtk	2.0
@ -18,7 +18,7 @@ WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi cairo
 WANTLIB += cairo-gobject dbus-1 epoxy expat ffi fontconfig freetype
 WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz iconv intl m
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png
+WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png
 WANTLIB += pthread xcb xcb-render xcb-shm z Xau Xdmcp execinfo jpeg
 WANTLIB += ${COMPILER_LIBCXX}

--- a/x11/gnome/builder/Makefile
+++ b/x11/gnome/builder/Makefile
@ -5,7 +5,7 @@ COMMENT=		IDE for GNOME

 GNOME_PROJECT=		gnome-builder
 GNOME_VERSION=		42.1
-REVISION=		0
+REVISION=		1

 CATEGORIES=		devel

@ -46,6 +46,7 @@ LIB_DEPENDS=		devel/glade \
 			devel/libgit2/libgit2-glib \
 			devel/libpeas \
 			devel/llvm \
+			devel/pcre \
 			devel/template-glib \
 			devel/vte3 \
 			textproc/cmark \
--- a/x11/gnome/caribou/Makefile
+++ b/x11/gnome/caribou/Makefile
@ -7,8 +7,8 @@ GNOME_VERSION=		0.4.21
 PKGNAME-main=		caribou-${GNOME_VERSION}
 PKGNAME-gtk2=		caribou-gtk2-${GNOME_VERSION}

-REVISION-main=		10
-REVISION-gtk2=		2
+REVISION-main=		11
+REVISION-gtk2=		3

 SHARED_LIBS +=  caribou              0.0      # 0.0

@ -21,7 +21,7 @@ WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
 WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo expat
 WANTLIB += ffi fontconfig freetype fribidi gdk_pixbuf-2.0 gio-2.0
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 harfbuzz iconv
-WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
 WANTLIB += png xcb xcb-render xcb-shm z jpeg Xau Xdmcp

 WANTLIB-main += ${WANTLIB}
--- a/x11/gnome/gdl/Makefile
+++ b/x11/gnome/gdl/Makefile
@ -2,7 +2,7 @@ COMMENT=		GNOME Docking Library

 GNOME_PROJECT=		gdl
 GNOME_VERSION=		3.40.0
-REVISION=		1
+REVISION=		2

 SHARED_LIBS +=  gdl-3                3.1      # 5.9

@ -15,7 +15,7 @@ WANTLIB += cairo cairo-gobject epoxy execinfo expat ffi fontconfig
 WANTLIB += freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gtk-3 harfbuzz iconv
 WANTLIB += intl jpeg lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pcre pixman-1 png xcb xcb-render xcb-shm xml2 z Xau Xdmcp
+WANTLIB += pcre2-8 pixman-1 png xcb xcb-render xcb-shm xml2 z Xau Xdmcp

 MODULES=		x11/gnome

--- a/x11/gnome/gfbgraph/Makefile
+++ b/x11/gnome/gfbgraph/Makefile
@ -3,7 +3,7 @@ COMMENT=		GObject library for Facebook Graph API
 GNOME_PROJECT=		gfbgraph
 GNOME_VERSION=		0.2.5
 PKGNAME=		lib${GNOME_PROJECT}-${GNOME_VERSION}
-REVISION=		0
+REVISION=		1

 SHARED_LIBS +=  gfbgraph-0.2         1.0      # unknown

@ -14,7 +14,7 @@ PERMIT_PACKAGE=		Yes

 WANTLIB += brotlicommon brotlidec ffi gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += goa-1.0 gobject-2.0 gthread-2.0 iconv idn2 intl json-glib-1.0
-WANTLIB += lzma m pcre psl pthread rest-0.7 soup-2.4 soup-gnome-2.4
+WANTLIB += lzma m pcre2-8 psl pthread rest-0.7 soup-2.4 soup-gnome-2.4
 WANTLIB += sqlite3 unistring xml2 z

 MODULES=		x11/gnome
--- a/x11/gnome/keyring/Makefile
+++ b/x11/gnome/keyring/Makefile
@ -10,7 +10,7 @@ COMMENT=		password agent for the GNOME project

 GNOME_PROJECT=		gnome-keyring
 GNOME_VERSION=		42.1
-REVISION=		0
+REVISION=		1

 # GPLv2/LGPLv2
 PERMIT_PACKAGE=		Yes
@ -22,7 +22,7 @@ WANTLIB += expat ffi fontconfig freetype fribidi gck-1 gcr-base-3
 WANTLIB += gcr-ui-3 gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 gpg-error graphite2 gtk-3 harfbuzz
 WANTLIB += iconv intl jpeg m p11-kit pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png xcb xcb-render xcb-shm
+WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png xcb xcb-render xcb-shm
 WANTLIB += z

 MODULES=		devel/dconf \
--- a/x11/gnome/libcryptui/Makefile
+++ b/x11/gnome/libcryptui/Makefile
@ -2,7 +2,7 @@ COMMENT=	interface components for OpenPGP

 GNOME_PROJECT=	libcryptui
 GNOME_VERSION=	3.12.2
-REVISION=	12
+REVISION=	13

 SHARED_LIBS +=  cryptui              2.0      # 0.0

@ -19,7 +19,7 @@ WANTLIB += freetype fribidi gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0
 WANTLIB += glib-2.0 gmodule-2.0 gnome-keyring gobject-2.0 gpg-error
 WANTLIB += gpgme graphite2 gthread-2.0 gtk-3 harfbuzz iconv intl
 WANTLIB += jpeg m notify pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pcre pixman-1 png xcb xcb-render xcb-shm z
+WANTLIB += pcre2-8 pixman-1 png xcb xcb-render xcb-shm z

 MODULES=	x11/gnome \
 		devel/dconf
--- a/x11/gnome/libdmapsharing/Makefile
+++ b/x11/gnome/libdmapsharing/Makefile
@ -2,7 +2,7 @@ COMMENT=		DMAP client and server library

 GNOME_PROJECT=		libdmapsharing
 GNOME_VERSION=		2.9.41
-REVISION=		1
+REVISION=		2

 # override gnome MODULE
 MASTER_SITES=		https://www.flyn.org/projects/libdmapsharing/
@ -18,7 +18,7 @@ PERMIT_PACKAGE=		Yes
 WANTLIB += avahi-client avahi-common avahi-glib brotlicommon brotlidec
 WANTLIB += dbus-1 execinfo ffi gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 gstapp-1.0 gstbase-1.0 gstreamer-1.0
-WANTLIB += gthread-2.0 iconv idn2 intl jpeg lzma m pcre png psl
+WANTLIB += gthread-2.0 iconv idn2 intl jpeg lzma m pcre2-8 png psl
 WANTLIB += pthread soup-2.4 sqlite3 unistring xml2 z

 MODULES=		x11/gnome
--- a/x11/gnome/libdmapsharing4/Makefile
+++ b/x11/gnome/libdmapsharing4/Makefile
@ -3,7 +3,7 @@ COMMENT=		DMAP client and server library
 GNOME_PROJECT=		libdmapsharing
 GNOME_VERSION=		3.9.10
 PKGNAME=		${GNOME_PROJECT}4-${GNOME_VERSION}
-REVISION=		0
+REVISION=		1

 # override gnome MODULE
 MASTER_SITES=		https://www.flyn.org/projects/libdmapsharing/
@ -19,7 +19,7 @@ PERMIT_PACKAGE=		Yes
 WANTLIB += avahi-client avahi-common avahi-glib brotlicommon brotlidec
 WANTLIB += dbus-1 execinfo ffi gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 gstapp-1.0 gstbase-1.0 gstreamer-1.0
-WANTLIB += gthread-2.0 iconv idn2 intl jpeg lzma m pcre png psl
+WANTLIB += gthread-2.0 iconv idn2 intl jpeg lzma m pcre2-8 png psl
 WANTLIB += pthread soup-2.4 sqlite3 unistring xml2 z

 MODULES=		x11/gnome
--- a/x11/gnome/libgnome-keyring/Makefile
+++ b/x11/gnome/libgnome-keyring/Makefile
@ -2,7 +2,7 @@ COMMENT=	library for gnome keyring integration

 GNOME_PROJECT=	libgnome-keyring
 GNOME_VERSION=	3.12.0
-REVISION=	10
+REVISION=	11

 SHARED_LIBS +=  gnome-keyring        7.0      # 2.0

@ -10,7 +10,7 @@ SHARED_LIBS +=  gnome-keyring        7.0      # 2.0
 PERMIT_PACKAGE=	Yes

 WANTLIB =  dbus-1 execinfo ffi gcrypt glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gpg-error iconv intl pcre pthread
+WANTLIB += gpg-error iconv intl pcre2-8 pthread

 MODULES=	x11/gnome

--- a/x11/gnome/libgnomecanvas/Makefile
+++ b/x11/gnome/libgnomecanvas/Makefile
@ -2,7 +2,7 @@ COMMENT=	graphics library for GNOME

 GNOME_PROJECT=	libgnomecanvas
 GNOME_VERSION=	2.30.3
-REVISION=	10
+REVISION=	11

 EXTRACT_SUFX=	.tar.bz2

@ -18,7 +18,7 @@ WANTLIB+= Xrender art_lgpl_2 atk-1.0 cairo expat ffi fontconfig freetype
 WANTLIB+= fribidi gailutil gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glade-2.0
 WANTLIB+= glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
 WANTLIB+= gtk-x11-2.0 harfbuzz iconv intl lzma m pango-1.0
-WANTLIB+= pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread xcb
+WANTLIB+= pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png pthread xcb
 WANTLIB+= xcb-render xcb-shm xml2 z Xau Xdmcp jpeg
 WANTLIB+= ${COMPILER_LIBCXX}

--- a/x11/gnome/librsvg/Makefile
+++ b/x11/gnome/librsvg/Makefile
@ -15,7 +15,7 @@ DEBUG_PACKAGES=		${BUILD_PACKAGES}

 ### stable
 .if ${PROPERTIES:Mrust}
-REVISION=		1
+REVISION=		2
 SHARED_LIBS +=  rsvg-2               41.0     # 50.0
 GNOME_VERSION=		${STABLE_VERSION}
 MODULES +=		lang/python
@ -31,12 +31,12 @@ MAKE_FLAGS +=		V=1
 WANTLIB += ${COMPILER_LIBCXX} Xau Xdmcp cairo-gobject jpeg
 .else
 ### old
-REVISION=		4
+REVISION=		5
 SHARED_LIBS +=  rsvg-2               38.2     # 42.20
 GNOME_VERSION=		${OLD_VERSION}
 PATCH_LIST=		old-patch-*
 PKG_ARGS=		-Dold=1 -Dstable=0
-WANTLIB += ${COMPILER_LIBCXX} croco-0.6 ffi gmodule-2.0 jpeg pcre Xau Xdmcp
+WANTLIB += ${COMPILER_LIBCXX} croco-0.6 ffi gmodule-2.0 jpeg pcre2-8 Xau Xdmcp
 LIB_DEPENDS +=		www/libcroco
 CONFIGURE_ARGS +=	--disable-tools
 .endif
@ -49,7 +49,7 @@ PERMIT_PACKAGE=		Yes
 WANTLIB += X11 Xext Xrender c cairo expat ffi fontconfig
 WANTLIB += freetype fribidi gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 graphite2 harfbuzz iconv
-WANTLIB += intl lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
+WANTLIB += intl lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8
 WANTLIB += pixman-1 png pthread xcb xcb-render xcb-shm xml2 z

 MODULES +=		x11/gnome
--- a/x11/gnome/libxklavier/Makefile
+++ b/x11/gnome/libxklavier/Makefile
@ -3,7 +3,7 @@ COMMENT=		utility library for XKB
 GNOME_PROJECT=		libxklavier
 GNOME_VERSION=		5.4
 EXTRACT_SUFX=		.tar.bz2
-REVISION=		0
+REVISION=		1

 SHARED_LIBS +=  xklavier             17.1     # .20.0

@ -13,7 +13,7 @@ MASTER_SITES=	https://people.freedesktop.org/~svu/
 # LGPLv2
 PERMIT_PACKAGE=		Yes

-WANTLIB += X11 Xext Xi ffi glib-2.0 gobject-2.0 lzma m pcre
+WANTLIB += X11 Xext Xi ffi glib-2.0 gobject-2.0 lzma m pcre2-8
 WANTLIB += pthread xcb xkbfile xml2 z iconv intl

 MODULES=		x11/gnome
--- a/x11/gnome/libzapojit/Makefile
+++ b/x11/gnome/libzapojit/Makefile
@ -2,7 +2,7 @@ COMMENT=	GLib/GObject wrapper for SkyDrive and Hotmail REST APIs

 GNOME_PROJECT=	libzapojit
 GNOME_VERSION=	0.0.3
-REVISION=	6
+REVISION=	7

 API_V=		0.0
 SUBST_VARS=	API_V
@ -13,7 +13,7 @@ SHARED_LIBS +=  zapojit-0.0               0.0 # 0.0
 PERMIT_PACKAGE=	Yes

 WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 goa-1.0 gobject-2.0
-WANTLIB += gthread-2.0 json-glib-1.0 lzma m pcre pthread rest-0.7
+WANTLIB += gthread-2.0 json-glib-1.0 lzma m pcre2-8 pthread rest-0.7
 WANTLIB += soup-2.4 soup-gnome-2.4 sqlite3 xml2 z iconv intl
 WANTLIB += brotlicommon brotlidec idn2 psl unistring

--- a/x11/gnome/menus/Makefile
+++ b/x11/gnome/menus/Makefile
@ -2,14 +2,14 @@ COMMENT=		implementation of the FreeDesktop Desktop Menu Spec

 GNOME_PROJECT=		gnome-menus
 GNOME_VERSION=		3.36.0
-REVISION=		0
+REVISION=		1

 SHARED_LIBS +=  gnome-menu-3         0.0      # 0.1

 # GPLv2/LGPLv2
 PERMIT_PACKAGE=		Yes

-WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 pcre pthread
+WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 pcre2-8 pthread
 WANTLIB += z iconv intl

 MODULES=		x11/gnome
--- a/x11/gnome/online-accounts/Makefile
+++ b/x11/gnome/online-accounts/Makefile
@ -2,7 +2,7 @@ COMMENT=	interfaces for interacting with online accounts

 GNOME_PROJECT=	gnome-online-accounts
 GNOME_VERSION=	3.44.0
-REVISION=	1
+REVISION=	2

 SHARED_LIBS +=  goa-1.0              4.0      # 0.0
 SHARED_LIBS +=  goa-backend-1.0      4.0      # 1.0
@ -22,7 +22,7 @@ WANTLIB += gstpbutils-1.0 gstreamer-1.0 gsttag-1.0 gstvideo-1.0
 WANTLIB += gthread-2.0 gtk-3 harfbuzz harfbuzz-icu hyphen iconv
 WANTLIB += icudata icui18n icuuc idn2 intl javascriptcoregtk-4.0
 WANTLIB += jpeg json-glib-1.0 lzma m notify openjp2 orc-0.4 pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png psl rest-0.7
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png psl rest-0.7
 WANTLIB += secret-1 soup-2.4 soup-gnome-2.4 sqlite3 tasn1 unistring
 WANTLIB += webkit2gtk-4.0 webp webpdemux woff2common woff2dec
 WANTLIB += xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-render
--- a/x11/gnome/online-miners/Makefile
+++ b/x11/gnome/online-miners/Makefile
@ -2,7 +2,7 @@ COMMENT=		crawls through your online content

 GNOME_PROJECT=		gnome-online-miners
 GNOME_VERSION=		3.34.0
-REVISION=		4
+REVISION=		5

 # tracker3 support
 # https://gitlab.gnome.org/GNOME/gnome-online-miners/-/merge_requests/3
@ -17,7 +17,7 @@ WANTLIB += ${COMPILER_LIBCXX} brotlicommon brotlidec c ffi gck-1
 WANTLIB += gcr-base-3 gcrypt gdata gfbgraph-0.2 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 goa-1.0 gobject-2.0 gpg-error grilo-0.3
 WANTLIB += gthread-2.0 iconv icudata icui18n icuuc idn2 intl json-glib-1.0
-WANTLIB += lzma m p11-kit pcre psl rest-0.7 soup-2.4 soup-gnome-2.4
+WANTLIB += lzma m p11-kit pcre2-8 psl rest-0.7 soup-2.4 soup-gnome-2.4
 WANTLIB += sqlite3 stemmer tracker-sparql-3.0 unistring xml2 z
 WANTLIB += zapojit-0.0

--- a/x11/gnome/seahorse-sharing/Makefile
+++ b/x11/gnome/seahorse-sharing/Makefile
@ -2,7 +2,7 @@ COMMENT=		PGP public keys sharing via DNS-SD and HKP

 GNOME_PROJECT=		seahorse-sharing
 GNOME_VERSION=		3.8.0
-REVISION=		16
+REVISION=		17

 CATEGORIES=		net security

@ -17,7 +17,7 @@ WANTLIB += epoxy expat ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
 WANTLIB += gpgme graphite2 gthread-2.0 gtk-3 harfbuzz iconv idn2
 WANTLIB += intl jpeg lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pcre pixman-1 png psl soup-2.4 sqlite3 unistring xcb
+WANTLIB += pcre2-8 pixman-1 png psl soup-2.4 sqlite3 unistring xcb
 WANTLIB += xcb-render xcb-shm xml2 z execinfo Xau Xdmcp

 MODULES=		x11/gnome
--- a/x11/gnome/text-editor/Makefile
+++ b/x11/gnome/text-editor/Makefile
@ -2,7 +2,7 @@ COMMENT=		simple Text Editor for GNOME

 GNOME_PROJECT=		gnome-text-editor
 GNOME_VERSION=		42.2
-REVISION=		1
+REVISION=		2

 CATEGORIES=		editors

@ -22,7 +22,8 @@ MODULES=		devel/dconf \

 MODGNOME_TOOLS= 	desktop-file-utils gtk-update-icon-cache yelp

-LIB_DEPENDS=		textproc/enchant2 \
+LIB_DEPENDS=		devel/pcre \
+			textproc/enchant2 \
 			textproc/icu4c \
 			x11/gnome/libadwaita \
 			x11/gtksourceview5
--- a/x11/gnome/themes-extra/Makefile
+++ b/x11/gnome/themes-extra/Makefile
@ -2,7 +2,7 @@ COMMENT=		extra themes for GNOME applications

 GNOME_PROJECT=		gnome-themes-extra
 GNOME_VERSION=		3.28
-REVISION=		4
+REVISION=		5

 # LGPLv2.1
 PERMIT_PACKAGE=		Yes
@ -12,7 +12,7 @@ WANTLIB += Xrandr Xrender atk-1.0 cairo expat ffi fontconfig freetype
 WANTLIB += fribidi gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0
 WANTLIB += harfbuzz iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pcre pixman-1 png pthread xcb xcb-render xcb-shm z
+WANTLIB += pcre2-8 pixman-1 png pthread xcb xcb-render xcb-shm z
 WANTLIB += Xau Xdmcp jpeg
 WANTLIB += ${COMPILER_LIBCXX}

--- a/x11/gnome/vino/Makefile
+++ b/x11/gnome/vino/Makefile
@ -2,7 +2,7 @@ COMMENT=		GNOME desktop sharing server

 GNOME_PROJECT=		vino
 GNOME_VERSION=		3.22.0
-REVISION=		3
+REVISION=		4

 CATEGORIES=		net

@ -24,7 +24,7 @@ WANTLIB += freetype gcrypt gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gmp gnutls gobject-2.0 gpg-error graphite2
 WANTLIB += gtk-3 harfbuzz hogweed iconv intl jpeg
 WANTLIB += m nettle notify p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pcre pixman-1 png pthread secret-1 tasn1
+WANTLIB += pcre2-8 pixman-1 png pthread secret-1 tasn1
 WANTLIB += telepathy-glib xcb xcb-render xcb-shm z
 WANTLIB += fribidi idn2 unistring ${COMPILER_LIBCXX} execinfo
 WANTLIB += Xau Xdmcp brotlidec brotlienc zstd
--- a/x11/gnome/yelp/Makefile
+++ b/x11/gnome/yelp/Makefile
@ -2,7 +2,7 @@ COMMENT=		GNOME help browser

 GNOME_PROJECT=		yelp
 GNOME_VERSION=		42.2
-REVISION=		0
+REVISION=		1

 SHARED_LIBS +=  yelp                 0.0      # unknown

@ -21,7 +21,7 @@ WANTLIB += gstpbutils-1.0 gstreamer-1.0 gsttag-1.0 gstvideo-1.0
 WANTLIB += gtk-3 handy-1 harfbuzz harfbuzz-icu hyphen iconv icudata
 WANTLIB += icui18n icuuc idn2 intl javascriptcoregtk-4.1 jpeg
 WANTLIB += lcms2 lzma m nghttp2 openjp2 orc-0.4 pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png psl secret-1 soup-3.0
+WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png psl secret-1 soup-3.0
 WANTLIB += sqlite3 tasn1 unistring webkit2gtk-4.1 webp webpdemux
 WANTLIB += woff2common woff2dec xcb xcb-dri2 xcb-dri3 xcb-glx
 WANTLIB += xcb-present xcb-render xcb-shm xcb-sync xcb-xfixes
--- a/x11/gtk+2/Makefile
+++ b/x11/gtk+2/Makefile
@ -9,8 +9,8 @@ GNOME_PROJECT=		gtk+
 PKGNAME-main=		gtk+2-${GNOME_VERSION}
 PKGNAME-cups=		gtk+2-cups-${GNOME_VERSION}

-REVISION-main=		1
-REVISION-cups=		1
+REVISION-main=		2
+REVISION-cups=		2

 CATEGORIES=		x11 devel

@ -30,7 +30,7 @@ WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo expat
 WANTLIB += ffi fontconfig freetype fribidi gdk_pixbuf-2.0 gio-2.0
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 harfbuzz
 WANTLIB += iconv intl jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pcre pixman-1 png xcb xcb-render xcb-shm z
+WANTLIB += pcre2-8 pixman-1 png xcb xcb-render xcb-shm z

 WANTLIB-main += ${WANTLIB} c

--- a/x11/gtk+3/Makefile
+++ b/x11/gtk+3/Makefile
@ -14,8 +14,10 @@ GNOME_VERSION=		3.24.34
 PKGNAME-main=		gtk+3-${GNOME_VERSION}
 PKGNAME-cups=		gtk+3-cups-${GNOME_VERSION}
 PKGNAME-guic=		gtk-update-icon-cache-${GNOME_VERSION}
+REVISION-guic=		0
+REVISION-main=		0

-REVISION-cups=		0
+REVISION-cups=		1

 CATEGORIES=		x11 devel

@ -31,7 +33,7 @@ MAINTAINER=		Antoine Jacoutot <ajacoutot@openbsd.org>
 PERMIT_PACKAGE=		Yes

 WANTLIB += ffi gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += iconv intl jpeg m pcre pthread z
+WANTLIB += iconv intl jpeg m pcre2-8 pthread z

 MULTI_PACKAGES=		-main -cups -guic

--- a/x11/gtk-engines2/Makefile
+++ b/x11/gtk-engines2/Makefile
@ -8,7 +8,7 @@ EXTRACT_SUFX=		.tar.bz2

 # warning: PKGNAME does not default to ${DISTNAME}
 PKGNAME=		gtk-engines2-${GNOME_VERSION}
-REVISION=		12
+REVISION=		13

 CATEGORIES=		x11

@ -20,7 +20,7 @@ WANTLIB += Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo drm expat ffi
 WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
 WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread ${COMPILER_LIBCXX} xcb
+WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png pthread ${COMPILER_LIBCXX} xcb
 WANTLIB += xcb-render xcb-shm z fribidi jpeg

 COMPILER =		base-clang ports-gcc base-gcc
--- a/x11/gtk2-aurora-engine/Makefile
+++ b/x11/gtk2-aurora-engine/Makefile
@ -3,7 +3,7 @@ COMMENT=	Aurora GTK+2 engine
 V=		1.5.1
 DISTNAME=	56438-aurora-${V}
 PKGNAME=	gtk2-aurora-engine-${V}
-REVISION=	11
+REVISION=	12

 EXTRACT_SUFX=	.tar.bz2

@ -19,7 +19,7 @@ WANTLIB += Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo drm expat ffi
 WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
 WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread ${COMPILER_LIBCXX} xcb
+WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png pthread ${COMPILER_LIBCXX} xcb
 WANTLIB += xcb-render xcb-shm z fribidi jpeg

 COMPILER =		base-clang ports-gcc base-gcc
--- a/x11/gtk2-equinox-engine/Makefile
+++ b/x11/gtk2-equinox-engine/Makefile
@ -3,7 +3,7 @@ COMMENT=	Equinox GTK+2 engine
 V=		1.50
 DISTNAME=	121881-equinox-${V}
 PKGNAME=	gtk2-equinox-engine-${V}
-REVISION=	9
+REVISION=	10

 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		140449-equinox-themes-${V}${EXTRACT_SUFX}
@ -20,7 +20,7 @@ WANTLIB += Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo drm expat ffi
 WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
 WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread ${COMPILER_LIBCXX} xcb
+WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png pthread ${COMPILER_LIBCXX} xcb
 WANTLIB += xcb-render xcb-shm z fribidi jpeg

 COMPILER =		base-clang ports-gcc base-gcc
--- a/x11/gtk2-murrine-engine/Makefile
+++ b/x11/gtk2-murrine-engine/Makefile
@ -3,7 +3,7 @@ COMMENT =	beautiful glass-like GTK+ 2.x engine and themes
 GNOME_VERSION =	0.98.2
 GNOME_PROJECT =	murrine
 PKGNAME =	gtk2-murrine-engine-${GNOME_VERSION}
-REVISION =	10
+REVISION =	11
 CATEGORIES =	x11

 HOMEPAGE =	http://cimitan.com/murrine/
@ -15,7 +15,7 @@ WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender atk-1.0 cairo expat ffi fontconfig freetype fribidi
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz iconv
-WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
 WANTLIB += png pthread xcb xcb-render xcb-shm z jpeg Xau Xdmcp
 WANTLIB += ${COMPILER_LIBCXX}

--- a/x11/gtk2-nodoka-engine/Makefile
+++ b/x11/gtk2-nodoka-engine/Makefile
@ -3,7 +3,7 @@ COMMENT =	GTK+2 engine from Fedora
 VERSION =	0.7.5
 DISTNAME =	gtk-nodoka-engine-${VERSION}
 PKGNAME =	gtk2-nodoka-engine-${VERSION}
-REVISION=	10
+REVISION=	11

 CATEGORIES =	x11

@ -17,7 +17,7 @@ WANTLIB += Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo drm expat ffi
 WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0
 WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread ${COMPILER_LIBCXX} xcb
+WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png pthread ${COMPILER_LIBCXX} xcb
 WANTLIB += xcb-render xcb-shm z fribidi jpeg

 COMPILER =		base-clang ports-gcc base-gcc
--- a/x11/gtk2-rezlooks-engine/Makefile
+++ b/x11/gtk2-rezlooks-engine/Makefile
@ -3,7 +3,7 @@ COMMENT=		Clearlooks based GTK+ 2.x engine
 V=			0.6
 DISTNAME=		39179-rezlooks-$V
 PKGNAME=		gtk2-rezlooks-engine-$V
-REVISION=		7
+REVISION=		8
 CATEGORIES=		x11

 # GPLv2
@ -13,7 +13,7 @@ WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender atk-1.0 cairo expat ffi fontconfig freetype fribidi
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz iconv
-WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
 WANTLIB += png pthread xcb xcb-render xcb-shm z ${COMPILER_LIBCXX}
 WANTLIB += Xau Xdmcp jpeg

--- a/x11/gtk2mm/Makefile
+++ b/x11/gtk2mm/Makefile
@ -5,7 +5,7 @@ COMMENT=		C++ interface for gtk2+
 GNOME_PROJECT=		gtkmm
 GNOME_VERSION=		2.24.5
 PKGNAME=		gtk2mm-${GNOME_VERSION}
-REVISION=		3
+REVISION=		4

 CATEGORIES=		x11 devel

@ -26,7 +26,7 @@ WANTLIB += expat ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0
 WANTLIB += graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl
 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4
-WANTLIB += pcre pixman-1 png pthread sigc-2.0 xcb
+WANTLIB += pcre2-8 pixman-1 png pthread sigc-2.0 xcb
 WANTLIB += xcb-render xcb-shm z fribidi Xau Xdmcp jpeg

 MODULES=		x11/gnome
--- a/x11/gtk3-unico-engine/Makefile
+++ b/x11/gtk3-unico-engine/Makefile
@ -3,7 +3,7 @@ COMMENT=	Unico GTK+3 engine
 V=		1.0.2.1
 DISTNAME=	unico-${V}
 PKGNAME=	gtk3-unico-engine-${V}
-REVISION=	7
+REVISION=	8

 CATEGORIES=	x11

@ -17,7 +17,7 @@ WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi cairo
 WANTLIB += cairo-gobject dbus-1 epoxy expat ffi fontconfig freetype
 WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz iconv intl m
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png
+WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png
 WANTLIB += pthread xcb xcb-render xcb-shm z harfbuzz

 MASTER_SITES=	https://distfiles.sigtrap.nl/
--- a/x11/gtkdatabox/Makefile
+++ b/x11/gtkdatabox/Makefile
@ -1,7 +1,7 @@
 COMMENT =	GTK+2 widget to display large amounts of numerical data

 DISTNAME =	gtkdatabox-0.9.1.1
-REVISION =	10
+REVISION =	11

 SHARED_LIBS =	gtkdatabox 0.0

@ -18,7 +18,7 @@ WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender atk-1.0 cairo expat ffi fontconfig freetype fribidi
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz iconv
-WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
 WANTLIB += png pthread xcb xcb-render xcb-shm z ${COMPILER_LIBCXX}
 WANTLIB += Xau Xdmcp jpeg

--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@ -2,7 +2,7 @@ COMMENT=		OpenGL widget for GTK+2 GUI toolkit

 GNOME_PROJECT=		gtkglarea
 GNOME_VERSION=		2.0.1
-REVISION=		11
+REVISION=		12

 SHARED_LIBS +=  gtkgl-2.0      0.0               # .1.1

@ -15,7 +15,7 @@ WANTLIB += GL GLU X11 Xcomposite Xcursor Xdamage Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig
 WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 iconv intl m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png
 WANTLIB += xcb xcb-shm z Xau Xdmcp jpeg
 WANTLIB += X11-xcb Xxf86vm drm ffi glapi graphite2 gthread-2.0
 WANTLIB += harfbuzz pthread ${COMPILER_LIBCXX} xcb-dri2 xcb-glx xcb-render
--- a/x11/gtkglext/Makefile
+++ b/x11/gtkglext/Makefile
@ -1,7 +1,7 @@
 COMMENT=	OpenGL extension to GTK+ 2.0 and later

 DISTNAME=	gtkglext-1.2.0.20191219
-REVISION=	0
+REVISION=	1

 CATEGORIES=	x11 graphics devel

@ -18,7 +18,7 @@ WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo
 WANTLIB += drm expat ffi fontconfig freetype fribidi gdk-x11-2.0
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glapi glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += graphite2 gtk-x11-2.0 harfbuzz iconv intl m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png pthread
 WANTLIB += xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-render
 WANTLIB += xcb-shm xcb-sync xcb-xfixes xshmfence z Xau Xdmcp jpeg
 WANTLIB += ${COMPILER_LIBCXX}
--- a/x11/gtkhotkey/Makefile
+++ b/x11/gtkhotkey/Makefile
@ -1,7 +1,7 @@
 COMMENT =	platform independent hotkey handling for Gtk+ applications

 DISTNAME =	gtkhotkey-0.2.1
-REVISION=	11
+REVISION=	12
 SHARED_LIBS =	gtkhotkey 0.0 #1.0
 CATEGORIES =	x11

@ -14,7 +14,7 @@ WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender atk-1.0 cairo expat ffi fontconfig freetype fribidi
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz iconv
-WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
 WANTLIB += png pthread xcb xcb-render xcb-shm z Xau Xdmcp jpeg
 WANTLIB += ${COMPILER_LIBCXX}

--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@ -5,7 +5,7 @@ COMMENT=		text widget that extends GTK2's GtkTextView widget#'
 MAJOR_VERSION=		2.0
 GNOME_PROJECT=		gtksourceview
 GNOME_VERSION=		2.10.5
-REVISION=		8
+REVISION=		9

 SHARED_LIBS +=	gtksourceview-2.0    5.0      # .0.0

@ -22,7 +22,7 @@ WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender atk-1.0 cairo expat ffi fontconfig freetype fribidi
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz iconv
-WANTLIB += intl lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
+WANTLIB += intl lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8
 WANTLIB += pixman-1 png pthread xcb xcb-render xcb-shm xml2 z
 WANTLIB += Xau Xdmcp jpeg ${COMPILER_LIBCXX}

--- a/x11/gtksourceview3/Makefile
+++ b/x11/gtksourceview3/Makefile
@ -5,7 +5,7 @@ COMMENT=		text widget that extends the GTK3 GtkTextView widget
 GNOME_PROJECT=		gtksourceview
 GNOME_VERSION=		3.24.11
 PKGNAME=		${GNOME_PROJECT}3-${GNOME_VERSION}
-REVISION=		1
+REVISION=		2

 SHARED_LIBS +=	gtksourceview-3.0    3.5      # .9.0
 CATEGORIES=		x11
@ -23,7 +23,7 @@ WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 cairo
 WANTLIB += cairo-gobject epoxy expat ffi fontconfig freetype
 WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += graphite2 gthread-2.0 gtk-3 harfbuzz iconv intl lzma m
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png
+WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png
 WANTLIB += pthread xcb xcb-render xcb-shm xml2 z fribidi ${COMPILER_LIBCXX}
 WANTLIB += Xau Xdmcp jpeg execinfo

--- a/x11/keybinder3/Makefile
+++ b/x11/keybinder3/Makefile
@ -1,7 +1,7 @@
 COMMENT =	GTK+3 library for registering keyboard shortcuts
 DISTNAME =	keybinder3-0.3.0
 CATEGORIES =	x11 devel
-REVISION =	7
+REVISION =	8

 SHARED_LIBS =	keybinder-3.0		0.0	# 0.0

@ -15,7 +15,7 @@ WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi cairo
 WANTLIB += cairo-gobject dbus-1 epoxy expat ffi fontconfig freetype
 WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz iconv intl m
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png
+WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1 png
 WANTLIB += pthread xcb xcb-render xcb-shm z ${COMPILER_LIBCXX}
 WANTLIB += Xau Xdmcp execinfo jpeg

--- a/x11/libdbus-c++/Makefile
+++ b/x11/libdbus-c++/Makefile
@ -1,6 +1,6 @@
 COMMENT =	C++ API for dbus
 DISTNAME =	libdbus-c++-0.9.0
-REVISION =	1
+REVISION =	2

 SHARED_LIBS =	dbus-c++-1	0.1 \
 		dbus-c++-glib-1	0.0
@ -13,7 +13,7 @@ HOMEPAGE =	http://dbus-cplusplus.sourceforge.net/
 PERMIT_PACKAGE =	Yes

 WANTLIB =		${COMPILER_LIBCXX} c dbus-1 expat glib-2.0 iconv \
-			intl m pcre execinfo
+			intl m pcre2-8 execinfo

 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=dbus-cplusplus/}

--- a/x11/libdbusmenu/Makefile
+++ b/x11/libdbusmenu/Makefile
@ -1,6 +1,6 @@
 COMMENT =	D-Bus menu implementation for Gtk
 DISTNAME =	libdbusmenu-16.04.0
-REVISION =	3
+REVISION =	4
 CATEGORIES =	x11 devel
 SHARED_LIBS +=  dbusmenu-glib             0.0 # 4.12
 SHARED_LIBS +=  dbusmenu-gtk3             0.0 # 4.12
@ -16,7 +16,7 @@ WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 c cairo cairo-gobject
 WANTLIB += epoxy expat ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
 WANTLIB += gtk-3 harfbuzz iconv intl json-glib-1.0
-WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
 WANTLIB += png pthread xcb xcb-render xcb-shm z Xau Xdmcp execinfo jpeg
 WANTLIB += ${COMPILER_LIBCXX}

--- a/x11/libfm/core/Makefile
+++ b/x11/libfm/core/Makefile
@ -1,5 +1,5 @@
 COMMENT=		glib/gio-based lib for file management
-REVISION=		0
+REVISION=		1

 WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
 WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo exif
@ -7,7 +7,7 @@ WANTLIB += expat ffi fm-extra fontconfig freetype fribidi gdk-x11-2.0
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl
 WANTLIB += m menu-cache pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pcre pixman-1 png xcb xcb-render xcb-shm z
+WANTLIB += pcre2-8 pixman-1 png xcb xcb-render xcb-shm z
 WANTLIB += Xau Xdmcp jpeg

 BUILD_DEPENDS=		lang/vala
--- a/x11/libfm/extra/Makefile
+++ b/x11/libfm/extra/Makefile
@ -1,9 +1,10 @@
 COMMENT=		extra library for libfm

 PKGNAME=		libfm-extra-${V}
+REVISION=		0

 WANTLIB += ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB += iconv intl m pcre pthread z
+WANTLIB += iconv intl m pcre2-8 pthread z

 LIB_DEPENDS=		devel/glib2

--- a/x11/libgdiplus/Makefile
+++ b/x11/libgdiplus/Makefile
@ -1,7 +1,7 @@
 COMMENT=	GDI+ comptible API

 DISTNAME=	libgdiplus-6.1
-REVISION=	0
+REVISION=	1

 CATEGORIES=	x11 devel

@ -18,7 +18,7 @@ COMPILER=	base-clang ports-gcc
 COMPILER_LANGS=	c

 WANTLIB =  X11 Xau Xdmcp Xext Xrender cairo exif expat fontconfig
-WANTLIB += freetype gif glib-2.0 iconv intl jpeg lzma m pcre pixman-1
+WANTLIB += freetype gif glib-2.0 iconv intl jpeg lzma m pcre2-8 pixman-1
 WANTLIB += png pthread tiff xcb xcb-render xcb-shm z zstd graphite2
 WANTLIB += ${COMPILER_LIBCXX} ffi gio-2.0 gmodule-2.0 gobject-2.0 z
 WANTLIB += fribidi harfbuzz intl pango-1.0 pangocairo-1.0 pangoft2-1.0
--- a/x11/mate/atril/Makefile
+++ b/x11/mate/atril/Makefile
@ -1,7 +1,7 @@
 USE_WXNEEDED=		Yes

 COMMENT=		document viewer for the MATE desktop
-REVISION=		1
+REVISION=		2

 CATEGORIES=		graphics

@ -17,7 +17,7 @@ WANTLIB += EGL GL ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
 WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xxf86vm bz2
 WANTLIB += c crypto drm epoxy expat ffi fontconfig freetype gbm
 WANTLIB += gio-2.0 glapi glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB += iconv intl m pcre pixman-1 pthread sqlite3
+WANTLIB += iconv intl m pcre2-8 pixman-1 pthread sqlite3
 WANTLIB += ${COMPILER_LIBCXX} xcb xcb-dri2 xcb-glx xcb-render xcb-shm xcb-xfixes
 WANTLIB += archive atk-1.0 atk-bridge-2.0 avahi-common
 WANTLIB += cairo-gobject cairo caja-extension dbus-1 djvulibre
--- a/Show More
+++ b/Show More