Thu Jul 4 13:13:55 2013 UTC ()
Update to 0.22.5.
Use "lcms" option instead of package-specific "poppler-cms" one.
Add backwards compat for this.

Add comments to most patches.

Changes:

Release 0.22.5
        core:
         * PSOutputDev: Make sure that Title: doesn't contain \n or \r (Bug #63862)
         * Fix slowlyness reading malformed files (Bug #46703)
         * Fix infinite loop while feeding wrong data in stdin (Bug #64967)
         * Fix crash on malformed file (Bug #65221)
         * Fix mismatched delete (Bug #65553)

        qt4:
         * Fix mismatched delete (Bug #65551)

        utils:
         * pdftohtml: Fix memory leak


(wiz)
diff -r1.62 -r1.63 pkgsrc/print/poppler/Makefile
diff -r1.54 -r1.55 pkgsrc/print/poppler/Makefile.common
diff -r1.79 -r1.80 pkgsrc/print/poppler/distinfo
diff -r1.12 -r1.13 pkgsrc/print/poppler/patches/patch-aa
diff -r1.15 -r1.16 pkgsrc/print/poppler/patches/patch-ab
diff -r1.4 -r1.5 pkgsrc/print/poppler/patches/patch-ar
diff -r1.3 -r1.4 pkgsrc/print/poppler/patches/patch-as
cvs diff -r1.62 -r1.63 pkgsrc/print/poppler/Makefile (expand / switch to unified diff)

--- pkgsrc/print/poppler/Makefile 2013/06/04 22:16:59 1.62
+++ pkgsrc/print/poppler/Makefile 2013/07/04 13:13:55 1.63
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.62 2013/06/04 22:16:59 tron Exp $ 1# $NetBSD: Makefile,v 1.63 2013/07/04 13:13:55 wiz Exp $
2 2
3.include "../../print/poppler/Makefile.common" 3.include "../../print/poppler/Makefile.common"
4 4
5PKGREVISION= 2 
6COMMENT= PDF rendering library 5COMMENT= PDF rendering library
7MAINTAINER= reed@reedmedia.net 6MAINTAINER= reed@reedmedia.net
8 7
9USE_TOOLS+= gmake 8USE_TOOLS+= gmake
10 9
11#PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cairo.pc.in 10#PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-cairo.pc.in
12PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-splash.pc.in 11PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-splash.pc.in
13PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler.pc.in 12PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler.pc.in
14GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
15 14
16INSTALLATION_DIRS+= include/poppler share/doc/poppler 15INSTALLATION_DIRS+= include/poppler share/doc/poppler
17 16
18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 17CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
@@ -20,31 +19,34 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSC @@ -20,31 +19,34 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSC
20# Build the Splash graphics backend. 19# Build the Splash graphics backend.
21CONFIGURE_ARGS+= --enable-splash-output 20CONFIGURE_ARGS+= --enable-splash-output
22# Don't build the cairo graphics backend. 21# Don't build the cairo graphics backend.
23CONFIGURE_ARGS+= --disable-cairo-output 22CONFIGURE_ARGS+= --disable-cairo-output
24# Don't compile GTK+ test program. 23# Don't compile GTK+ test program.
25CONFIGURE_ARGS+= --disable-gtk-test 24CONFIGURE_ARGS+= --disable-gtk-test
26# Don't compile GLib wrapper which also needs gtk2 25# Don't compile GLib wrapper which also needs gtk2
27CONFIGURE_ARGS+= --disable-poppler-glib 26CONFIGURE_ARGS+= --disable-poppler-glib
28# Don't build and install the tools 27# Don't build and install the tools
29CONFIGURE_ARGS+= --disable-utils 28CONFIGURE_ARGS+= --disable-utils
30CONFIGURE_ARGS+= --disable-poppler-cpp 29CONFIGURE_ARGS+= --disable-poppler-cpp
31 30
32PKG_OPTIONS_VAR= PKG_OPTIONS.poppler 31PKG_OPTIONS_VAR= PKG_OPTIONS.poppler
33PKG_SUPPORTED_OPTIONS= poppler-cms 32PKG_SUPPORTED_OPTIONS= lcms
34PKG_SUGGESTED_OPTIONS= poppler-cms 33PKG_SUGGESTED_OPTIONS= lcms
 34# remove after pkgsrc-2013Q3 is tagged
 35PKG_OPTIONS_LEGACY_OPTS= poppler-cms:lcms
 36
35.include "../../mk/bsd.options.mk" 37.include "../../mk/bsd.options.mk"
36 38
37.if !empty(PKG_OPTIONS:Mpoppler-cms) 39.if !empty(PKG_OPTIONS:Mlcms)
38CONFIGURE_ARGS+= --enable-cms 40CONFIGURE_ARGS+= --enable-cms
39.include "../../graphics/lcms2/buildlink3.mk" 41.include "../../graphics/lcms2/buildlink3.mk"
40.else 42.else
41CONFIGURE_ARGS+= --disable-cms 43CONFIGURE_ARGS+= --disable-cms
42.endif 44.endif
43 45
44.include "../../mk/bsd.prefs.mk" 46.include "../../mk/bsd.prefs.mk"
45 47
46post-install: 48post-install:
47 ${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/poppler/ 49 ${INSTALL_MAN} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/poppler/
48 ${INSTALL_MAN} ${WRKSRC}/README-XPDF ${DESTDIR}${PREFIX}/share/doc/poppler/ 50 ${INSTALL_MAN} ${WRKSRC}/README-XPDF ${DESTDIR}${PREFIX}/share/doc/poppler/
49 ${RMDIR} ${DESTDIR}${PREFIX}/include/poppler || ${TRUE} 51 ${RMDIR} ${DESTDIR}${PREFIX}/include/poppler || ${TRUE}
50 52
cvs diff -r1.54 -r1.55 pkgsrc/print/poppler/Makefile.common (expand / switch to unified diff)

--- pkgsrc/print/poppler/Makefile.common 2013/05/25 14:44:48 1.54
+++ pkgsrc/print/poppler/Makefile.common 2013/07/04 13:13:55 1.55
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile.common,v 1.54 2013/05/25 14:44:48 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.55 2013/07/04 13:13:55 wiz Exp $
2# 2#
3# used by print/poppler/Makefile 3# used by print/poppler/Makefile
4# used by print/poppler-glib/Makefile 4# used by print/poppler-glib/Makefile
5# used by print/poppler-includes/Makefile 5# used by print/poppler-includes/Makefile
6# used by print/poppler-qt4/Makefile 6# used by print/poppler-qt4/Makefile
7# used by print/poppler-utils/Makefile 7# used by print/poppler-utils/Makefile
8 8
9POPPLER_VERS= 0.22.4 9POPPLER_VERS= 0.22.5
10DISTNAME= poppler-${POPPLER_VERS} 10DISTNAME= poppler-${POPPLER_VERS}
11CATEGORIES= print 11CATEGORIES= print
12MASTER_SITES= http://poppler.freedesktop.org/ 12MASTER_SITES= http://poppler.freedesktop.org/
13 13
14HOMEPAGE= http://poppler.freedesktop.org/ 14HOMEPAGE= http://poppler.freedesktop.org/
15LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
16 16
17DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo 17DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo
18PATCHDIR= ${.CURDIR}/../../print/poppler/patches 18PATCHDIR= ${.CURDIR}/../../print/poppler/patches
19 19
20USE_TOOLS+= pkg-config 20USE_TOOLS+= pkg-config
21USE_LIBTOOL= yes 21USE_LIBTOOL= yes
22USE_LANGUAGES= c c++ 22USE_LANGUAGES= c c++
cvs diff -r1.79 -r1.80 pkgsrc/print/poppler/distinfo (expand / switch to unified diff)

--- pkgsrc/print/poppler/distinfo 2013/05/25 14:44:48 1.79
+++ pkgsrc/print/poppler/distinfo 2013/07/04 13:13:55 1.80
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.79 2013/05/25 14:44:48 wiz Exp $ 1$NetBSD: distinfo,v 1.80 2013/07/04 13:13:55 wiz Exp $
2 2
3SHA1 (poppler-0.22.4.tar.gz) = 26586bcd41a01adca00bf5929e11c49419bd21fa 3SHA1 (poppler-0.22.5.tar.gz) = 9491bb33788d7f0ee67da572dc4798004f98323a
4RMD160 (poppler-0.22.4.tar.gz) = e272fa83b6b3c7dfc7cf8f5265a603250e36a683 4RMD160 (poppler-0.22.5.tar.gz) = 6220e723a87f153f9c9ccc7329133d04191a3c8a
5Size (poppler-0.22.4.tar.gz) = 2222528 bytes 5Size (poppler-0.22.5.tar.gz) = 2239107 bytes
6SHA1 (patch-aa) = 4ab4cb184ebe121c712a84dcbcfa69ce0c07aafb 6SHA1 (patch-aa) = f67de7b11651207d968972e5b27eb017cf59ceb7
7SHA1 (patch-ab) = cae1dd7831d7fbbed32664c6fdd29d168c444c1f 7SHA1 (patch-ab) = 758c541fa14c82cb44a247cbc37e1582b0167229
8SHA1 (patch-ag) = abe010cec549f305a53d9a21be6cf66ddc5f1b79 8SHA1 (patch-ag) = abe010cec549f305a53d9a21be6cf66ddc5f1b79
9SHA1 (patch-aq) = 17db7fb50937611ff253f48241503281fb642f63 9SHA1 (patch-aq) = 17db7fb50937611ff253f48241503281fb642f63
10SHA1 (patch-ar) = 4799e084c83167fcd54832c172c2662c745cdba1 10SHA1 (patch-ar) = f72681a2148ec846a334774339836d468925b20c
11SHA1 (patch-as) = f0f4f8d9f5a49173a27e2349be4b7536ed77eaae 11SHA1 (patch-as) = 9e2329c923c904074495076fd7cc594fced51a0d
cvs diff -r1.12 -r1.13 pkgsrc/print/poppler/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/print/poppler/patches/Attic/patch-aa 2013/03/24 07:09:24 1.12
+++ pkgsrc/print/poppler/patches/Attic/patch-aa 2013/07/04 13:13:55 1.13
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-aa,v 1.12 2013/03/24 07:09:24 spz Exp $ 1$NetBSD: patch-aa,v 1.13 2013/07/04 13:13:55 wiz Exp $
 2
 3Use installed copy of poppler library so we can have a separate
 4poppler-glib package.
2 5
3--- glib/Makefile.in.orig 2013-02-10 10:48:37.000000000 +0000 6--- glib/Makefile.in.orig 2013-02-10 10:48:37.000000000 +0000
4+++ glib/Makefile.in 7+++ glib/Makefile.in
5@@ -107,7 +107,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"  8@@ -107,7 +107,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
6 LTLIBRARIES = $(lib_LTLIBRARIES) 9 LTLIBRARIES = $(lib_LTLIBRARIES)
7 am__DEPENDENCIES_1 = 10 am__DEPENDENCIES_1 =
8 libpoppler_glib_la_DEPENDENCIES = \ 11 libpoppler_glib_la_DEPENDENCIES = \
9- $(top_builddir)/poppler/libpoppler.la \ 12- $(top_builddir)/poppler/libpoppler.la \
10+ $(prefix)/lib/libpoppler.la \ 13+ $(prefix)/lib/libpoppler.la \
11 $(top_builddir)/poppler/libpoppler-cairo.la \ 14 $(top_builddir)/poppler/libpoppler-cairo.la \
12 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) 15 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
13 am__objects_1 = poppler-enums.lo 16 am__objects_1 = poppler-enums.lo
14@@ -475,7 +475,7 @@ libpoppler_glib_la_SOURCES = \ 17@@ -475,7 +475,7 @@ libpoppler_glib_la_SOURCES = \
cvs diff -r1.15 -r1.16 pkgsrc/print/poppler/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/print/poppler/patches/Attic/patch-ab 2013/03/24 07:09:24 1.15
+++ pkgsrc/print/poppler/patches/Attic/patch-ab 2013/07/04 13:13:55 1.16
@@ -1,35 +1,39 @@ @@ -1,35 +1,39 @@
1$NetBSD: patch-ab,v 1.15 2013/03/24 07:09:24 spz Exp $ 1$NetBSD: patch-ab,v 1.16 2013/07/04 13:13:55 wiz Exp $
2 2
3--- utils/Makefile.in.orig 2013-02-10 10:48:38.000000000 +0000 3Use installed poppler library so we can have a separate poppler-utils
 4package.
 5
 6--- utils/Makefile.in.orig 2013-06-16 16:24:11.000000000 +0000
4+++ utils/Makefile.in 7+++ utils/Makefile.in
5@@ -76,7 +76,7 @@ CONFIG_HEADER = $(top_builddir)/config.h 8@@ -103,7 +103,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
6 $(top_builddir)/poppler/poppler-config.h 9 $(top_builddir)/poppler/poppler-config.h
7 CONFIG_CLEAN_FILES = 10 CONFIG_CLEAN_FILES =
8 CONFIG_CLEAN_VPATH_FILES = 11 CONFIG_CLEAN_VPATH_FILES =
9-@BUILD_SPLASH_OUTPUT_TRUE@am__EXEEXT_1 = pdftoppm$(EXEEXT) 12-@BUILD_SPLASH_OUTPUT_TRUE@am__EXEEXT_1 = pdftoppm$(EXEEXT)
10+am__EXEEXT_1 = pdftoppm$(EXEEXT) 13+am__EXEEXT_1 = pdftoppm$(EXEEXT)
11 @BUILD_CAIRO_OUTPUT_TRUE@am__EXEEXT_2 = pdftocairo$(EXEEXT) 14 @BUILD_CAIRO_OUTPUT_TRUE@am__EXEEXT_2 = pdftocairo$(EXEEXT)
12 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" 15 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
13 PROGRAMS = $(bin_PROGRAMS) 16 PROGRAMS = $(bin_PROGRAMS)
14@@ -84,33 +84,33 @@ am__objects_1 = parseargs.$(OBJEXT) 17@@ -111,7 +111,7 @@ am__objects_1 = parseargs.$(OBJEXT)
15 am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1) 18 am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)
16 pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS) 19 pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
17 pdfdetach_LDADD = $(LDADD) 20 pdfdetach_LDADD = $(LDADD)
18-pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la 21-pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
19+pdfdetach_DEPENDENCIES = $(prefix)/lib/libpoppler.la 22+pdfdetach_DEPENDENCIES = $(prefix)/lib/libpoppler.la
20 AM_V_lt = $(am__v_lt_@AM_V@) 23 AM_V_lt = $(am__v_lt_@AM_V@)
21 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) 24 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
22 am__v_lt_0 = --silent 25 am__v_lt_0 = --silent
 26@@ -119,26 +119,26 @@ am__v_lt_1 =
23 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1) 27 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
24 pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) 28 pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
25 pdffonts_LDADD = $(LDADD) 29 pdffonts_LDADD = $(LDADD)
26-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la 30-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
27+pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la 31+pdffonts_DEPENDENCIES = $(prefix)/lib/libpoppler.la
28 am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \ 32 am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
29 $(am__objects_1) 33 $(am__objects_1)
30 pdfimages_OBJECTS = $(am_pdfimages_OBJECTS) 34 pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
31 pdfimages_LDADD = $(LDADD) 35 pdfimages_LDADD = $(LDADD)
32-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la 36-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
33+pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la 37+pdfimages_DEPENDENCIES = $(prefix)/lib/libpoppler.la
34 am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \ 38 am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
35 $(am__objects_1) 39 $(am__objects_1)
@@ -41,27 +45,27 @@ $NetBSD: patch-ab,v 1.15 2013/03/24 07:0 @@ -41,27 +45,27 @@ $NetBSD: patch-ab,v 1.15 2013/03/24 07:0
41 pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS) 45 pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
42 pdfseparate_LDADD = $(LDADD) 46 pdfseparate_LDADD = $(LDADD)
43-pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la 47-pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
44+pdfseparate_DEPENDENCIES = $(prefix)/lib/libpoppler.la 48+pdfseparate_DEPENDENCIES = $(prefix)/lib/libpoppler.la
45 am__pdftocairo_SOURCES_DIST = pdftocairo.cc parseargs.cc parseargs.h 49 am__pdftocairo_SOURCES_DIST = pdftocairo.cc parseargs.cc parseargs.h
46 @BUILD_CAIRO_OUTPUT_TRUE@am_pdftocairo_OBJECTS = pdftocairo.$(OBJEXT) \ 50 @BUILD_CAIRO_OUTPUT_TRUE@am_pdftocairo_OBJECTS = pdftocairo.$(OBJEXT) \
47 @BUILD_CAIRO_OUTPUT_TRUE@ $(am__objects_1) 51 @BUILD_CAIRO_OUTPUT_TRUE@ $(am__objects_1)
48 pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS) 52 pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
49-am__DEPENDENCIES_1 = $(top_builddir)/poppler/libpoppler.la 53-am__DEPENDENCIES_1 = $(top_builddir)/poppler/libpoppler.la
50+am__DEPENDENCIES_1 = $(prefix)/lib/libpoppler.la 54+am__DEPENDENCIES_1 = $(prefix)/lib/libpoppler.la
51 am__DEPENDENCIES_2 = 55 am__DEPENDENCIES_2 =
52 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \ 56 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \
53 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2) 57 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2)
54@@ -124,29 +124,29 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht 58@@ -152,29 +152,29 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
55 pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2) 59 pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2)
56 pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) 60 pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
57 pdftohtml_LDADD = $(LDADD) 61 pdftohtml_LDADD = $(LDADD)
58-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la 62-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
59+pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la 63+pdftohtml_DEPENDENCIES = $(prefix)/lib/libpoppler.la
60 pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ 64 pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
61 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \ 65 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
62 $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ 66 $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
63 am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.cc parseargs.h 67 am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.cc parseargs.h
64-@BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \ 68-@BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
65-@BUILD_SPLASH_OUTPUT_TRUE@ $(am__objects_1) 69-@BUILD_SPLASH_OUTPUT_TRUE@ $(am__objects_1)
66+am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \ 70+am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
67+ $(am__objects_1) 71+ $(am__objects_1)
@@ -75,46 +79,46 @@ $NetBSD: patch-ab,v 1.15 2013/03/24 07:0 @@ -75,46 +79,46 @@ $NetBSD: patch-ab,v 1.15 2013/03/24 07:0
75-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la 79-pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
76+pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la 80+pdftops_DEPENDENCIES = $(prefix)/lib/libpoppler.la
77 am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \ 81 am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \
78 $(am__objects_1) 82 $(am__objects_1)
79 pdftotext_OBJECTS = $(am_pdftotext_OBJECTS) 83 pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
80 pdftotext_LDADD = $(LDADD) 84 pdftotext_LDADD = $(LDADD)
81-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la 85-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
82+pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la 86+pdftotext_DEPENDENCIES = $(prefix)/lib/libpoppler.la
83 am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1) 87 am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1)
84 pdfunite_OBJECTS = $(am_pdfunite_OBJECTS) 88 pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
85 pdfunite_LDADD = $(LDADD) 89 pdfunite_LDADD = $(LDADD)
86-pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la 90-pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
87+pdfunite_DEPENDENCIES = $(prefix)/lib/libpoppler.la 91+pdfunite_DEPENDENCIES = $(prefix)/lib/libpoppler.la
88 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler 92 AM_V_P = $(am__v_P_@AM_V@)
89 depcomp = $(SHELL) $(top_srcdir)/depcomp 93 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
90 am__depfiles_maybe = depfiles 94 am__v_P_0 = false
91@@ -436,12 +436,12 @@ top_build_prefix = @top_build_prefix@ 95@@ -491,12 +491,12 @@ top_build_prefix = @top_build_prefix@
92 top_builddir = @top_builddir@ 96 top_builddir = @top_builddir@
93 top_srcdir = @top_srcdir@ 97 top_srcdir = @top_srcdir@
94 win32_libs = @win32_libs@ 98 win32_libs = @win32_libs@
95-@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_SOURCES = \ 99-@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_SOURCES = \
96-@BUILD_SPLASH_OUTPUT_TRUE@ pdftoppm.cc \ 100-@BUILD_SPLASH_OUTPUT_TRUE@ pdftoppm.cc \
97-@BUILD_SPLASH_OUTPUT_TRUE@ $(common) 101-@BUILD_SPLASH_OUTPUT_TRUE@ $(common)
98+pdftoppm_SOURCES = \ 102+pdftoppm_SOURCES = \
99+ pdftoppm.cc \ 103+ pdftoppm.cc \
100+ $(common) 104+ $(common)
101  105
102-@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_binary = pdftoppm 106-@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_binary = pdftoppm
103-@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_manpage = pdftoppm.1 107-@BUILD_SPLASH_OUTPUT_TRUE@pdftoppm_manpage = pdftoppm.1
104+pdftoppm_binary = pdftoppm 108+pdftoppm_binary = pdftoppm
105+pdftoppm_manpage = pdftoppm.1 109+pdftoppm_manpage = pdftoppm.1
106 INCLUDES = \ 110 INCLUDES = \
107 -I$(top_srcdir) \ 111 -I$(top_srcdir) \
108 -I$(top_srcdir)/goo \ 112 -I$(top_srcdir)/goo \
109@@ -451,8 +451,9 @@ INCLUDES = \ 113@@ -506,8 +506,9 @@ INCLUDES = \
110 $(PDFTOCAIRO_CFLAGS) 114 $(PDFTOCAIRO_CFLAGS)
111  115
112 LDADD = \ 116 LDADD = \
113- $(top_builddir)/poppler/libpoppler.la \ 117- $(top_builddir)/poppler/libpoppler.la \
114- $(UTILS_LIBS) 118- $(UTILS_LIBS)
115+ $(prefix)/lib/libpoppler.la \ 119+ $(prefix)/lib/libpoppler.la \
116+ $(UTILS_LIBS) \ 120+ $(UTILS_LIBS) \
117+ $(PTHREAD_STUBLIB) 121+ $(PTHREAD_STUBLIB)
118  122
119 @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_SOURCES = \ 123 @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_SOURCES = \
120 @BUILD_CAIRO_OUTPUT_TRUE@ pdftocairo.cc \ 124 @BUILD_CAIRO_OUTPUT_TRUE@ pdftocairo.cc \
cvs diff -r1.4 -r1.5 pkgsrc/print/poppler/patches/Attic/patch-ar (expand / switch to unified diff)

