Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 78D3B84D74
	for <pkgsrc-changes@NetBSD.org>; Sat, 30 Dec 2023 12:57:59 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([127.0.0.1])
	by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025)
	with ESMTP id 94jxrjoteRZH for <pkgsrc-changes@netbsd.org>;
	Sat, 30 Dec 2023 12:57:56 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id 9C8BD84D22
	for <pkgsrc-changes@NetBSD.org>; Sat, 30 Dec 2023 12:57:56 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 974F0FA42; Sat, 30 Dec 2023 12:57:56 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1703941076196230"
MIME-Version: 1.0
Date: Sat, 30 Dec 2023 12:57:56 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: wiz@netbsd.org
X-Mailer: log_accum
Message-Id: <20231230125756.974F0FA42@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1703941076196230
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Sat Dec 30 12:57:56 UTC 2023

Modified Files:
	pkgsrc/converters/pdf2svg: Makefile
	pkgsrc/editors/gummi: Makefile
	pkgsrc/editors/kile: Makefile
	pkgsrc/editors/tea: Makefile
	pkgsrc/editors/texstudio: Makefile
	pkgsrc/editors/texworks: Makefile
	pkgsrc/editors/xournalpp: Makefile
	pkgsrc/games/flightgear: Makefile
	pkgsrc/games/openmw: Makefile
	pkgsrc/games/simgear: Makefile buildlink3.mk
	pkgsrc/graphics/gimp: Makefile
	pkgsrc/graphics/gimp-devel: Makefile
	pkgsrc/graphics/graphviz: Makefile options.mk
	pkgsrc/graphics/inkscape: Makefile
	pkgsrc/graphics/krita: Makefile
	pkgsrc/graphics/osg: Makefile buildlink3.mk options.mk
	pkgsrc/graphics/pdfpc: Makefile
	pkgsrc/math/cantor: Makefile
	pkgsrc/misc/calibre: Makefile
	pkgsrc/print/atril: Makefile options.mk
	pkgsrc/print/cups-filters: Makefile
	pkgsrc/print/deforaos-pdfviewer: Makefile
	pkgsrc/print/dspdfviewer: Makefile
	pkgsrc/print/electrix: Makefile
	pkgsrc/print/epdfview: Makefile
	pkgsrc/print/evince: Makefile
	pkgsrc/print/lumina-pdf: Makefile
	pkgsrc/print/okular: Makefile
	pkgsrc/print/pdf2djvu: Makefile
	pkgsrc/print/qpdfview: Makefile
	pkgsrc/print/ruby-poppler: Makefile
	pkgsrc/print/scribus-qt5: Makefile
	pkgsrc/print/zathura-pdf-poppler: Makefile
	pkgsrc/sysutils/gnome-tracker-miners: Makefile
	pkgsrc/sysutils/kfilemetadata5: Makefile
	pkgsrc/textproc/pdfgrep: Makefile
	pkgsrc/x11/qt5-qtwebengine: Makefile
	pkgsrc/x11/xfce4-tumbler: Makefile options.mk

Log Message:
*: switch from poppler-glib to poppler

Bump PKGREVISION for all poppler users to be on the safe side


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/converters/pdf2svg/Makefile
cvs rdiff -u -r1.99 -r1.100 pkgsrc/editors/gummi/Makefile
cvs rdiff -u -r1.148 -r1.149 pkgsrc/editors/kile/Makefile
cvs rdiff -u -r1.87 -r1.88 pkgsrc/editors/tea/Makefile
cvs rdiff -u -r1.90 -r1.91 pkgsrc/editors/texstudio/Makefile
cvs rdiff -u -r1.120 -r1.121 pkgsrc/editors/texworks/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/editors/xournalpp/Makefile
cvs rdiff -u -r1.165 -r1.166 pkgsrc/games/flightgear/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/games/openmw/Makefile
cvs rdiff -u -r1.156 -r1.157 pkgsrc/games/simgear/Makefile
cvs rdiff -u -r1.91 -r1.92 pkgsrc/games/simgear/buildlink3.mk
cvs rdiff -u -r1.389 -r1.390 pkgsrc/graphics/gimp/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/graphics/gimp-devel/Makefile
cvs rdiff -u -r1.280 -r1.281 pkgsrc/graphics/graphviz/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/graphics/graphviz/options.mk
cvs rdiff -u -r1.281 -r1.282 pkgsrc/graphics/inkscape/Makefile
cvs rdiff -u -r1.120 -r1.121 pkgsrc/graphics/krita/Makefile
cvs rdiff -u -r1.169 -r1.170 pkgsrc/graphics/osg/Makefile
cvs rdiff -u -r1.130 -r1.131 pkgsrc/graphics/osg/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/osg/options.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/pdfpc/Makefile
cvs rdiff -u -r1.118 -r1.119 pkgsrc/math/cantor/Makefile
cvs rdiff -u -r1.296 -r1.297 pkgsrc/misc/calibre/Makefile
cvs rdiff -u -r1.89 -r1.90 pkgsrc/print/atril/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/atril/options.mk
cvs rdiff -u -r1.181 -r1.182 pkgsrc/print/cups-filters/Makefile
cvs rdiff -u -r1.85 -r1.86 pkgsrc/print/deforaos-pdfviewer/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/print/dspdfviewer/Makefile
cvs rdiff -u -r1.96 -r1.97 pkgsrc/print/electrix/Makefile
cvs rdiff -u -r1.130 -r1.131 pkgsrc/print/epdfview/Makefile
cvs rdiff -u -r1.168 -r1.169 pkgsrc/print/evince/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/print/lumina-pdf/Makefile
cvs rdiff -u -r1.147 -r1.148 pkgsrc/print/okular/Makefile
cvs rdiff -u -r1.114 -r1.115 pkgsrc/print/pdf2djvu/Makefile
cvs rdiff -u -r1.121 -r1.122 pkgsrc/print/qpdfview/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/print/ruby-poppler/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/print/scribus-qt5/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/print/zathura-pdf-poppler/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/sysutils/gnome-tracker-miners/Makefile
cvs rdiff -u -r1.111 -r1.112 pkgsrc/sysutils/kfilemetadata5/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/textproc/pdfgrep/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/x11/qt5-qtwebengine/Makefile
cvs rdiff -u -r1.124 -r1.125 pkgsrc/x11/xfce4-tumbler/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xfce4-tumbler/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1703941076196230
Content-Disposition: inline
Content-Length: 32850
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/converters/pdf2svg/Makefile
diff -u pkgsrc/converters/pdf2svg/Makefile:1.44 pkgsrc/converters/pdf2svg/Makefile:1.45
--- pkgsrc/converters/pdf2svg/Makefile:1.44	Wed Nov 15 09:25:50 2023
+++ pkgsrc/converters/pdf2svg/Makefile	Sat Dec 30 12:57:50 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2023/11/15 09:25:50 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2023/12/30 12:57:50 wiz Exp $
 
 DISTNAME=	pdf2svg-0.2.3
