Build and install pdftocairo, for tex-lwrap.

Bump PKGREVISION.

4 files changed, 14 insertions, 25 deletions

diff --git a/print/poppler-utils/Makefile b/print/poppler-utils/Makefile
index 77d93447a71..514ada9f1b7 100644
--- a/print/poppler-utils/Makefile
+++ b/print/poppler-utils/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2014/04/29 07:56:48 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2017/07/06 11:29:59 wiz Exp $
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=		poppler-utils-${POPPLER_VERS}
+PKGREVISION=		1
 COMMENT=		PDF utilities (from poppler)
 MAINTAINER=		reed@reedmedia.net
 
@@ -13,8 +14,6 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-# Don't build the cairo graphics backend.
-CONFIGURE_ARGS+=	--disable-cairo-output
 # Don't build the splash graphics backend.
 CONFIGURE_ARGS+=	--disable-splash-output
 # Don't compile poppler qt wrapper.
@@ -29,7 +28,9 @@ CONFIGURE_ARGS+=	--enable-utils	# the default
 BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
 .include "../../print/poppler/buildlink3.mk"
 
-BUILD_DIRS=		utils # implies INSTALL_DIRS too
+# needed to build libpoppler-cairo
+BUILD_DIRS=		fofi goo poppler utils
+INSTALL_DIRS=		utils
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -41,6 +42,7 @@ PTHREAD_STUBLIB=	# provided by libc
 .endif
 MAKE_ENV+=		PTHREAD_STUBLIB=${PTHREAD_STUBLIB}
 
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/poppler-utils/PLIST b/print/poppler-utils/PLIST
index 69e875f5d29..b0a2235716f 100644
--- a/print/poppler-utils/PLIST
+++ b/print/poppler-utils/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2012/07/04 20:26:58 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/07/06 11:29:59 wiz Exp $
 bin/pdfdetach
 bin/pdffonts
 bin/pdfimages
 bin/pdfinfo
 bin/pdfseparate
+bin/pdftocairo
 bin/pdftohtml
 bin/pdftoppm
 bin/pdftops
@@ -14,6 +15,7 @@ man/man1/pdffonts.1
 man/man1/pdfimages.1
 man/man1/pdfinfo.1
 man/man1/pdfseparate.1
+man/man1/pdftocairo.1
 man/man1/pdftohtml.1
 man/man1/pdftoppm.1
 man/man1/pdftops.1
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index 9d01d15daf3..e2a2a45f5c0 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.115 2017/05/22 08:40:10 adam Exp $
+$NetBSD: distinfo,v 1.116 2017/07/06 11:29:59 wiz Exp $
 
 SHA1 (poppler-0.55.0.tar.xz) = 19f8a6b2a5f292c7837ba38d3948ef01c14ca36f
 RMD160 (poppler-0.55.0.tar.xz) = c2c541521a14188d3d882b478d639350b0934252
 SHA512 (poppler-0.55.0.tar.xz) = ea3008f2945da862236fcc64d320367e04e3c71d4cc5e996e0c50ac49457e5e42eb06af92486fe7f15c04f07a88367f5344f8dc76549c57c4a19e2fbb60f55d6
 Size (poppler-0.55.0.tar.xz) = 1700440 bytes
 SHA1 (patch-aa) = f97ea3f4d381c189fc81552d91a50cd62bd0c1a1
-SHA1 (patch-ab) = 791c4ffd9488d5c261398cabe323d6c112b3744e
+SHA1 (patch-ab) = ad0ec112c33ac730d281dc392faeb9a842175950
 SHA1 (patch-ag) = d4df4fdf141186e1cc653bb467b31b3335d733ff
 SHA1 (patch-aq) = da845661ef7f7aca3072dbeebde0444b4d8f01aa
 SHA1 (patch-ar) = b064ff2dc9080ff5f1a1361e7798480ace11f3a3
diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab
index 7cd37a722fc..7b957532250 100644
--- a/print/poppler/patches/patch-ab
+++ b/print/poppler/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.20 2016/05/22 18:17:17 wiz Exp $
+$NetBSD: patch-ab,v 1.21 2017/07/06 11:29:59 wiz Exp $
 
 Use installed poppler library so we can have a separate poppler-utils
 package.
 
 Always build pdftoppm.
 
---- utils/Makefile.in.orig	2016-05-21 16:59:39.000000000 +0000
+--- utils/Makefile.in.orig	2017-05-21 21:19:46.000000000 +0000
 +++ utils/Makefile.in
 @@ -96,10 +96,10 @@ host_triplet = @host@
  @BUILD_UTILS_TRUE@	pdfunite$(EXEEXT) $(am__EXEEXT_1) \
@@ -31,7 +31,7 @@ Always build pdftoppm.
  @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_3 = pdftocairo$(EXEEXT)
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  PROGRAMS = $(bin_PROGRAMS)
-@@ -138,44 +138,44 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX
+@@ -138,39 +138,39 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX
  pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
  pdfdetach_LDADD = $(LDADD)
  pdfdetach_DEPENDENCIES = libparseargs.la \
@@ -78,12 +78,6 @@ Always build pdftoppm.
  am__DEPENDENCIES_2 =
  @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 =  \
  @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@	$(am__DEPENDENCIES_2)
- am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
--pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
-+pdftocairo_DEPENDENCIES = $(prefix)/lib/libpoppler-cairo.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
- 	$(am__DEPENDENCIES_2)
- am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \
 @@ -184,7 +184,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
@@ -132,12 +126,3 @@ Always build pdftoppm.
  
  @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
  @BUILD_UTILS_TRUE@	pdfinfo.1 pdftops.1 pdftotext.1 pdftohtml.1 \
-@@ -616,7 +617,7 @@ pdftocairo_SOURCES = \
- 	pdftocairo-win32.h
- 
- pdftocairo_LDADD = \
--	$(top_builddir)/poppler/libpoppler-cairo.la	\
-+	$(prefix)/lib/libpoppler-cairo.la	\
- 	$(LDADD)					\
- 	$(PDFTOCAIRO_LIBS)				\
- 	$(PTHREAD_LIBS)