--- pkgsrc/print/poppler/patches/Attic/patch-ar 2012/07/04 20:25:16 1.4
+++ pkgsrc/print/poppler/patches/Attic/patch-ar 2013/07/04 13:13:55 1.5
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-ar,v 1.4 2012/07/04 20:25:16 drochner Exp $ 1$NetBSD: patch-ar,v 1.5 2013/07/04 13:13:55 wiz Exp $
 2
 3Use installed poppler library so we can have a separate poppler-cpp
 4package.
2 5
3--- cpp/Makefile.in.orig 2011-10-26 12:40:03.000000000 +0000 6--- cpp/Makefile.in.orig 2011-10-26 12:40:03.000000000 +0000
4+++ cpp/Makefile.in 7+++ cpp/Makefile.in
5@@ -79,7 +79,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"  8@@ -79,7 +79,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
6 LTLIBRARIES = $(lib_LTLIBRARIES) 9 LTLIBRARIES = $(lib_LTLIBRARIES)
7 am__DEPENDENCIES_1 = 10 am__DEPENDENCIES_1 =
8 libpoppler_cpp_la_DEPENDENCIES = \ 11 libpoppler_cpp_la_DEPENDENCIES = \
9- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) 12- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
10+ $(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1) 13+ $(prefix)/lib/libpoppler.la $(am__DEPENDENCIES_1)
11 am_libpoppler_cpp_la_OBJECTS = libpoppler_cpp_la-PNMWriter.lo \ 14 am_libpoppler_cpp_la_OBJECTS = libpoppler_cpp_la-PNMWriter.lo \
12 libpoppler_cpp_la-poppler-document.lo \ 15 libpoppler_cpp_la-poppler-document.lo \
13 libpoppler_cpp_la-poppler-embedded-file.lo \ 16 libpoppler_cpp_la-poppler-embedded-file.lo \
14@@ -426,7 +426,7 @@ libpoppler_cpp_la_CXXFLAGS = \ 17@@ -426,7 +426,7 @@ libpoppler_cpp_la_CXXFLAGS = \
cvs diff -r1.3 -r1.4 pkgsrc/print/poppler/patches/Attic/patch-as (expand / switch to unified diff)