-PKGREVISION=	43
+PKGREVISION=	44
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GITHUB:=dawbarton/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -16,6 +16,7 @@ GNU_CONFIGURE=	yes
 
 BUILD_TARGET=	pdf2svg
 
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/editors/gummi/Makefile
diff -u pkgsrc/editors/gummi/Makefile:1.99 pkgsrc/editors/gummi/Makefile:1.100
--- pkgsrc/editors/gummi/Makefile:1.99	Wed Nov 15 09:25:50 2023
+++ pkgsrc/editors/gummi/Makefile	Sat Dec 30 12:57:50 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.99 2023/11/15 09:25:50 wiz Exp $
+# $NetBSD: Makefile,v 1.100 2023/12/30 12:57:50 wiz Exp $
 
 DISTNAME=		gummi-0.6.6
-PKGREVISION=		59
+PKGREVISION=		60
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_GITHUB:=alexandervdm/}
 GITHUB_PROJECT=		gummi
@@ -32,7 +32,8 @@ pre-configure:
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/gtksourceview2/buildlink3.mk"
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"

Index: pkgsrc/editors/kile/Makefile
diff -u pkgsrc/editors/kile/Makefile:1.148 pkgsrc/editors/kile/Makefile:1.149
--- pkgsrc/editors/kile/Makefile:1.148	Wed Nov 15 09:25:50 2023
+++ pkgsrc/editors/kile/Makefile	Sat Dec 30 12:57:51 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.148 2023/11/15 09:25:50 wiz Exp $
+# $NetBSD: Makefile,v 1.149 2023/12/30 12:57:51 wiz Exp $
 
 DISTNAME=		kile-2.9.93
-PKGREVISION=		24
+PKGREVISION=		25
 CATEGORIES=		editors kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kile/}
 EXTRACT_SUFX=		.tar.bz2

Index: pkgsrc/editors/tea/Makefile
diff -u pkgsrc/editors/tea/Makefile:1.87 pkgsrc/editors/tea/Makefile:1.88
--- pkgsrc/editors/tea/Makefile:1.87	Wed Nov 15 09:25:50 2023
+++ pkgsrc/editors/tea/Makefile	Sat Dec 30 12:57:51 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2023/11/15 09:25:50 wiz Exp $
+# $NetBSD: Makefile,v 1.88 2023/12/30 12:57:51 wiz Exp $
 
 DISTNAME=	tea-48.0.1
-PKGREVISION=	35
+PKGREVISION=	36
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=psemiletov/}
 GITHUB_PROJECT=	tea-qt

Index: pkgsrc/editors/texstudio/Makefile
diff -u pkgsrc/editors/texstudio/Makefile:1.90 pkgsrc/editors/texstudio/Makefile:1.91
--- pkgsrc/editors/texstudio/Makefile:1.90	Wed Nov 15 09:25:50 2023
+++ pkgsrc/editors/texstudio/Makefile	Sat Dec 30 12:57:51 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2023/11/15 09:25:50 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2023/12/30 12:57:51 wiz Exp $
 
 DISTNAME=	texstudio-4.4.0
-PKGREVISION=	13
+PKGREVISION=	14
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=texstudio-org/}
 

Index: pkgsrc/editors/texworks/Makefile
diff -u pkgsrc/editors/texworks/Makefile:1.120 pkgsrc/editors/texworks/Makefile:1.121
--- pkgsrc/editors/texworks/Makefile:1.120	Wed Nov 15 09:25:50 2023
+++ pkgsrc/editors/texworks/Makefile	Sat Dec 30 12:57:51 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.120 2023/11/15 09:25:50 wiz Exp $
+# $NetBSD: Makefile,v 1.121 2023/12/30 12:57:51 wiz Exp $
 
 DISTNAME=	texworks-0.6.3
