*: switch from poppler-glib to poppler

[Thomas Klausner <wiz%gatalith.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Sat Dec 30 14:03:20 2023 +0100
Changeset:	0772f2a13920e826d9098d0f3cc286e3bc550ff8

Modified Files:
	apvlv/Makefile
	glimpse/Makefile
	graphviz/options.mk
	inkscape/Makefile
	meta-tracker/buildlink3.mk
	meta-tracker/options.mk
	xournalpp-git/Makefile

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

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0772f2a13920e826d9098d0f3cc286e3bc550ff8

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

diffstat:
 apvlv/Makefile             | 4 ++--
 glimpse/Makefile           | 3 ++-
 graphviz/options.mk        | 3 ++-
 inkscape/Makefile          | 3 ++-
 meta-tracker/buildlink3.mk | 3 ++-
 meta-tracker/options.mk    | 3 ++-
 xournalpp-git/Makefile     | 3 ++-
 7 files changed, 14 insertions(+), 8 deletions(-)

diffs:
diff --git a/apvlv/Makefile b/apvlv/Makefile
index e7cc1aec65..8ab7adf803 100644
--- a/apvlv/Makefile
+++ b/apvlv/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.8 2012/09/24 16:56:38 asau Exp $
-#
 
 DISTNAME=	apvlv-0.1.5
 CATEGORIES=	print
@@ -21,7 +20,8 @@ SUBST_MESSAGE.cmakelists=	Fixing CMakeLists.txt
 SUBST_FILES.cmakelists=		CMakeLists.txt
 SUBST_SED.cmakelists+=		-e 's,share/man,${PKGMANDIR},g'
 
-.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/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/glimpse/Makefile b/glimpse/Makefile
index 41135c7f89..344a2dc2b6 100644
--- a/glimpse/Makefile
+++ b/glimpse/Makefile
@@ -94,7 +94,8 @@ BUILDLINK_API_DEPENDS.gegl+=		gegl>=0.4.18
 .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 "../../textproc/iso-codes/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .if !empty(PKG_BUILD_OPTIONS.gtk2:Mx11)
diff --git a/graphviz/options.mk b/graphviz/options.mk
index 3a384a55d0..c43e24d7c7 100644
--- a/graphviz/options.mk
+++ b/graphviz/options.mk
@@ -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
diff --git a/inkscape/Makefile b/inkscape/Makefile
index 7f1e1f3ef6..896c9fb697 100644
--- a/inkscape/Makefile
+++ b/inkscape/Makefile
@@ -126,7 +126,8 @@ BUILDLINK_API_DEPENDS.harfbuzz+=	harfbuzz>=2.2
 .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/aspell/buildlink3.mk"
 .include "../../textproc/gtkspell3/buildlink3.mk"
diff --git a/meta-tracker/buildlink3.mk b/meta-tracker/buildlink3.mk
index 928966703a..42619fbc59 100644
--- a/meta-tracker/buildlink3.mk
+++ b/meta-tracker/buildlink3.mk
@@ -47,7 +47,8 @@ pkgbase := meta-tracker
 
 .if !empty(PKG_BUILD_OPTIONS.meta-tracker:Mpdf)
 .include "../../print/poppler-includes/buildlink3.mk"
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .endif
 
 .if !empty(PKG_BUILD_OPTIONS.meta-tracker:Mjpeg)
diff --git a/meta-tracker/options.mk b/meta-tracker/options.mk
index 477424e792..f9984b4d7b 100644
--- a/meta-tracker/options.mk
+++ b/meta-tracker/options.mk
@@ -95,7 +95,8 @@ CONFIGURE_ARGS+=	--enable-libgxps
 PLIST.pdf=		yes
 CONFIGURE_ARGS+=	--enable-poppler
 .include "../../print/poppler-includes/buildlink3.mk"
-.include "../../print/poppler-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.poppler+=	poppler>=23.12.0
+.include "../../print/poppler/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mgif)
diff --git a/xournalpp-git/Makefile b/xournalpp-git/Makefile
index f7873fd523..f1480fc616 100644
--- a/xournalpp-git/Makefile
+++ b/xournalpp-git/Makefile
@@ -27,7 +27,8 @@ DEPENDS+=	tex-standalone-[0-9]*:../../print/tex-standalone
 .include "../../archivers/libzip/buildlink3.mk"
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/portaudio/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 "../../x11/gtk3/buildlink3.mk"
 .include "../../wip/mk/git-package.mk"