--- pkgsrc/print/poppler/patches/Attic/patch-as 2011/10/20 16:32:57 1.3
+++ pkgsrc/print/poppler/patches/Attic/patch-as 2013/07/04 13:13:55 1.4
@@ -1,13 +1,16 @@ @@ -1,13 +1,16 @@
1$NetBSD: patch-as,v 1.3 2011/10/20 16:32:57 drochner Exp $ 1$NetBSD: patch-as,v 1.4 2013/07/04 13:13:55 wiz Exp $
 2
 3Use installed poppler library so we can have a separate poppler-cpp
 4package.
2 5
3--- cpp/tests/Makefile.in.orig 2011-06-27 18:45:14.000000000 +0000 6--- cpp/tests/Makefile.in.orig 2011-06-27 18:45:14.000000000 +0000
4+++ cpp/tests/Makefile.in 7+++ cpp/tests/Makefile.in
5@@ -300,7 +300,7 @@ INCLUDES = \ 8@@ -300,7 +300,7 @@ INCLUDES = \
6 -I$(top_srcdir)/cpp 9 -I$(top_srcdir)/cpp
7  10
8 LDADDS = \ 11 LDADDS = \
9- $(top_builddir)/poppler/libpoppler.la \ 12- $(top_builddir)/poppler/libpoppler.la \
10+ $(prefix)/lib/libpoppler.la \ 13+ $(prefix)/lib/libpoppler.la \
11 $(top_builddir)/cpp/libpoppler-cpp.la 14 $(top_builddir)/cpp/libpoppler-cpp.la
12  15
13 poppler_dump_SOURCES = \ 16 poppler_dump_SOURCES = \