-PKGREVISION=	43
+PKGREVISION=	44
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=TeXworks/}
 GITHUB_PROJECT=	texworks

Index: pkgsrc/editors/xournalpp/Makefile
diff -u pkgsrc/editors/xournalpp/Makefile:1.61 pkgsrc/editors/xournalpp/Makefile:1.62
--- pkgsrc/editors/xournalpp/Makefile:1.61	Wed Nov 15 09:25:50 2023
+++ pkgsrc/editors/xournalpp/Makefile	Sat Dec 30 12:57:51 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2023/11/15 09:25:50 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2023/12/30 12:57:51 wiz Exp $
 
 DISTNAME=	xournalpp-1.2.2
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=xournalpp/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -41,7 +41,8 @@ post-install:
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../lang/lua53/buildlink3.mk"
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk3/buildlink3.mk"

Index: pkgsrc/games/flightgear/Makefile
diff -u pkgsrc/games/flightgear/Makefile:1.165 pkgsrc/games/flightgear/Makefile:1.166
--- pkgsrc/games/flightgear/Makefile:1.165	Fri Dec 29 18:24:44 2023
+++ pkgsrc/games/flightgear/Makefile	Sat Dec 30 12:57:51 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.165 2023/12/29 18:24:44 adam Exp $
+# $NetBSD: Makefile,v 1.166 2023/12/30 12:57:51 wiz Exp $
 
 DISTNAME=	flightgear-2020.3.11
