poppler*: reenable splash backend - needed to display output in poppler-qt

based backends.
also add nss dependency and be explicit in the tiff dependency.

4 files changed, 11 insertions, 9 deletions

diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index f3b82440771..0338c2e9c9d 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2019/10/19 12:37:04 nia Exp $
+# $NetBSD: Makefile,v 1.76 2020/03/01 11:18:58 markd Exp $
 
+PKGREVISION=	1
 .include "../../print/poppler/Makefile.common"
 
 COMMENT=	PDF rendering library
@@ -9,8 +10,6 @@ PKGCONFIG_OVERRIDE+=	${WRKSRC}/poppler.pc.cmake
 
 INSTALLATION_DIRS+=	include/poppler share/doc/poppler
 
-# Don't build the splash graphics backend.
-CMAKE_ARGS+=	-DENABLE_SPLASH=OFF
 # Don't compile GTK+ test program.
 CMAKE_ARGS+=	-DBUILD_GTK_TESTS=OFF
 # Don't compile GLib wrapper which also needs gtk2
@@ -36,10 +35,12 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/README-XPDF ${DESTDIR}${PREFIX}/share/doc/poppler/
 	${RMDIR} ${DESTDIR}${PREFIX}/include/poppler || ${TRUE}
 
+.include "../../devel/nss/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/poppler/Makefile.common b/print/poppler/Makefile.common
index ec031a87247..2419a1119cf 100644
--- a/print/poppler/Makefile.common
+++ b/print/poppler/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.114 2020/01/10 13:24:18 wiz Exp $
+# $NetBSD: Makefile.common,v 1.115 2020/03/01 11:18:58 markd Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
@@ -25,12 +25,10 @@ USE_LANGUAGES=		c c++14
 USE_TOOLS+=		pkg-config
 GCC_REQD+=		5
 
-# Don't accidentally find libtiff
-CMAKE_ARGS+=	-DCMAKE_DISABLE_FIND_PACKAGE_TIFF=TRUE
-
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 BUILDLINK_TRANSFORM+=   rm:-fno-check-new
 .endif
 
+.include "../../devel/boost-headers/buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
diff --git a/print/poppler/PLIST b/print/poppler/PLIST
index 522ebd51633..b1b350b046d 100644
--- a/print/poppler/PLIST
+++ b/print/poppler/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.25 2020/01/10 13:24:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.26 2020/03/01 11:18:58 markd Exp $
 lib/libpoppler.so
 lib/libpoppler.so.94
 lib/libpoppler.so.94.0.0
 lib/pkgconfig/poppler-cairo.pc
+lib/pkgconfig/poppler-splash.pc
 lib/pkgconfig/poppler.pc
 share/doc/poppler/README-XPDF
 share/doc/poppler/README.md
diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk
index 241973a3b44..73926c20068 100644
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.77 2019/11/07 12:38:04 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.78 2020/03/01 11:18:58 markd Exp $
 
 BUILDLINK_TREE+=	poppler
 
@@ -11,12 +11,14 @@ BUILDLINK_PKGSRCDIR.poppler?=	../../print/poppler
 
 GCC_REQD+=	5
 
+.include "../../devel/nss/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .endif # POPPLER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-poppler