Page MenuHomeFreeBSD
Files F147000886

D37666.diff
No OneTemporary
Actions

D37666.diff
View Options

Index: CHANGES
===================================================================
--- CHANGES
+++ CHANGES
@@ -10,6 +10,17 @@
All ports committers are allowed to commit to this file.
+20221210
+ A new USES file has been introduced: USES=poppler:[args], which introduces a
+ dependency (depending on [arg])
+ <none> LIB_DEPENDS on graphics/poppler
+ lib: same as <none>
+ glib: LIB_DEPENDS on graphics/poppler-glib (and lib)
+ qt5: LIB_DEPENDS on graphics/poppler-qt5 (and lib)
+ qt6: LIB_DEPENDS on graphics/poppler-qt6 (and lib)
+ utils: RUN_DEPENDS on graphics/poppler-utils
+ utils_build: BUILD_DEPENDS on graphics/poppler-utils
+
20221026:
AUTHOR: bapt@FreeBSD.org
3 new features are available now: PIE, RELRO, BIND_NOW, each port can
Index: Mk/Uses/poppler.mk
===================================================================
--- /dev/null
+++ Mk/Uses/poppler.mk
@@ -0,0 +1,50 @@
+# Handle dependency on poppler
+#
+# Feature: poppler
+# Usage: USES=poppler:ARGS
+# Valid ARGS: <none>,lib,glib,qt5,qt6,utils,utils_build
+# for usage by the ports tree:
+# <none>: default = lib
+# lib: LIB_DEPEND on graphics/poppler
+# glib: LIB_DEPEND on graphics/poppler-glib implies lib
+# qt5: LIB_DPEEND on graphics/poppler-qt5 implies lib
+# qt6: LIB_DEPEND on graphics/poppler-qt6 implies lib
+# utils: RUN_DEPEND on graphics/poppler-utils
+# utils_build: BUILD_DEPEND on graphics/poppler-utils
+# for internal use:
+# selfbuild: only used by graphics/poppler to get _POPPLER_VERSION
+
+.if ! defined(_INCLUDE_USES_POPPLER_MK)
+_INCLUDE_USES_POPPLER_MK= YES
+
+_POPPLER_ARGS= selfbuild lib glib qt5 qt6 utils utils_build
+
+_POPPLER_VERSION= 22.12.0
+
+. if empty(poppler_ARGS:Mselfbuild)
+# === Dependency definitions ===
+_POPPLER_lib_LIB_DEPENDS= libpoppler.so:graphics/poppler
+_POPPLER_glib_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib \
+ ${_POPPLER_lib_LIB_DEPENDS}
+_POPPLER_qt5_LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 \
+ ${_POPPLER_lib_LIB_DEPENDS}
+_POPPLER_qt6_LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt6 \
+ ${_POPPLER_lib_LIB_DEPENDS}
+_POPPLER_utils_RUN_DEPENDS= poppler-utils>=${_POPPLER_VERSION}:graphics/poppler-utils
+_POPPLER_build_utils_RUN_DEPENDS= poppler-utils>=${_POPPLER_VERSION}:graphics/poppler-utils
+
+# === Handle default argument ===
+. if empty(poppler_ARGS)
+poppler_ARGS= lib
+. endif
+
+# === Gather all dependencies required ===
+_POPPLER_DEPENDS:= ${poppler_ARGS}
+
+# === Append dependencies ===
+. for _kind in LIB BUILD RUN
+_POPPLER_${_kind}_DEPENDS:= ${_POPPLER_DEPENDS:S/^/\${_POPPLER_/:S/$/_${_kind}_DEPENDS}/}
+${_kind}_DEPENDS+= ${_POPPLER_${_kind}_DEPENDS:O:u}
+. endfor
+. endif
+.endif
Index: converters/pdf2djvu/Makefile
===================================================================
--- converters/pdf2djvu/Makefile
+++ converters/pdf2djvu/Makefile
@@ -17,11 +17,10 @@
LICENSE_FILE= ${WRKSRC}/doc/COPYING
BUILD_DEPENDS= ${LOCALBASE}/include/pstreams/pstream.h:devel/pstreams
-LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre \
- libpoppler.so:graphics/poppler
+LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre
USES= autoreconf:build compiler:c++17-lang gettext-tools \
- gmake iconv localbase pkgconfig tar:xz
+ gmake iconv localbase pkgconfig poppler tar:xz
USE_CXXSTD= c++17
GNU_CONFIGURE= yes
Index: databases/kbibtex/Makefile
===================================================================
--- databases/kbibtex/Makefile
+++ databases/kbibtex/Makefile
@@ -9,12 +9,10 @@
WWW= https://userbase.kde.org/KBibTeX
LIB_DEPENDS= libicuuc.so:devel/icu \
- libpoppler.so:graphics/poppler \
- libpoppler-qt5.so:graphics/poppler-qt5 \
libqoauth-qt5.so:net/qoauth-qt5
USES= cmake compiler:c++11-lang desktop-file-utils gettext gnome \
- iconv kde:5 qca qt:5 shared-mime-info tar:xz xorg
+ iconv kde:5 poppler:qt5 qca qt:5 shared-mime-info tar:xz xorg
USE_GNOME= libxml2 libxslt
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash ecm i18n iconthemes itemviews jobwidgets \
Index: deskutils/bookworm/Makefile
===================================================================
--- deskutils/bookworm/Makefile
+++ deskutils/bookworm/Makefile
@@ -15,17 +15,15 @@
LIB_DEPENDS= libappstream-glib.so:devel/appstream-glib \
libgee-0.8.so:devel/libgee \
libgranite.so:x11-toolkits/granite \
- libpoppler-glib.so:graphics/poppler-glib \
libsoup-2.4.so:devel/libsoup \
libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
libxml2.so:textproc/libxml2
RUN_DEPENDS= bash:shells/bash \
- pdftohtml:graphics/poppler-utils \
unar:archivers/unarchiver \
unzip:archivers/unzip
USES= desktop-file-utils gettext gnome meson pkgconfig \
- python shebangfix sqlite vala:build
+ poppler:glib,utils python shebangfix sqlite vala:build
USE_GITHUB= yes
GH_ACCOUNT= babluboy
USE_GNOME= gdkpixbuf2 glib20 gtk30 libxml2 pango
Index: deskutils/calibre/Makefile
===================================================================
--- deskutils/calibre/Makefile
+++ deskutils/calibre/Makefile
@@ -11,7 +11,6 @@
LICENSE= GPLv3
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
- libpoppler-qt5.so:graphics/poppler-qt5 \
libwmflite.so:graphics/libwmf \
libchm.so:misc/chmlib \
libicudata.so:devel/icu \
@@ -52,11 +51,10 @@
${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.8:textproc/py-feedparser@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}jeepney>=0.6:devel/py-jeepney@${PY_FLAVOR} \
${PY_PILLOW} \
- pdftohtml:graphics/poppler-utils \
${PYTHON_PKGNAMEPREFIX}zeroconf>0:net/py-zeroconf
USES= desktop-file-utils gettext-runtime gl gnome localbase:ldflags \
- pkgconfig pyqt:5 python:3.8+ qt:5 shared-mime-info shebangfix \
+ pkgconfig poppler:qt5,utils pyqt:5 python:3.8+ qt:5 shared-mime-info shebangfix \
ssl tar:xz xorg
USE_RC_SUBR= calibre
SUB_LIST+= PYTHON_VERSION=${PYTHON_VERSION}
Index: deskutils/cfiles/Makefile
===================================================================
--- deskutils/cfiles/Makefile
+++ deskutils/cfiles/Makefile
@@ -14,10 +14,9 @@
RUN_DEPENDS= ${LOCALBASE}/libexec/w3m/w3mimgdisplay:www/w3m-img \
atool:archivers/atool \
- bash:shells/bash \
- pdftoppm:graphics/poppler-utils
+ bash:shells/bash
-USES= shebangfix
+USES= shebangfix poppler:utils
SHEBANG_FILES= scripts/*
USE_GITHUB= yes
GH_ACCOUNT= mananapr
Index: deskutils/lumina-pdf/Makefile
===================================================================
--- deskutils/lumina-pdf/Makefile
+++ deskutils/lumina-pdf/Makefile
@@ -36,8 +36,8 @@
NLS_QMAKE_ON= CONFIG+=WITH_I18N
NLS_USE= qt=linguist:build
+POPPLER_USES= poppler:qt5
POPPLER_QMAKE_ON= USE_POPPLER=true
-POPPLER_LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
WRKSRC_SUBDIR= src-qt5
Index: deskutils/recoll/Makefile
===================================================================
--- deskutils/recoll/Makefile
+++ deskutils/recoll/Makefile
@@ -54,7 +54,7 @@
IMAGE_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool
LATEX_USE= dvipsk:run \
latex:run
-PDF_RUN_DEPENDS= pdftotext:graphics/poppler-utils
+PDF_USES= poppler:utils
PS_RUN_DEPENDS= pstotext:print/pstotext
QT5_USES= gl qt:5
QT5_USE= GL=gl
Index: deskutils/xfce4-tumbler/Makefile
===================================================================
--- deskutils/xfce4-tumbler/Makefile
+++ deskutils/xfce4-tumbler/Makefile
@@ -66,7 +66,7 @@
ODF_CONFIGURE_ENABLE= odf-thumbnailer
ODF_USE= gnome=libgsf
+POPPLER_USES= poppler:glib
POPPLER_CONFIGURE_ENABLE= poppler-thumbnailer
-POPPLER_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
.include <bsd.port.mk>
Index: devel/efl/Makefile
===================================================================
--- devel/efl/Makefile
+++ devel/efl/Makefile
@@ -145,7 +145,7 @@
GNUTLS_CFLAGS= -I${LOCALBASE}/include/gnutls/
GNUTLS_BROKEN= GNUTLS option is broken by the upstream bug: https://phab.enlightenment.org/T8807
-PDF_LIB_DEPENDS= libpoppler.so:graphics/poppler
+PDF_USES= poppler
PDF_VARS_OFF= pdf_disabler=pdf
PS_LIB_DEPENDS= libspectre.so:print/libspectre
Index: devel/kf5-kfilemetadata/Makefile
===================================================================
--- devel/kf5-kfilemetadata/Makefile
+++ devel/kf5-kfilemetadata/Makefile
@@ -9,13 +9,11 @@
LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \
libepub.so:textproc/ebook-tools \
libexiv2.so:graphics/exiv2 \
- libpoppler.so:graphics/poppler \
- libpoppler-qt5.so:graphics/poppler-qt5 \
libtag.so:audio/taglib
# TODO: maybe depend on textproc/catdoc
USES= cmake compiler:c++11-lib gettext kde:5 pkgconfig \
- qt:5 tar:xz
+ poppler:qt5 qt:5 tar:xz
USE_KDE= archive config coreaddons i18n \
ecm:build
USE_QT= core gui xml \
Index: editors/calligra/Makefile
===================================================================
--- editors/calligra/Makefile
+++ editors/calligra/Makefile
@@ -29,8 +29,6 @@
libKGantt.so:graphics/kdiagram \
libodfgen-0.1.so:textproc/libodfgen01 \
libpng.so:graphics/png \
- libpoppler-qt5.so:graphics/poppler-qt5 \
- libpoppler.so:graphics/poppler \
librevenge-0.0.so:textproc/librevenge \
libtiff.so:graphics/tiff \
libvisio-0.1.so:textproc/libvisio01 \
@@ -43,7 +41,7 @@
USES= cmake cpe compiler:c++17-lang desktop-file-utils eigen:3 \
gettext iconv:translit jpeg kde:5 localbase:ldflags perl5 \
- pkgconfig qca qt:5 shared-mime-info sqlite tar:xz xorg
+ pkgconfig poppler:qt5 qca qt:5 shared-mime-info sqlite tar:xz xorg
USE_KDE= akonadicontacts activities archive auth bookmarks codecs completion \
config configwidgets contacts coreaddons crash dbusaddons doctools ecm \
emoticons guiaddons holidays i18n iconthemes init itemmodels itemviews \
Index: editors/gummi/Makefile
===================================================================
--- editors/gummi/Makefile
+++ editors/gummi/Makefile
@@ -13,11 +13,10 @@
BUILD_DEPENDS= msgfmt:devel/gettext
LIB_DEPENDS= libenchant-2.so:textproc/enchant2 \
libgtkspell3-3.so:textproc/gtkspell3 \
- libpoppler-glib.so:graphics/poppler-glib \
libsynctex.so:devel/tex-synctex
RUN_DEPENDS= etex:print/tex-formats
-USES= cpe desktop-file-utils gmake gnome iconv pkgconfig xorg
+USES= cpe desktop-file-utils gmake gnome iconv pkgconfig poppler:glib xorg
CPE_VENDOR= ${PORTNAME}_project
GNU_CONFIGURE= yes
USE_XORG= xcomposite xcursor xdamage xft
Index: editors/kile/Makefile
===================================================================
--- editors/kile/Makefile
+++ editors/kile/Makefile
@@ -11,11 +11,8 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libpoppler.so:graphics/poppler \
- libpoppler-qt5.so:graphics/poppler-qt5
-
USES= cmake compiler:c++11-lang cpe desktop-file-utils kde:5 \
- qt:5 shared-mime-info shebangfix xorg
+ poppler:qt5 qt:5 shared-mime-info shebangfix xorg
USE_KDE= auth bookmarks codecs completion config configwidgets \
coreaddons crash dbusaddons ecm guiaddons i18n iconthemes \
init itemviews jobwidgets js khtml kio okular parts service \
Index: editors/libreoffice/Makefile
===================================================================
--- editors/libreoffice/Makefile
+++ editors/libreoffice/Makefile
@@ -49,7 +49,6 @@
libwpg-0.3.so:graphics/libwpg03 \
libzmf-0.0.so:graphics/libzmf \
libpng.so:graphics/png \
- libpoppler.so:graphics/poppler \
libqrcodegencpp.so:graphics/qr-code-generator \
libwebp.so:graphics/webp \
liblpsolve55.so:math/lp_solve \
@@ -119,7 +118,7 @@
GNU_CONFIGURE= yes
USES= autoreconf:build bison compiler:c++17-lang cpe desktop-file-utils \
- gettext gl gmake gnome jpeg localbase:ldflags perl5 pkgconfig \
+ gettext gl gmake gnome jpeg localbase:ldflags perl5 pkgconfig poppler \
python:3.8+ shebangfix shared-mime-info ssl tar:xz xorg
USE_GL= gl glew glu
USE_GNOME= cairo glib20 libxml2 libxslt
Index: editors/setzer/Makefile
===================================================================
--- editors/setzer/Makefile
+++ editors/setzer/Makefile
@@ -13,13 +13,12 @@
BUILD_DEPENDS= itstool:textproc/itstool
LIB_DEPENDS= libgspell-1.so:textproc/gspell \
- libpoppler-glib.so:graphics/poppler-glib \
libwebkit2gtk-4.0.so:www/webkit2-gtk3
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pdfminer.six>=0:textproc/py-pdfminer.six@${PY_FLAVOR} \
xdg-open:devel/xdg-utils
-USES= desktop-file-utils gettext gnome meson pkgconfig python:3.5+ \
+USES= desktop-file-utils gettext gnome meson pkgconfig poppler:glib python:3.5+ \
shebangfix
USE_GITHUB= yes
GH_ACCOUNT= cvfosammmm
Index: editors/texstudio/Makefile
===================================================================
--- editors/texstudio/Makefile
+++ editors/texstudio/Makefile
@@ -12,12 +12,10 @@
BROKEN_armv6= fails to compile: error: no member named mc_eip in __mcontext
LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell \
- libpoppler.so:graphics/poppler \
- libpoppler-qt5.so:graphics/poppler-qt5 \
libquazip1-qt5.so:archivers/quazip
USES= compiler:c++11-lang desktop-file-utils dos2unix \
- ghostscript:run gl pkgconfig qmake qt:5 xorg
+ ghostscript:run gl pkgconfig poppler:qt5 qmake qt:5 xorg
USE_GITHUB= yes
GH_ACCOUNT= ${PORTNAME}-org
Index: editors/texworks/Makefile
===================================================================
--- editors/texworks/Makefile
+++ editors/texworks/Makefile
@@ -12,12 +12,10 @@
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= hunspell:textproc/hunspell
-LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell \
- libpoppler.so:graphics/poppler \
- libpoppler-qt5.so:graphics/poppler-qt5
+LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell
USES= compiler:c++11-lang cmake desktop-file-utils pkgconfig \
- qt:5
+ poppler:qt5 qt:5
USE_GITHUB= yes
GH_ACCOUNT= TeXworks
USE_QT= buildtools:build designer:build qmake:build \
Index: graphics/atril/Makefile
===================================================================
--- graphics/atril/Makefile
+++ graphics/atril/Makefile
@@ -16,8 +16,7 @@
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= itstool:textproc/itstool
-LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib \
- libsoup-2.4.so:devel/libsoup \
+LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libtiff.so:graphics/tiff \
@@ -27,7 +26,7 @@
SLAVEPORT?= no
USES= compiler:c11 desktop-file-utils gettext gmake gnome libarchive \
- libtool mate pathfix pkgconfig tar:xz xorg
+ libtool mate pathfix pkgconfig poppler:glib tar:xz xorg
USE_MATE= icontheme
USE_XORG= ice sm x11
USE_GNOME= cairo gtk30 intlhack libxml2
Index: graphics/diff-pdf/Makefile
===================================================================
--- graphics/diff-pdf/Makefile
+++ graphics/diff-pdf/Makefile
@@ -11,10 +11,7 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libpoppler.so:graphics/poppler \
- libpoppler-glib.so:graphics/poppler-glib
-
-USES= autoreconf compiler:c++11-lang gnome pkgconfig
+USES= autoreconf compiler:c++11-lang gnome pkgconfig poppler:glib
USE_GITHUB= yes
GH_ACCOUNT= vslavik
GH_TAGNAME= d494f96
Index: graphics/diffpdf/Makefile
===================================================================
--- graphics/diffpdf/Makefile
+++ graphics/diffpdf/Makefile
@@ -10,9 +10,7 @@
LICENSE= GPLv2+
-LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
-
-USES= compiler:c++11-lang qmake qt:5 gl
+USES= compiler:c++11-lang poppler:qt5 qmake qt:5 gl
USE_GL= gl
USE_QT= buildtools linguist:build core gui printsupport widgets
Index: graphics/dspdfviewer/Makefile
===================================================================
--- graphics/dspdfviewer/Makefile
+++ graphics/dspdfviewer/Makefile
@@ -11,10 +11,9 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \
- libpoppler-qt5.so:graphics/poppler-qt5
+LIB_DEPENDS= libboost_program_options.so:devel/boost-libs
-USES= cmake:insource compiler:c++14-lang pkgconfig qt:5
+USES= cmake:insource compiler:c++14-lang pkgconfig poppler:qt5 qt:5
USE_QT= core gui linguisttools widgets xml buildtools:build qmake:build
USE_LDCONFIG= yes
Index: graphics/engauge-digitizer/Makefile
===================================================================
--- graphics/engauge-digitizer/Makefile
+++ graphics/engauge-digitizer/Makefile
@@ -13,10 +13,9 @@
LIB_DEPENDS= libfftw3.so:math/fftw3 \
liblog4cpp.so:devel/log4cpp \
- libopenjp2.so:graphics/openjpeg \
- libpoppler-qt5.so:graphics/poppler-qt5
+ libopenjp2.so:graphics/openjpeg
-USES= compiler:c++11-lang desktop-file-utils gl pkgconfig qmake qt:5 # pkgconfig is for https://github.com/markummitchell/engauge-digitizer/issues/423
+USES= compiler:c++11-lang desktop-file-utils gl pkgconfig poppler:qt5 qmake qt:5 # pkgconfig is for https://github.com/markummitchell/engauge-digitizer/issues/423
USE_GITHUB= yes
GH_ACCOUNT= markummitchell
USE_QT= core gui printsupport sql xml widgets buildtools:build
Index: graphics/epdfview/Makefile
===================================================================
--- graphics/epdfview/Makefile
+++ graphics/epdfview/Makefile
@@ -14,10 +14,9 @@
LICENSE= GPLv2
BUILD_DEPENDS= cppunit-config:devel/cppunit
-LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
USES= compiler:c++11-lang desktop-file-utils gmake gnome iconv \
- pkgconfig tar:bzip2
+ pkgconfig poppler:glib tar:bzip2
GNU_CONFIGURE= yes
USE_GNOME= gtk20 intlhack
CPPFLAGS+= -I${LOCALBASE}/include
Index: graphics/evince/Makefile
===================================================================
--- graphics/evince/Makefile
+++ graphics/evince/Makefile
@@ -20,7 +20,6 @@
itstool:textproc/itstool
LIB_DEPENDS= libfribidi.so:converters/fribidi \
libhandy-1.so:x11-toolkits/libhandy \
- libpoppler-glib.so:graphics/poppler-glib \
libspectre.so:print/libspectre \
libtiff.so:graphics/tiff
RUN_DEPENDS= adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme \
@@ -30,7 +29,7 @@
SLAVEPORT?= no
USES= compiler:c++11-lib cpe desktop-file-utils gettext gnome gstreamer libarchive \
- localbase:ldflags meson pkgconfig tar:xz xorg
+ localbase:ldflags meson pkgconfig poppler:glib tar:xz xorg
USE_GNOME= cairo gdkpixbuf2 gtk30
USE_LDCONFIG= yes
USE_XORG= ice
Index: graphics/gdal/Makefile
===================================================================
--- graphics/gdal/Makefile
+++ graphics/gdal/Makefile
@@ -154,8 +154,8 @@
PGSQL_USES= pgsql
PODOFO_CONFIGURE_WITH= podofo
PODOFO_LIB_DEPENDS= libpodofo.so:graphics/podofo
+POPPLER_USES= poppler
POPPLER_CONFIGURE_WITH= poppler=${LOCALBASE}
-POPPLER_LIB_DEPENDS= libpoppler.so:graphics/poppler
RASTERLITE2_CONFIGURE_OFF= --with-rasterlite2=no
RASTERLITE2_CONFIGURE_ON= --with-rasterlite2=${LOCALBASE}
RASTERLITE2_LIB_DEPENDS=librasterlite2.so:graphics/librasterlite2
Index: graphics/geeqie/Makefile
===================================================================
--- graphics/geeqie/Makefile
+++ graphics/geeqie/Makefile
@@ -51,7 +51,7 @@
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
TIFF_MESON_ENABLED= tiff
-PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
+PDF_USES= poppler:glib
PDF_MESON_ENABLED= pdf
FFMPEGTHUMBNAILER_DESC= Video file thumbnails generating support
Index: graphics/gegl/Makefile
===================================================================
--- graphics/gegl/Makefile
+++ graphics/gegl/Makefile
@@ -56,7 +56,7 @@
PANGO_USE= GNOME=pango
PANGO_MESON_ENABLED= pango
-POPPLER_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
+POPPLER_USES= poppler:glib
POPPLER_MESON_ENABLED= poppler
ENSCRIPT_DESC= Enscript support
Index: graphics/gimp-app/Makefile
===================================================================
--- graphics/gimp-app/Makefile
+++ graphics/gimp-app/Makefile
@@ -30,7 +30,6 @@
liblcms2.so:graphics/lcms2 \
libmypaint.so:graphics/libmypaint \
libpng.so:graphics/png \
- libpoppler-glib.so:graphics/poppler-glib \
libtiff.so:graphics/tiff
LIB_DEPENDS+= ${LIB_DEPENDS_${ARCH}}
@@ -46,7 +45,7 @@
mypaint-brushes>0:graphics/mypaint-brushes
USES+= compiler:c++14-lang cpe gettext gmake gnome jpeg libtool \
- localbase pkgconfig shebangfix tar:bzip2 xorg
+ localbase pkgconfig poppler:glib shebangfix tar:bzip2 xorg
CPE_VENDOR= gimp
CPE_PRODUCT= gimp
USE_GNOME+= cairo gtk20 intltool librsvg2
Index: graphics/graphviz/Makefile
===================================================================
--- graphics/graphviz/Makefile
+++ graphics/graphviz/Makefile
@@ -102,7 +102,7 @@
GO_USES= go:no_targets
DOCS_USES= ghostscript:build groff
-POPPLER_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
+POPPLER_USES= poppler:glib
ANN_LIB_DEPENDS= libann.so:math/ann
GTS_LIB_DEPENDS= libgts.so:graphics/gts
SMYRNA_LIB_DEPENDS= libgtkgl-2.0.so:x11-toolkits/gtkglarea2 \
Index: graphics/impressive/Makefile
===================================================================
--- graphics/impressive/Makefile
+++ graphics/impressive/Makefile
@@ -56,7 +56,7 @@
XDG_RUN_DEPENDS= xdg-open:devel/xdg-utils
GHOSTSCRIPT_USES= ghostscript:run
MUPDF_RUN_DEPENDS= mupdf:graphics/mupdf
-POPPLER_RUN_DEPENDS= pdftoppm:graphics/poppler-utils
+POPPLER_USES= poppler:utils
XPDF_RUN_DEPENDS= ${LOCALBASE}/libexec/xpdf/pdftoppm:graphics/xpdf
do-install:
Index: graphics/inkscape/Makefile
===================================================================
--- graphics/inkscape/Makefile
+++ graphics/inkscape/Makefile
@@ -87,8 +87,7 @@
POPPLER_DESC= PDF preview rendering
POPPLER_CMAKE_BOOL= ENABLE_POPPLER ENABLE_POPPLER_CAIRO
-POPPLER_LIB_DEPENDS= libpoppler.so:graphics/poppler \
- libpoppler-glib.so:graphics/poppler-glib
+POPPLER_USES= poppler:glib
SCRIBUS_DESC= Support color-managed PDF export using Scribus (experimental)
SCRIBUS_RUN_DEPENDS= scribus:print/scribus-devel
Index: graphics/katarakt/Makefile
===================================================================
--- graphics/katarakt/Makefile
+++ graphics/katarakt/Makefile
@@ -11,9 +11,8 @@
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= a2x:textproc/asciidoc
-LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
-USES= compiler:c++11-lang gl pkgconfig qmake qt:5
+USES= compiler:c++11-lang gl pkgconfig poppler:qt5 qmake qt:5
USE_QT= buildtools:build core gui xml dbus network widgets
USE_GL= gl
Index: graphics/krita/Makefile
===================================================================
--- graphics/krita/Makefile
+++ graphics/krita/Makefile
@@ -31,8 +31,6 @@
liblcms2.so:graphics/lcms2 \
libmypaint.so:graphics/libmypaint \
libpng.so:graphics/png \
- libpoppler.so:graphics/poppler \
- libpoppler-qt5.so:graphics/poppler-qt5 \
libquazip1-qt5.so:archivers/quazip \
libraw.so:graphics/libraw \
libtiff.so:graphics/tiff \
@@ -42,7 +40,7 @@
# Disable ninja generator for now (with gmake), until the duplicate test targets are resolved upstream.
USES= cmake:noninja gmake compiler:c++11-lib desktop-file-utils \
- eigen:3 gettext jpeg kde:5 localbase:ldflags pkgconfig \
+ eigen:3 gettext jpeg kde:5 localbase:ldflags pkgconfig poppler:qt5 \
python:3.7+ qt:5 shared-mime-info tar:xz xorg
USE_KDE= archive completion config coreaddons crash guiaddons i18n \
itemmodels itemviews kio service widgetsaddons windowsystem
Index: graphics/okular/Makefile
===================================================================
--- graphics/okular/Makefile
+++ graphics/okular/Makefile
@@ -16,14 +16,12 @@
libepub.so:textproc/ebook-tools \
libfreetype.so:print/freetype2 \
libqmobipocket.so:graphics/kdegraphics-mobipocket \
- libpoppler.so:graphics/poppler \
- libpoppler-qt5.so:graphics/poppler-qt5 \
libspectre.so:print/libspectre \
libtiff.so:graphics/tiff \
libzip.so:archivers/libzip
USES= cmake compiler:c++11-lib desktop-file-utils \
- gettext jpeg kde:5 cpe pkgconfig qca qt:5 tar:xz xorg
+ gettext jpeg kde:5 cpe pkgconfig poppler:qt5 qca qt:5 tar:xz xorg
USE_KDE= activities archive auth bookmarks codecs completion config \
configwidgets coreaddons crash dbusaddons emoticons i18n \
iconthemes init itemmodels itemviews jobwidgets js \
Index: graphics/openfx-arena/Makefile
===================================================================
--- graphics/openfx-arena/Makefile
+++ graphics/openfx-arena/Makefile
@@ -17,7 +17,6 @@
libfribidi.so:converters/fribidi \
libcdr-0.1.so:graphics/libcdr01 \
librevenge-0.0.so:textproc/librevenge \
- libpoppler-glib.so:graphics/poppler-glib \
liblcms2.so:graphics/lcms2 \
libzip.so:archivers/libzip \
libexpat.so:textproc/expat2 \
@@ -32,10 +31,9 @@
liblqr-1.so:graphics/liblqr-1 \
libfftw3.so:math/fftw3 \
libltdl.so:devel/libltdl \
- libpoppler.so:graphics/poppler \
libraqm.so:print/libraqm
-USES= gl gmake gnome iconv magick:6 ssl xorg
+USES= gl gmake gnome iconv magick:6 poppler:glib ssl xorg
USE_GITHUB= yes
GH_ACCOUNT= NatronGitHub
GH_TUPLE= NatronGitHub:openfx-supportext:79d8c22:openfx_supportext/SupportExt \
Index: graphics/openscenegraph/Makefile
===================================================================
--- graphics/openscenegraph/Makefile
+++ graphics/openscenegraph/Makefile
@@ -20,11 +20,10 @@
libjasper.so:graphics/jasper \
libpng16.so:graphics/png \
libtiff.so:graphics/tiff \
- libpoppler-glib.so:graphics/poppler-glib \
libvncclient.so:net/libvncserver
USES= cmake:noninja gettext-runtime gl gnome gstreamer jpeg \
- localbase:ldflags sdl xorg
+ localbase:ldflags poppler:glib sdl xorg
USE_GL= gl
USE_GNOME= cairo gdkpixbuf2 glib20 librsvg2
USE_LDCONFIG= yes
Index: graphics/osg/Makefile
===================================================================
--- graphics/osg/Makefile
+++ graphics/osg/Makefile
@@ -91,8 +91,7 @@
OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr libImath.so:math/Imath
OPENEXR_VARS= FORCE_REQUIRE+=OpenEXR
OPENEXR_VARS_OFF= FORCE_IGNORE+=OpenEXR
-PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
-PDF_USES= gnome
+PDF_USES= gnome poppler:glib
PDF_USE= GNOME=cairo
PDF_VARS= FORCE_REQUIRE+=Poppler-glib
PDF_VARS_OFF= FORCE_IGNORE+=Poppler-glib
Index: graphics/osg34/Makefile
===================================================================
--- graphics/osg34/Makefile
+++ graphics/osg34/Makefile
@@ -89,7 +89,7 @@
OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr libImath.so:math/Imath
OPENEXR_VARS= FORCE_REQUIRE+=OpenEXR
OPENEXR_VARS_OFF= FORCE_IGNORE+=OpenEXR
-PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
+PDF_USES= poppler:glib
PDF_USE= gnome=cairo
PDF_VARS= FORCE_REQUIRE+=Poppler-glib
PDF_VARS_OFF= FORCE_IGNORE+=Poppler-glib
Index: graphics/pdf2svg/Makefile
===================================================================
--- graphics/pdf2svg/Makefile
+++ graphics/pdf2svg/Makefile
@@ -11,12 +11,10 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
-
USE_GITHUB= yes
GH_ACCOUNT= db9052
-USES= gnome pkgconfig
+USES= gnome pkgconfig poppler:glib
USE_GNOME= cairo
GNU_CONFIGURE= yes
Index: graphics/pdfpc/Makefile
===================================================================
--- graphics/pdfpc/Makefile
+++ graphics/pdfpc/Makefile
@@ -13,12 +13,11 @@
BUILD_DEPENDS= ${LOCALBASE}/lib/libmarkdown.a:textproc/discount
LIB_DEPENDS= libgee-0.8.so:devel/libgee \
- libpoppler-glib.so:graphics/poppler-glib \
libwebkit2gtk-4.0.so:www/webkit2-gtk3
USE_GITHUB= yes
-USES= cmake compiler:c11 gnome gstreamer pkgconfig vala:build
+USES= cmake compiler:c11 gnome gstreamer pkgconfig poppler:glib vala:build
USE_GNOME= gtk30
CMAKE_ARGS= -DMANDIR:STRING="man/"
Index: graphics/poppler/Makefile
===================================================================
--- graphics/poppler/Makefile
+++ graphics/poppler/Makefile
@@ -1,5 +1,5 @@
PORTNAME= poppler
-DISTVERSION= 22.12.0
+DISTVERSION= ${_POPPLER_VERSION}
CATEGORIES= graphics print
MASTER_SITES= https://poppler.freedesktop.org/
@@ -53,7 +53,7 @@
.if ${_SLAVE_PORT} == library
PORTSCOUT= limitw:1,even
-USES+= iconv
+USES+= iconv poppler:selfbuild
CMAKE_ON+= ENABLE_CPP
PLIST_SUB+= SHLIB_VER=126
@@ -63,7 +63,6 @@
.else
PORTSCOUT= ignore:1
-LIB_DEPENDS+= libpoppler.so:graphics/poppler
PKGNAMESUFFIX= -${_SLAVE_PORT}
BUILD_WRKSRC= ${WRKSRC}/${_SLAVE_PORT}
@@ -73,11 +72,11 @@
-DENABLE_LIBCURL:BOOL=FALSE
. if ${_SLAVE_PORT} == glib
-USES+= python:build
+USES+= python:build poppler
USE_GNOME+= glib20 introspection:Build
BINARY_ALIAS+= python3=${PYTHON_CMD}
. elif ${_SLAVE_PORT} == qt5
-USES+= qt:5
+USES+= qt:5 poppler
USE_QT= core gui widgets xml \
buildtools:build qmake:build testlib:build
. elif ${_SLAVE_PORT} == qt6
@@ -85,8 +84,7 @@
USE_GL+= gl opengl
USE_QT= base
. elif ${_SLAVE_PORT} == utils
-LIB_DEPENDS+= libpoppler-glib.so:graphics/poppler-glib
-USES+= gnome
+USES+= gnome poppler:glib
. endif
.endif
Index: graphics/pqiv/Makefile
===================================================================
--- graphics/pqiv/Makefile
+++ graphics/pqiv/Makefile
@@ -43,8 +43,8 @@
PIXBUF_CONFIGURE_WITH= gdkpixbuf
+POPPLER_USES= poppler:glib
POPPLER_CONFIGURE_WITH= poppler
-POPPLER_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
SPECTRE_CONFIGURE_WITH= spectre
SPECTRE_LIB_DEPENDS= libspectre.so:print/libspectre
Index: graphics/py-python-poppler-qt5/Makefile
===================================================================
--- graphics/py-python-poppler-qt5/Makefile
+++ graphics/py-python-poppler-qt5/Makefile
@@ -13,9 +13,8 @@
LICENSE_COMB= dual
BUILD_DEPENDS= qmake-qt5:devel/qt5-qmake
-LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
-USES= compiler:c++11-lang gl pkgconfig pyqt:5 python:3.7-3.9 qt:5
+USES= compiler:c++11-lang gl pkgconfig poppler:qt5 pyqt:5 python:3.7-3.9 qt:5
USE_GITHUB= yes
GH_ACCOUNT= frescobaldi
USE_GL= gl
Index: graphics/qcomicbook/Makefile
===================================================================
--- graphics/qcomicbook/Makefile
+++ graphics/qcomicbook/Makefile
@@ -9,9 +9,7 @@
LICENSE= GPLv2
-LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
-
-USES= cmake compiler:c++11-lang pkgconfig qt:5
+USES= cmake compiler:c++11-lang pkgconfig poppler:qt5 qt:5
USE_GITHUB= yes
GH_ACCOUNT= stolowski
USE_QT= core gui printsupport widgets x11extras\
Index: graphics/sane-backends/Makefile
===================================================================
--- graphics/sane-backends/Makefile
+++ graphics/sane-backends/Makefile
@@ -40,9 +40,9 @@
IEEE1284_DESC= Parallel port support via libieee1284 (for i386 only)
USB_DESC= USB support
+AVAHI_USES= poppler:glib
AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app \
- libcurl.so:ftp/curl \
- libpoppler-glib.so:graphics/poppler-glib
+ libcurl.so:ftp/curl
AVAHI_USE= GNOME=cairo,glib20
AVAHI_CONFIGURE_WITH= avahi libcurl poppler-glib
GPHOTO_LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2
Index: graphics/tikzit/Makefile
===================================================================
--- graphics/tikzit/Makefile
+++ graphics/tikzit/Makefile
@@ -11,9 +11,7 @@
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
-
-USES= bison compiler:c++11-lang qmake qt:5
+USES= bison compiler:c++11-lang poppler:qt5 qmake qt:5
USE_GITHUB= yes
Index: graphics/vips/Makefile
===================================================================
--- graphics/vips/Makefile
+++ graphics/vips/Makefile
@@ -79,8 +79,8 @@
PANGO_USE= GNOME=pango
PNG_CONFIGURE_WITH= png
PNG_LIB_DEPENDS= libpng.so:graphics/png
+POPPLER_USES= poppler:glib
POPPLER_CONFIGURE_WITH= poppler
-POPPLER_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
POPPLER_USE= GNOME=cairo
TIFF_CONFIGURE_WITH= tiff
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
Index: graphics/xournal/Makefile
===================================================================
--- graphics/xournal/Makefile
+++ graphics/xournal/Makefile
@@ -10,11 +10,10 @@
LICENSE= GPLv2
-LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib \
- libfontconfig.so:x11-fonts/fontconfig \
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-USES= gnome pkgconfig desktop-file-utils shared-mime-info xorg
+USES= gnome pkgconfig desktop-file-utils poppler:glib shared-mime-info xorg
USE_GNOME= cairo libgnomecanvas
USE_XORG= x11
GNU_CONFIGURE= yes
Index: graphics/xournalpp/Makefile
===================================================================
--- graphics/xournalpp/Makefile
+++ graphics/xournalpp/Makefile
@@ -13,12 +13,11 @@
BUILD_DEPENDS= help2man:misc/help2man
LIB_DEPENDS= libharfbuzz.so:print/harfbuzz \
- libpoppler-glib.so:graphics/poppler-glib \
libportaudio.so:audio/portaudio \
libsndfile.so:audio/libsndfile \
libzip.so:archivers/libzip
-USES= cmake compiler:c++11-lang gettext-tools gnome lua:53 pkgconfig xorg
+USES= cmake compiler:c++11-lang gettext-tools gnome lua:53 pkgconfig poppler:glib xorg
USE_GITHUB= yes
USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 librsvg2 libxml2 pango
USE_XORG= x11 xi
Index: graphics/yacreader/Makefile
===================================================================
--- graphics/yacreader/Makefile
+++ graphics/yacreader/Makefile
@@ -46,7 +46,11 @@
OPENGL_USE= GL=gl
OPENGL_QMAKE_OFF= CONFIG+=no_opengl
-POPPLER_LIB_DEPENDS= libpoppler-${FLAVOR}.so:graphics/poppler-${FLAVOR}
+.if ${FLAVOR:U} == qt6
+POPPLER_USES= poppler:qt6
+.else
+POPPLER_USES= poppler:qt5
+.endif
POPPLER_QMAKE_OFF= CONFIG+=no_pdf
.include <bsd.port.mk>
Index: graphics/zathura-pdf-poppler/Makefile
===================================================================
--- graphics/zathura-pdf-poppler/Makefile
+++ graphics/zathura-pdf-poppler/Makefile
@@ -11,11 +11,10 @@
LICENSE= ZLIB
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
BUILD_DEPENDS= zathura:graphics/zathura
RUN_DEPENDS= zathura:graphics/zathura
-USES= compiler:c11 desktop-file-utils gnome meson ninja pkgconfig
+USES= compiler:c11 desktop-file-utils gnome meson ninja pkgconfig poppler:glib
USE_GNOME= glib20 gtk30
CONFLICTS= zathura-pdf-mupdf
Index: mail/claws-mail-pdf_viewer/Makefile
===================================================================
--- mail/claws-mail-pdf_viewer/Makefile
+++ mail/claws-mail-pdf_viewer/Makefile
@@ -4,9 +4,7 @@
COMMENT= PDF and PostScript viewer plugin for Claws Mail
WWW= https://www.claws-mail.org/plugin.php?plugin=pdf_viewer
-LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
-
-USES+= ghostscript
+USES+= ghostscript poppler:glib
CLAWS_PLUGINS_BUILD= ${PORTNAME}
Index: mail/textmail/Makefile
===================================================================
--- mail/textmail/Makefile
+++ mail/textmail/Makefile
@@ -11,10 +11,9 @@
RUN_DEPENDS= antiword:textproc/antiword \
catdoc:textproc/catdoc \
xls2csv:textproc/catdoc \
- lynx:www/lynx \
- pdftotext:graphics/poppler-utils
+ lynx:www/lynx
-USES= perl5 shebangfix
+USES= perl5 poppler:utils shebangfix
SHEBANG_FILES= ${PORTNAME}
PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
NO_WRKSUBDIR= yes
Index: math/cantor/Makefile
===================================================================
--- math/cantor/Makefile
+++ math/cantor/Makefile
@@ -10,14 +10,12 @@
LIB_DEPENDS= libAnalitza.so:math/analitza \
libcln.so:math/cln \
libqalculate.so:math/libqalculate \
- libspectre.so:print/libspectre \
- libpoppler.so:graphics/poppler \
- libpoppler-qt5.so:graphics/poppler-qt5
+ libspectre.so:print/libspectre
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
docbook-xml>0:textproc/docbook-xml
USES= cmake compiler:c++11-lang desktop-file-utils gettext kde:5 \
- pkgconfig python:3.7+ qt:5 shared-mime-info tar:xz xorg
+ pkgconfig poppler:qt5 python:3.7+ qt:5 shared-mime-info tar:xz xorg
USE_KDE= attica auth archive bookmarks codecs completion config \
configwidgets coreaddons crash emoticons i18n iconthemes \
itemmodels itemviews init jobwidgets kdelibs4support kio \
Index: math/labplot/Makefile
===================================================================
--- math/labplot/Makefile
+++ math/labplot/Makefile
@@ -40,9 +40,8 @@
CANTOR_DESC= Build with Cantor support
CANTOR_CMAKE_BOOL= ENABLE_CANTOR
-CANTOR_LIB_DEPENDS= libcantorlibs.so:math/cantor \
- libpoppler.so:graphics/poppler \
- libpoppler-qt5.so:graphics/poppler-qt5
+CANTOR_USES= poppler:qt5
+CANTOR_LIB_DEPENDS= libcantorlibs.so:math/cantor
FITS_DESC= Flexible Image Transport System Data Format (FITS) Library
FITS_CMAKE_BOOL= ENABLE_FITS
FITS_LIB_DEPENDS= libcfitsio.so:astro/cfitsio
Index: misc/tellico/Makefile
===================================================================
--- misc/tellico/Makefile
+++ misc/tellico/Makefile
@@ -15,13 +15,11 @@
libcsv.so:textproc/libcsv \
libexempi.so:textproc/exempi \
libiso9660.so:sysutils/libcdio \
- libpoppler-qt5.so:graphics/poppler-qt5 \
- libpoppler.so:graphics/poppler \
libtag.so:audio/taglib \
libyaz.so:net/yaz
USES= cmake compiler:c++11-lang desktop-file-utils gettext gnome \
- kde:5 pkgconfig python:run qt:5 shared-mime-info shebangfix \
+ kde:5 pkgconfig poppler:qt5 python:run qt:5 shared-mime-info shebangfix \
tar:xz xorg
USE_GNOME= libxml2 libxslt
USE_KDE= archive attica5 auth bookmarks codecs completion config \
Index: multimedia/py-mat2/Makefile
===================================================================
--- multimedia/py-mat2/Makefile
+++ multimedia/py-mat2/Makefile
@@ -15,10 +15,9 @@
${PYTHON_PKGNAMEPREFIX}gobject3>0:devel/py-gobject3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR} \
gdk-pixbuf2>0:graphics/gdk-pixbuf2 \
- librsvg2-rust>0:graphics/librsvg2-rust \
- poppler-glib>0:graphics/poppler-glib
+ librsvg2-rust>0:graphics/librsvg2-rust
-USES= python
+USES= python poppler:glib
USE_PYTHON= autoplist concurrent distutils
NO_ARCH= yes
Index: net/kitinerary/Makefile
===================================================================
--- net/kitinerary/Makefile
+++ net/kitinerary/Makefile
@@ -10,10 +10,9 @@
LICENSE= LGPL21
LIB_DEPENDS= libphonenumber.so:devel/libphonenumber \
- libpoppler.so:graphics/poppler \
libZXing.so:textproc/zxing-cpp
-USES= compiler:c++11-lang cmake gettext gnome kde:5 pkgconfig qt:5 \
+USES= compiler:c++11-lang cmake gettext gnome kde:5 pkgconfig poppler qt:5 \
shared-mime-info ssl tar:xz
USE_GNOME= libxml2
USE_KDE= archive codecs coreaddons i18n \
Index: print/cups-filters/Makefile
===================================================================
--- print/cups-filters/Makefile
+++ print/cups-filters/Makefile
@@ -57,12 +57,11 @@
BRAILLE_CONFIGURE_ENABLE= braille
BRAILLE_DESC= Braille embosser support
-BRAILLE_USES= magick:run
+BRAILLE_USES= magick:run poppler:utils
BRAILLE_BUILD_DEPENDS= bash:shells/bash
BRAILLE_LIB_DEPENDS= liblouis.so:devel/liblouis \
# liblouisutdml.so:devel/liblouisutdml
-BRAILLE_RUN_DEPENDS= pdftotext:graphics/poppler-utils \
- bash:shells/bash
+BRAILLE_RUN_DEPENDS= bash:shells/bash
COLORD_CONFIGURE_ENABLE= dbus
COLORD_DESC= Get ICC color profiles from colord (via D-Bus)
Index: print/deforaos-pdfviewer/Makefile
===================================================================
--- print/deforaos-pdfviewer/Makefile
+++ print/deforaos-pdfviewer/Makefile
@@ -14,12 +14,11 @@
LIB_DEPENDS= libSystem.so:devel/deforaos-libsystem \
libDesktop.so:x11/deforaos-libdesktop \
- libpoppler-glib.so:graphics/poppler-glib \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
MAKE_ARGS+= PREFIX=${PREFIX}
-USES= desktop-file-utils gnome pkgconfig
+USES= desktop-file-utils gnome pkgconfig poppler:glib
USE_GNOME= gtk20 gdkpixbuf2 cairo
MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man
Index: print/pdf-tools/Makefile
===================================================================
--- print/pdf-tools/Makefile
+++ print/pdf-tools/Makefile
@@ -15,12 +15,10 @@
BUILD_DEPENDS= cask${EMACS_PKGNAMESUFFIX}>0:devel/cask@${EMACS_FLAVOR} \
tablist${EMACS_PKGNAMESUFFIX}>=0.70.4:devel/tablist@${EMACS_FLAVOR}
-LIB_DEPENDS= libpng.so:graphics/png \
- libpoppler-glib.so:graphics/poppler-glib \
- libpoppler.so:graphics/poppler
+LIB_DEPENDS= libpng.so:graphics/png
RUN_DEPENDS= tablist${EMACS_PKGNAMESUFFIX}>=0.70:devel/tablist@${EMACS_FLAVOR}
-USES= autoreconf:build emacs gettext-runtime gmake gnome magick:7
+USES= autoreconf:build emacs gettext-runtime gmake gnome magick:7 poppler:glib
USE_GITHUB= yes
GH_ACCOUNT= vedang
USE_GNOME= cairo glib20
Index: print/pdfarranger/Makefile
===================================================================
--- print/pdfarranger/Makefile
+++ print/pdfarranger/Makefile
@@ -13,10 +13,9 @@
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${PY_FLAVOR}
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}gobject3>0:devel/py-gobject3@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pikepdf>0:textproc/py-pikepdf@${PY_FLAVOR} \
- poppler-glib>0:graphics/poppler-glib
+ ${PYTHON_PKGNAMEPREFIX}pikepdf>0:textproc/py-pikepdf@${PY_FLAVOR}
-USES= gettext gnome python
+USES= gettext gnome poppler:glib python
USE_PYTHON= distutils
USE_GNOME= gtk30 intltool:build
USE_GITHUB= yes
Index: print/qpdfview/Makefile
===================================================================
--- print/qpdfview/Makefile
+++ print/qpdfview/Makefile
@@ -12,9 +12,7 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
-
-USES= compiler:c++11-lang desktop-file-utils gl pkgconfig qmake qt:5
+USES= compiler:c++11-lang desktop-file-utils gl pkgconfig poppler:qt5 qmake qt:5
USE_GL= gl
USE_LDCONFIG= yes
USE_QT= concurrent core dbus gui imageformats linguisttools \
Index: print/scribus-devel/Makefile
===================================================================
--- print/scribus-devel/Makefile
+++ print/scribus-devel/Makefile
@@ -27,7 +27,6 @@
libvisio-0.1.so:textproc/libvisio01 \
libfreetype.so:print/freetype2 \
libtiff.so:graphics/tiff \
- libpoppler.so:graphics/poppler \
libharfbuzz-icu.so:print/harfbuzz-icu \
libfontconfig.so:x11-fonts/fontconfig \
libpodofo.so:graphics/podofo \
@@ -38,7 +37,7 @@
libzmf-0.0.so:graphics/libzmf
USES= cmake compiler:c++17-lang desktop-file-utils dos2unix gnome \
- jpeg pkgconfig python:3.6+ qt:5 shared-mime-info tar:xz
+ jpeg pkgconfig poppler python:3.6+ qt:5 shared-mime-info tar:xz
USE_QT= buildtools:build core declarative gui linguisttools:build \
network opengl printsupport qmake:build widgets xml
DOS2UNIX_REGEX= .*\.(cpp|h|txt)
Index: print/texlive-base/Makefile
===================================================================
--- print/texlive-base/Makefile
+++ print/texlive-base/Makefile
@@ -21,14 +21,13 @@
libharfbuzz-icu.so:print/harfbuzz-icu \
libpng.so:graphics/png \
libzzip.so:devel/zziplib \
- libpoppler.so:graphics/poppler \
libpotrace.so:graphics/libpotrace
RUN_DEPENDS= p5-File-HomeDir>=0:devel/p5-File-HomeDir \
p5-YAML-Tiny>=0:textproc/p5-YAML-Tiny \
psbook:print/psutils
USES= compiler:c++11-lib cpe ghostscript gnome localbase pkgconfig perl5 \
- python:run shebangfix tar:xz xorg
+ poppler python:run shebangfix tar:xz xorg
CPE_VENDOR= tug
USE_CXXSTD= gnu++11
USE_GNOME= cairo
Index: print/xreader/Makefile
===================================================================
--- print/xreader/Makefile
+++ print/xreader/Makefile
@@ -59,7 +59,7 @@
KEYRING_LIB_DEPENDS= libsecret-1.so:security/libsecret
KEYRING_MESON_OFF= -Dkeyring=false
-PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
+PDF_USES= poppler:glib
PDF_MESON_OFF= -Dpdf=false
PS_LIB_DEPENDS= libspectre.so:print/libspectre
Index: sysutils/catfish/Makefile
===================================================================
--- sysutils/catfish/Makefile
+++ sysutils/catfish/Makefile
@@ -14,13 +14,12 @@
RUN_DEPENDS= \
${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
- pdftotext:graphics/poppler-utils
+ ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
BUILD_DEPENDS= \
${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR}
-USES= cpe desktop-file-utils gettext-tools gnome python:3.4+ tar:bz2
+USES= cpe desktop-file-utils gettext-tools gnome popler:utils python:3.4+ tar:bz2
USE_PYTHON= distutils noflavors
USE_GNOME= gtk30 intltool pygobject3
Index: sysutils/tracker-miners/Makefile
===================================================================
--- sysutils/tracker-miners/Makefile
+++ sysutils/tracker-miners/Makefile
@@ -18,7 +18,6 @@
libiptcdata.so:graphics/libiptcdata \
libFLAC.so:audio/flac \
libtotem-plparser.so:multimedia/totem-pl-parser \
- libpoppler-glib.so:graphics/poppler-glib \
libpng.so:graphics/png \
libtag.so:audio/taglib \
libtiff.so:graphics/tiff \
@@ -32,7 +31,7 @@
PORTSCOUT= limitw:1,even
USES= gettext gnome jpeg localbase:ldflags meson \
- pathfix pkgconfig python:3.4+,build sqlite tar:xz vala:build
+ pathfix pkgconfig poppler:glib python:3.4+,build sqlite tar:xz vala:build
USE_GNOME= cairo intltool libgsf libxml2
MESON_ARGS= -Dsystemd_user_services=no \
Index: textproc/pdfgrep/Makefile
===================================================================
--- textproc/pdfgrep/Makefile
+++ textproc/pdfgrep/Makefile
@@ -12,11 +12,10 @@
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
- libpoppler.so:graphics/poppler \
libgpg-error.so:security/libgpg-error
GNU_CONFIGURE= yes
-USES= compiler:c11 pkgconfig
+USES= compiler:c11 pkgconfig poppler
PLIST_FILES= bin/pdfgrep man/man1/pdfgrep.1.gz \
share/bash-completion/completions/pdfgrep \
Index: textproc/pdfsandwich/Makefile
===================================================================
--- textproc/pdfsandwich/Makefile
+++ textproc/pdfsandwich/Makefile
@@ -12,11 +12,10 @@
BUILD_DEPENDS= gawk:lang/gawk \
ocamlopt:lang/ocaml
-RUN_DEPENDS= pdfunite:graphics/poppler-utils \
- tesseract:graphics/tesseract \
+RUN_DEPENDS= tesseract:graphics/tesseract \
unpaper:graphics/unpaper
-USES= gmake ghostscript:run magick:6,run tar:bz2
+USES= gmake ghostscript:run magick:6,run poppler:utils tar:bz2
GNU_CONFIGURE= yes
PLIST_FILES= bin/pdfsandwich \
Index: textproc/py-pdftotext/Makefile
===================================================================
--- textproc/py-pdftotext/Makefile
+++ textproc/py-pdftotext/Makefile
@@ -12,9 +12,7 @@
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libpoppler.so:graphics/poppler
-
-USES= compiler:c11 python:3.6+
+USES= compiler:c11 poppler python:3.6+
USE_PYTHON= autoplist distutils
do-test:
Index: textproc/py-textract/Makefile
===================================================================
--- textproc/py-textract/Makefile
+++ textproc/py-textract/Makefile
@@ -57,7 +57,7 @@
LIBXSLT_RUN_DEPENDS= libxslt>=1.1.15:textproc/libxslt
MSG_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}extract-msg>=0.29:textproc/py-extract-msg@${PY_FLAVOR}
PDFMINER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pdfminer.six>=20191110:textproc/py-pdfminer.six@${PY_FLAVOR}
-PDFTOTEXT_RUN_DEPENDS= poppler-utils>0:graphics/poppler-utils
+PDFTOTEXT_USES= poppler:utils
POCKETSPHINX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pocketsphinx>0:audio/py-pocketsphinx@${PY_FLAVOR}
PPTX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-pptx>=0.6.18:textproc/py-python-pptx@${PY_FLAVOR}
PS_RUN_DEPENDS= pstotext>0:print/pstotext
Index: www/hotcrp/Makefile
===================================================================
--- www/hotcrp/Makefile
+++ www/hotcrp/Makefile
@@ -8,10 +8,9 @@
COMMENT= Web based conference management software
WWW= https://www.read.seas.harvard.edu/~kohler/hotcrp/
-RUN_DEPENDS= pdftohtml:graphics/poppler-utils \
- zip:archivers/zip
+RUN_DEPENDS= zip:archivers/zip
-USES= php mysql:server
+USES= php mysql:servera poppler:utils
USE_PHP= mysqli gd session ctype
NO_BUILD= yes
Index: x11-toolkits/rubygem-poppler/Makefile
===================================================================
--- x11-toolkits/rubygem-poppler/Makefile
+++ x11-toolkits/rubygem-poppler/Makefile
@@ -11,11 +11,10 @@
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
BUILD_DEPENDS= rubygem-rake>=0:devel/rubygem-rake
-LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
RUN_DEPENDS= rubygem-cairo-gobject>=${PORTVERSION}:devel/rubygem-cairo-gobject \
rubygem-gio2>=${PORTVERSION}:devel/rubygem-gio2
-USES= gem
+USES= gem poppler:glib
USE_RUBY= yes
NO_ARCH= yes
Index: x11/eaglemode/Makefile
===================================================================
--- x11/eaglemode/Makefile
+++ x11/eaglemode/Makefile
@@ -40,7 +40,7 @@
XINE_LIB_DEPENDS= libxine.so:multimedia/libxine
XINE_VARS= EMAV+=xine
RSVG_USE= GNOME=librsvg2
-PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib
+PDF_USES= poppler:glib
PDF_USE= GNOME=gtk20
VLC_LIB_DEPENDS= libvlc.so:multimedia/vlc
VLC_VARS= EMAV+=vlc

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 8, 11:50 AM (2 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29404809
Default Alt Text
D37666.diff (48 KB)

Event Timeline