-PKGREVISION=	35
+PKGREVISION=	36
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flightgear/release-${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.bz2

Index: pkgsrc/games/openmw/Makefile
diff -u pkgsrc/games/openmw/Makefile:1.75 pkgsrc/games/openmw/Makefile:1.76
--- pkgsrc/games/openmw/Makefile:1.75	Fri Dec 29 18:24:45 2023
+++ pkgsrc/games/openmw/Makefile	Sat Dec 30 12:57:51 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2023/12/29 18:24:45 adam Exp $
+# $NetBSD: Makefile,v 1.76 2023/12/30 12:57:51 wiz Exp $
 
 DISTNAME=	openmw-openmw-0.47.0
 PKGNAME=	${DISTNAME:S/^openmw-//1}
-PKGREVISION=	34
+PKGREVISION=	35
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITLAB:=OpenMW/}
 GITLAB_PROJECT=	openmw

Index: pkgsrc/games/simgear/Makefile
diff -u pkgsrc/games/simgear/Makefile:1.156 pkgsrc/games/simgear/Makefile:1.157
--- pkgsrc/games/simgear/Makefile:1.156	Fri Dec 29 18:24:45 2023
+++ pkgsrc/games/simgear/Makefile	Sat Dec 30 12:57:51 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.156 2023/12/29 18:24:45 adam Exp $
+# $NetBSD: Makefile,v 1.157 2023/12/30 12:57:51 wiz Exp $
 
 DISTNAME=	simgear-2020.3.11
-PKGREVISION=	31
+PKGREVISION=	32
 CATEGORIES=	games devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flightgear/release-${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.bz2

Index: pkgsrc/games/simgear/buildlink3.mk
diff -u pkgsrc/games/simgear/buildlink3.mk:1.91 pkgsrc/games/simgear/buildlink3.mk:1.92
--- pkgsrc/games/simgear/buildlink3.mk:1.91	Fri Dec 29 18:24:45 2023
+++ pkgsrc/games/simgear/buildlink3.mk	Sat Dec 30 12:57:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.91 2023/12/29 18:24:45 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.92 2023/12/30 12:57:51 wiz Exp $
 
 BUILDLINK_TREE+=	simgear
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	simgear
 SIMGEAR_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.simgear+=	simgear>=2018.2.2nb7
-BUILDLINK_ABI_DEPENDS.simgear?=	simgear>=2020.3.11nb31
+BUILDLINK_ABI_DEPENDS.simgear?=	simgear>=2020.3.11nb32
 BUILDLINK_PKGSRCDIR.simgear?=	../../games/simgear
 
 .include "../../audio/openal-soft/buildlink3.mk"

Index: pkgsrc/graphics/gimp/Makefile
diff -u pkgsrc/graphics/gimp/Makefile:1.389 pkgsrc/graphics/gimp/Makefile:1.390
--- pkgsrc/graphics/gimp/Makefile:1.389	Wed Nov 15 20:00:38 2023
+++ pkgsrc/graphics/gimp/Makefile	Sat Dec 30 12:57:52 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.389 2023/11/15 20:00:38 wiz Exp $
+# $NetBSD: Makefile,v 1.390 2023/12/30 12:57:52 wiz Exp $
 
 DISTNAME=	gimp-2.10.36
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	https://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=	.tar.bz2
@@ -89,7 +89,8 @@ BUILDLINK_API_DEPENDS.gegl+=		gegl>=0.4.
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../print/poppler-data/buildlink3.mk"
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

Index: pkgsrc/graphics/gimp-devel/Makefile
diff -u pkgsrc/graphics/gimp-devel/Makefile:1.32 pkgsrc/graphics/gimp-devel/Makefile:1.33
--- pkgsrc/graphics/gimp-devel/Makefile:1.32	Wed Nov 15 20:00:38 2023
+++ pkgsrc/graphics/gimp-devel/Makefile	Sat Dec 30 12:57:52 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2023/11/15 20:00:38 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2023/12/30 12:57:52 wiz Exp $
 
 DISTNAME=	gimp-2.99.16
 PKGNAME=	${DISTNAME:S/gimp/gimp-devel/}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	https://download.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=	.tar.xz
@@ -115,7 +115,8 @@ BUILDLINK_API_DEPENDS.tiff+=	tiff>=4.0
 .include "../../lang/python/application.mk"
 .include "../../print/ghostscript/buildlink3.mk"
 .include "../../print/poppler-data/buildlink3.mk"
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"

Index: pkgsrc/graphics/graphviz/Makefile
diff -u pkgsrc/graphics/graphviz/Makefile:1.280 pkgsrc/graphics/graphviz/Makefile:1.281
--- pkgsrc/graphics/graphviz/Makefile:1.280	Wed Nov 15 09:25:51 2023
+++ pkgsrc/graphics/graphviz/Makefile	Sat Dec 30 12:57:52 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.280 2023/11/15 09:25:51 wiz Exp $
+# $NetBSD: Makefile,v 1.281 2023/12/30 12:57:52 wiz Exp $
 
 DISTNAME=	graphviz-8.1.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITLAB:=api/v4/projects/4207231/packages/generic/graphviz-releases/${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.xz

Index: pkgsrc/graphics/graphviz/options.mk
diff -u pkgsrc/graphics/graphviz/options.mk:1.36 pkgsrc/graphics/graphviz/options.mk:1.37
--- pkgsrc/graphics/graphviz/options.mk:1.36	Wed Jun  7 13:32:49 2023
+++ pkgsrc/graphics/graphviz/options.mk	Sat Dec 30 12:57:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.36 2023/06/07 13:32:49 micha Exp $
+# $NetBSD: options.mk,v 1.37 2023/12/30 12:57:52 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.graphviz
 PKG_SUPPORTED_OPTIONS=	gd ghostscript gtk lua perl poppler svg tcl x11
@@ -57,7 +57,8 @@ CONFIGURE_ARGS+=	--without-gnomeui
 .endif
 
 .if !empty(PKG_OPTIONS:Mpoppler)
-.  include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.  include "../../print/poppler/buildlink3.mk"
 PLIST.poppler=		yes
 CONFIGURE_ARGS+=	--with-poppler
 .else

Index: pkgsrc/graphics/inkscape/Makefile
diff -u pkgsrc/graphics/inkscape/Makefile:1.281 pkgsrc/graphics/inkscape/Makefile:1.282
--- pkgsrc/graphics/inkscape/Makefile:1.281	Fri Dec 29 18:24:47 2023
+++ pkgsrc/graphics/inkscape/Makefile	Sat Dec 30 12:57:52 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.281 2023/12/29 18:24:47 adam Exp $
+# $NetBSD: Makefile,v 1.282 2023/12/30 12:57:52 wiz Exp $
 
 DISTNAME=	inkscape-1.3.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://media.inkscape.org/dl/resources/file/
 EXTRACT_SUFX=	.tar.xz
@@ -134,7 +134,8 @@ BUILDLINK_API_DEPENDS.harfbuzz+=	harfbuz
 .include "../../math/double-conversion/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../print/poppler-includes/buildlink3.mk"
 .include "../../textproc/gspell/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtkmm3+=	gtkmm3>=3.24

Index: pkgsrc/graphics/krita/Makefile
diff -u pkgsrc/graphics/krita/Makefile:1.120 pkgsrc/graphics/krita/Makefile:1.121
--- pkgsrc/graphics/krita/Makefile:1.120	Fri Dec 29 18:24:48 2023
+++ pkgsrc/graphics/krita/Makefile	Sat Dec 30 12:57:53 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.120 2023/12/29 18:24:48 adam Exp $
+# $NetBSD: Makefile,v 1.121 2023/12/30 12:57:53 wiz Exp $
 
 DISTNAME=		krita-4.4.8
-PKGREVISION=		38
+PKGREVISION=		39
 CATEGORIES=		graphics kde
 MASTER_SITES=		${MASTER_SITE_KDE:=krita/${PKGVERSION_NOREV}/}
 

Index: pkgsrc/graphics/osg/Makefile
diff -u pkgsrc/graphics/osg/Makefile:1.169 pkgsrc/graphics/osg/Makefile:1.170
--- pkgsrc/graphics/osg/Makefile:1.169	Wed Nov 15 20:00:39 2023
+++ pkgsrc/graphics/osg/Makefile	Sat Dec 30 12:57:53 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.169 2023/11/15 20:00:39 wiz Exp $
+# $NetBSD: Makefile,v 1.170 2023/12/30 12:57:53 wiz Exp $
 
 DISTNAME=	osg-3.6.5
-PKGREVISION=	44
+PKGREVISION=	45
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=openscenegraph/}
 GITHUB_PROJECT=	OpenSceneGraph

Index: pkgsrc/graphics/osg/buildlink3.mk
diff -u pkgsrc/graphics/osg/buildlink3.mk:1.130 pkgsrc/graphics/osg/buildlink3.mk:1.131
--- pkgsrc/graphics/osg/buildlink3.mk:1.130	Wed Nov 15 20:00:39 2023
+++ pkgsrc/graphics/osg/buildlink3.mk	Sat Dec 30 12:57:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.130 2023/11/15 20:00:39 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.131 2023/12/30 12:57:53 wiz Exp $
 
 BUILDLINK_TREE+=	osg
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	osg
 OSG_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.osg+=	osg>=2.8.3
-BUILDLINK_ABI_DEPENDS.osg+=	osg>=3.6.5nb44
+BUILDLINK_ABI_DEPENDS.osg+=	osg>=3.6.5nb45
 BUILDLINK_PKGSRCDIR.osg?=	../../graphics/osg
 
 .include "../../mk/bsd.fast.prefs.mk"
@@ -35,7 +35,8 @@ pkgbase := osg
 .endif
 
 .if ${PKG_BUILD_OPTIONS.osg:Mpdf}
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .endif
 
 .if ${PKG_BUILD_OPTIONS.osg:Msvg}

Index: pkgsrc/graphics/osg/options.mk
diff -u pkgsrc/graphics/osg/options.mk:1.2 pkgsrc/graphics/osg/options.mk:1.3
--- pkgsrc/graphics/osg/options.mk:1.2	Sat Jan 16 14:44:50 2021
+++ pkgsrc/graphics/osg/options.mk	Sat Dec 30 12:57:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2021/01/16 14:44:50 nia Exp $
+# $NetBSD: options.mk,v 1.3 2023/12/30 12:57:53 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.osg
 PKG_SUPPORTED_OPTIONS+=	gdal pdf svg
@@ -14,7 +14,8 @@ CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAG
 .endif
 
 .if !empty(PKG_OPTIONS:Mpdf)
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 PLIST.pdf=	yes
 .else
 CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_Poppler-glib=TRUE

Index: pkgsrc/graphics/pdfpc/Makefile
diff -u pkgsrc/graphics/pdfpc/Makefile:1.27 pkgsrc/graphics/pdfpc/Makefile:1.28
--- pkgsrc/graphics/pdfpc/Makefile:1.27	Mon Nov 27 11:16:41 2023
+++ pkgsrc/graphics/pdfpc/Makefile	Sat Dec 30 12:57:53 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2023/11/27 11:16:41 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2023/12/30 12:57:53 wiz Exp $
 
 DISTNAME=	pdfpc-4.4.0
-PKGREVISION=	25
+PKGREVISION=	26
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pdfpc/}
 GITHUB_PROJECT=	pdfpc
@@ -24,6 +24,7 @@ CONF_FILES+=	${EGDIR}/pdfpcrc	${PKG_SYSC
 .include "../../lang/vala/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../multimedia/gstreamer1/buildlink3.mk"
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/cantor/Makefile
diff -u pkgsrc/math/cantor/Makefile:1.118 pkgsrc/math/cantor/Makefile:1.119
--- pkgsrc/math/cantor/Makefile:1.118	Wed Nov 15 09:25:52 2023
+++ pkgsrc/math/cantor/Makefile	Sat Dec 30 12:57:53 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.118 2023/11/15 09:25:52 wiz Exp $
+# $NetBSD: Makefile,v 1.119 2023/12/30 12:57:53 wiz Exp $
 
 DISTNAME=	cantor-${KAPPSVER}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	math
 
 HOMEPAGE=	https://kde.org/applications/education/cantor/

Index: pkgsrc/misc/calibre/Makefile
diff -u pkgsrc/misc/calibre/Makefile:1.296 pkgsrc/misc/calibre/Makefile:1.297
--- pkgsrc/misc/calibre/Makefile:1.296	Sun Dec 24 09:10:16 2023
+++ pkgsrc/misc/calibre/Makefile	Sat Dec 30 12:57:53 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.296 2023/12/24 09:10:16 spz Exp $
+# $NetBSD: Makefile,v 1.297 2023/12/30 12:57:53 wiz Exp $
 
 # Needs update to 6.9.0
 DISTNAME=	calibre-5.44.0
-PKGREVISION=	17
+PKGREVISION=	18
 CATEGORIES=	misc
 MASTER_SITES=	https://download.calibre-ebook.com/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz

Index: pkgsrc/print/atril/Makefile
diff -u pkgsrc/print/atril/Makefile:1.89 pkgsrc/print/atril/Makefile:1.90
--- pkgsrc/print/atril/Makefile:1.89	Wed Nov 15 09:25:52 2023
+++ pkgsrc/print/atril/Makefile	Sat Dec 30 12:57:53 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.89 2023/11/15 09:25:52 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2023/12/30 12:57:53 wiz Exp $
 
-PKGREVISION= 7
+PKGREVISION= 8
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=	atril-${VERSION:R}.1

Index: pkgsrc/print/atril/options.mk
diff -u pkgsrc/print/atril/options.mk:1.5 pkgsrc/print/atril/options.mk:1.6
--- pkgsrc/print/atril/options.mk:1.5	Tue Nov 14 13:58:36 2023
+++ pkgsrc/print/atril/options.mk	Sat Dec 30 12:57:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2023/11/14 13:58:36 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2023/12/30 12:57:53 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.atril
 PKG_SUPPORTED_OPTIONS=	dbus pdf ps xps dvi djvu tiff gdk-pixbuf keyring introspection
@@ -33,7 +33,8 @@ CONFIGURE_ARGS+=	--disable-xps
 .endif
 
 .if !empty(PKG_OPTIONS:Mpdf)
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-pdf
 PLIST.pdf=	yes
 .else

Index: pkgsrc/print/cups-filters/Makefile
diff -u pkgsrc/print/cups-filters/Makefile:1.181 pkgsrc/print/cups-filters/Makefile:1.182
--- pkgsrc/print/cups-filters/Makefile:1.181	Wed Nov 15 09:25:52 2023
+++ pkgsrc/print/cups-filters/Makefile	Sat Dec 30 12:57:53 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.181 2023/11/15 09:25:52 wiz Exp $
+# $NetBSD: Makefile,v 1.182 2023/12/30 12:57:53 wiz Exp $
 
 DISTNAME=	cups-filters-1.28.16
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	print
 MASTER_SITES=	http://openprinting.org/download/cups-filters/
 EXTRACT_SUFX=	.tar.xz
@@ -94,7 +94,8 @@ post-install:
 .include "../../print/ghostscript/buildlink3.mk"
 .include "../../print/ijs/buildlink3.mk"
 .include "../../print/poppler-cpp/buildlink3.mk"
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../print/poppler-includes/buildlink3.mk"
 .include "../../print/qpdf/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/print/deforaos-pdfviewer/Makefile
diff -u pkgsrc/print/deforaos-pdfviewer/Makefile:1.85 pkgsrc/print/deforaos-pdfviewer/Makefile:1.86
--- pkgsrc/print/deforaos-pdfviewer/Makefile:1.85	Wed Nov 15 09:25:52 2023
+++ pkgsrc/print/deforaos-pdfviewer/Makefile	Sat Dec 30 12:57:53 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2023/11/15 09:25:52 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2023/12/30 12:57:53 wiz Exp $
 
 DISTNAME=	PDFViewer-0.1.0
 PKGNAME=	deforaos-pdfviewer-0.1.0
-PKGREVISION=	22
+PKGREVISION=	23
 CATEGORIES=	print
 MASTER_SITES=	https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/PDFViewer/
 
@@ -36,7 +36,8 @@ post-install:
 
 .include "options.mk"
 
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../x11/deforaos-libdesktop/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/dspdfviewer/Makefile
diff -u pkgsrc/print/dspdfviewer/Makefile:1.58 pkgsrc/print/dspdfviewer/Makefile:1.59
--- pkgsrc/print/dspdfviewer/Makefile:1.58	Fri Dec 29 18:24:56 2023
+++ pkgsrc/print/dspdfviewer/Makefile	Sat Dec 30 12:57:54 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2023/12/29 18:24:56 adam Exp $
+# $NetBSD: Makefile,v 1.59 2023/12/30 12:57:54 wiz Exp $
 
 DISTNAME=	dspdfviewer-1.15.1
-PKGREVISION=	55
+PKGREVISION=	56
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GITHUB:=dannyedel/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}

Index: pkgsrc/print/electrix/Makefile
diff -u pkgsrc/print/electrix/Makefile:1.96 pkgsrc/print/electrix/Makefile:1.97
--- pkgsrc/print/electrix/Makefile:1.96	Wed Nov 15 09:25:52 2023
+++ pkgsrc/print/electrix/Makefile	Sat Dec 30 12:57:54 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2023/11/15 09:25:52 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2023/12/30 12:57:54 wiz Exp $
 
 DISTNAME=	electrix-0.2.0
-PKGREVISION=	91
+PKGREVISION=	92
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=electrix/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +18,8 @@ WAF_HAS_LIBDIR=	no
 WAF_HAS_MANDIR=	no
 
 .include "../../devel/waf/waf.mk"
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

Index: pkgsrc/print/epdfview/Makefile
diff -u pkgsrc/print/epdfview/Makefile:1.130 pkgsrc/print/epdfview/Makefile:1.131
--- pkgsrc/print/epdfview/Makefile:1.130	Wed Nov 15 09:25:53 2023
+++ pkgsrc/print/epdfview/Makefile	Sat Dec 30 12:57:54 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.130 2023/11/15 09:25:53 wiz Exp $
+# $NetBSD: Makefile,v 1.131 2023/12/30 12:57:54 wiz Exp $
 
 DISTNAME=	epdfview-0.1.8
-PKGREVISION=	105
+PKGREVISION=	106
 CATEGORIES=	print
 MASTER_SITES=	http://anduin.linuxfromscratch.org/BLFS/epdfview/
 EXTRACT_SUFX=	.tar.bz2
@@ -17,7 +17,8 @@ USE_TOOLS+=		pkg-config msgfmt
 
 .include "options.mk"
 
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/evince/Makefile
diff -u pkgsrc/print/evince/Makefile:1.168 pkgsrc/print/evince/Makefile:1.169
--- pkgsrc/print/evince/Makefile:1.168	Wed Nov 15 09:25:53 2023
+++ pkgsrc/print/evince/Makefile	Sat Dec 30 12:57:54 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.168 2023/11/15 09:25:53 wiz Exp $
+# $NetBSD: Makefile,v 1.169 2023/12/30 12:57:54 wiz Exp $
 
 DISTNAME=	evince-43.0
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evince/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
@@ -40,7 +40,8 @@ BUILDLINK_API_DEPENDS.libhandy+=	libhand
 .include "../../devel/py-gi-docgen/buildlink3.mk"
 .include "../../graphics/adwaita-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.22.0

Index: pkgsrc/print/lumina-pdf/Makefile
diff -u pkgsrc/print/lumina-pdf/Makefile:1.29 pkgsrc/print/lumina-pdf/Makefile:1.30
--- pkgsrc/print/lumina-pdf/Makefile:1.29	Wed Nov 15 09:25:53 2023
+++ pkgsrc/print/lumina-pdf/Makefile	Sat Dec 30 12:57:54 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2023/11/15 09:25:53 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2023/12/30 12:57:54 wiz Exp $
 
 DISTNAME=	lumina-pdf-1.6.0
-PKGREVISION=	26
+PKGREVISION=	27
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GITHUB:=lumina-desktop/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}

Index: pkgsrc/print/okular/Makefile
diff -u pkgsrc/print/okular/Makefile:1.147 pkgsrc/print/okular/Makefile:1.148
--- pkgsrc/print/okular/Makefile:1.147	Wed Nov 15 09:25:53 2023
+++ pkgsrc/print/okular/Makefile	Sat Dec 30 12:57:54 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.147 2023/11/15 09:25:53 wiz Exp $
+# $NetBSD: Makefile,v 1.148 2023/12/30 12:57:54 wiz Exp $
 
 DISTNAME=	okular-${KAPPSVER}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	print
 
 HOMEPAGE=	https://kde.org/applications/graphics/okular/

Index: pkgsrc/print/pdf2djvu/Makefile
diff -u pkgsrc/print/pdf2djvu/Makefile:1.114 pkgsrc/print/pdf2djvu/Makefile:1.115
--- pkgsrc/print/pdf2djvu/Makefile:1.114	Wed Nov 15 09:25:53 2023
+++ pkgsrc/print/pdf2djvu/Makefile	Sat Dec 30 12:57:54 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.114 2023/11/15 09:25:53 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2023/12/30 12:57:54 wiz Exp $
 
 DISTNAME=	pdf2djvu-0.9.18.2
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GITHUB:=jwilk/}
 GITHUB_RELEASE=	${PKGVERSION_NOREV}

Index: pkgsrc/print/qpdfview/Makefile
diff -u pkgsrc/print/qpdfview/Makefile:1.121 pkgsrc/print/qpdfview/Makefile:1.122
--- pkgsrc/print/qpdfview/Makefile:1.121	Wed Nov 15 09:25:54 2023
+++ pkgsrc/print/qpdfview/Makefile	Sat Dec 30 12:57:54 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.121 2023/11/15 09:25:54 wiz Exp $
+# $NetBSD: Makefile,v 1.122 2023/12/30 12:57:54 wiz Exp $
 
 DISTNAME=	qpdfview-0.4.18
-PKGREVISION=	38
+PKGREVISION=	39
 CATEGORIES=	print
 MASTER_SITES=	https://launchpad.net/qpdfview/trunk/${PKGVERSION_NOREV}/+download/
 

Index: pkgsrc/print/ruby-poppler/Makefile
diff -u pkgsrc/print/ruby-poppler/Makefile:1.31 pkgsrc/print/ruby-poppler/Makefile:1.32
--- pkgsrc/print/ruby-poppler/Makefile:1.31	Wed Nov 15 09:25:54 2023
+++ pkgsrc/print/ruby-poppler/Makefile	Sat Dec 30 12:57:55 2023
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2023/11/15 09:25:54 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.32 2023/12/30 12:57:55 wiz Exp $
 
 DISTNAME=		poppler-${VERSION}
 COMMENT=		Ruby binding of poppler-glib
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		print
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -15,8 +14,8 @@ DEPENDS+=		${RUBY_PKGPREFIX}-gio2>=${VER
 DEPENDS+=		${RUBY_PKGPREFIX}-cairo-gobject>=${VERSION}:../../graphics/ruby-cairo-gobject
 
 .include "../../devel/ruby-gio2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.poppler-glib+=     poppler-glib>=0.79.0nb1
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../meta-pkgs/ruby-gnome/Makefile.common"
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/scribus-qt5/Makefile
diff -u pkgsrc/print/scribus-qt5/Makefile:1.58 pkgsrc/print/scribus-qt5/Makefile:1.59
--- pkgsrc/print/scribus-qt5/Makefile:1.58	Fri Dec 29 18:24:57 2023
+++ pkgsrc/print/scribus-qt5/Makefile	Sat Dec 30 12:57:55 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2023/12/29 18:24:57 adam Exp $
+# $NetBSD: Makefile,v 1.59 2023/12/30 12:57:55 wiz Exp $
 
 DISTNAME=	scribus-1.5.8
-PKGREVISION=	24
+PKGREVISION=	25
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=scribus/}
 EXTRACT_SUFX=	.tar.xz

Index: pkgsrc/print/zathura-pdf-poppler/Makefile
diff -u pkgsrc/print/zathura-pdf-poppler/Makefile:1.66 pkgsrc/print/zathura-pdf-poppler/Makefile:1.67
--- pkgsrc/print/zathura-pdf-poppler/Makefile:1.66	Wed Nov 15 09:25:54 2023
+++ pkgsrc/print/zathura-pdf-poppler/Makefile	Sat Dec 30 12:57:55 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2023/11/15 09:25:54 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2023/12/30 12:57:55 wiz Exp $
 
 DISTNAME=	zathura-pdf-poppler-0.3.0
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	print
 MASTER_SITES=	https://pwmt.org/projects/zathura-pdf-poppler/download/
 EXTRACT_SUFX=	.tar.xz
@@ -17,7 +17,8 @@ PYTHON_FOR_BUILD_ONLY=	tool
 
 .include "../../devel/meson/build.mk"
 .include "../../graphics/girara/buildlink3.mk"
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../print/zathura/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/gnome-tracker-miners/Makefile
diff -u pkgsrc/sysutils/gnome-tracker-miners/Makefile:1.36 pkgsrc/sysutils/gnome-tracker-miners/Makefile:1.37
--- pkgsrc/sysutils/gnome-tracker-miners/Makefile:1.36	Wed Nov 15 09:25:54 2023
+++ pkgsrc/sysutils/gnome-tracker-miners/Makefile	Sat Dec 30 12:57:55 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2023/11/15 09:25:54 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2023/12/30 12:57:55 wiz Exp $
 
 DISTNAME=	tracker-miners-3.0.1
 PKGNAME=	gnome-${DISTNAME}
-PKGREVISION=	29
+PKGREVISION=	30
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/tracker-miners/3.0/}
 EXTRACT_SUFX=	.tar.xz
@@ -56,7 +56,8 @@ PYTHON_FOR_BUILD_ONLY=	tool
 .include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../multimedia/totem-pl-parser/buildlink3.mk"
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/gnome-tracker/buildlink3.mk"
 .include "../../sysutils/upower/buildlink3.mk"

Index: pkgsrc/sysutils/kfilemetadata5/Makefile
diff -u pkgsrc/sysutils/kfilemetadata5/Makefile:1.111 pkgsrc/sysutils/kfilemetadata5/Makefile:1.112
--- pkgsrc/sysutils/kfilemetadata5/Makefile:1.111	Wed Nov 15 09:25:54 2023
+++ pkgsrc/sysutils/kfilemetadata5/Makefile	Sat Dec 30 12:57:55 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.111 2023/11/15 09:25:54 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2023/12/30 12:57:55 wiz Exp $
 
 DISTNAME=	kfilemetadata-${KF5VER}
 PKGNAME=	${DISTNAME:S/-/5-/}
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	sysutils
 
 HOMEPAGE=	https://community.kde.org/Frameworks

Index: pkgsrc/textproc/pdfgrep/Makefile
diff -u pkgsrc/textproc/pdfgrep/Makefile:1.71 pkgsrc/textproc/pdfgrep/Makefile:1.72
--- pkgsrc/textproc/pdfgrep/Makefile:1.71	Wed Nov 15 09:25:54 2023
+++ pkgsrc/textproc/pdfgrep/Makefile	Sat Dec 30 12:57:55 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2023/11/15 09:25:54 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2023/12/30 12:57:55 wiz Exp $
 
 DISTNAME=	pdfgrep-2.1.2
-PKGREVISION=	25
+PKGREVISION=	26
 CATEGORIES=	textproc
 MASTER_SITES=	https://pdfgrep.org/download/
 

Index: pkgsrc/x11/qt5-qtwebengine/Makefile
diff -u pkgsrc/x11/qt5-qtwebengine/Makefile:1.57 pkgsrc/x11/qt5-qtwebengine/Makefile:1.58
--- pkgsrc/x11/qt5-qtwebengine/Makefile:1.57	Wed Nov 15 09:25:55 2023
+++ pkgsrc/x11/qt5-qtwebengine/Makefile	Sat Dec 30 12:57:55 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.57 2023/11/15 09:25:55 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2023/12/30 12:57:55 wiz Exp $
 
 DISTNAME=	qtwebengine-everywhere-opensource-src-${QTVERSION}
 PKGNAME=	qt5-qtwebengine-${QTVERSION}
-PKGREVISION=	6
+PKGREVISION=	7
 COMMENT=	Chromium-based web engine for Qt5
 
 MAKE_ENV+=		QTDIR=${QTDIR}

Index: pkgsrc/x11/xfce4-tumbler/Makefile
diff -u pkgsrc/x11/xfce4-tumbler/Makefile:1.124 pkgsrc/x11/xfce4-tumbler/Makefile:1.125
--- pkgsrc/x11/xfce4-tumbler/Makefile:1.124	Sat Dec 30 02:24:50 2023
+++ pkgsrc/x11/xfce4-tumbler/Makefile	Sat Dec 30 12:57:55 2023
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.124 2023/12/30 02:24:50 gutteridge Exp $
+# $NetBSD: Makefile,v 1.125 2023/12/30 12:57:55 wiz Exp $
 
+PKGREVISION= 1
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 VERSION=	4.18.2

Index: pkgsrc/x11/xfce4-tumbler/options.mk
diff -u pkgsrc/x11/xfce4-tumbler/options.mk:1.1 pkgsrc/x11/xfce4-tumbler/options.mk:1.2
--- pkgsrc/x11/xfce4-tumbler/options.mk:1.1	Tue Apr 21 08:56:45 2015
+++ pkgsrc/x11/xfce4-tumbler/options.mk	Sat Dec 30 12:57:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/04/21 08:56:45 jperkin Exp $
+# $NetBSD: options.mk,v 1.2 2023/12/30 12:57:55 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.tumbler
 PKG_SUPPORTED_OPTIONS=	jpeg ffmpegthumbnailer pdf odf
@@ -17,7 +17,8 @@ PLIST.jpeg=	yes
 PLIST.ffmpegthumbnailer=	yes
 .endif
 .if !empty(PKG_OPTIONS:Mpdf)
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 PLIST.pdf=	yes
 .endif
 .if !empty(PKG_OPTIONS:Modf)


--_----------=_1703941076196230--