[pkgsrc/trunk]: pkgsrc/print update to 0.12.0

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/042245647469
branches:  trunk
changeset: 564703:042245647469
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Sep 09 19:57:05 2009 +0000

description:
update to 0.12.0
This is a major update, switches to the 0.12 release branch.
Most notable change is that the color management stuff which we had
as patches in pkgsrc is official now.
Otherwise - many fixes and enhancements.

(while this is a .0 release I've been tracking the 0.11.x snapshots
and release candidate for a while so I don't expect big problems)

diffstat:

 print/poppler-glib/Makefile          |    3 +-
 print/poppler-glib/PLIST             |    7 +-
 print/poppler-includes/Makefile      |    3 +-
 print/poppler-includes/PLIST         |    6 +-
 print/poppler-includes/buildlink3.mk |    4 +-
 print/poppler-qt/Makefile            |    3 +-
 print/poppler-qt4/Makefile           |    3 +-
 print/poppler-utils/Makefile         |    4 +-
 print/poppler/Makefile               |    5 +-
 print/poppler/Makefile.common        |    4 +-
 print/poppler/buildlink3.mk          |    4 +-
 print/poppler/distinfo               |   21 +-
 print/poppler/patches/patch-ab       |   23 +-
 print/poppler/patches/patch-ag       |   10 +-
 print/poppler/patches/patch-ai       |  313 +-----------
 print/poppler/patches/patch-aj       |   51 -
 print/poppler/patches/patch-ak       |   27 -
 print/poppler/patches/patch-al       |   22 -
 print/poppler/patches/patch-am       |   22 -
 print/poppler/patches/patch-an       |  107 ----
 print/poppler/patches/patch-ca       |  936 -----------------------------------
 print/poppler/patches/patch-cb       |  156 -----
 22 files changed, 56 insertions(+), 1678 deletions(-)

diffs (truncated from 2010 to 300 lines):

diff -r ecbb984968ab -r 042245647469 print/poppler-glib/Makefile
--- a/print/poppler-glib/Makefile       Wed Sep 09 18:15:37 2009 +0000
+++ b/print/poppler-glib/Makefile       Wed Sep 09 19:57:05 2009 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2009/08/26 19:56:45 sno Exp $
+# $NetBSD: Makefile,v 1.23 2009/09/09 19:57:06 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=               poppler-glib-${POPPLER_VERS}
-PKGREVISION=           1
 
 COMMENT=               PDF rendering library (GLib wrapper)
 MAINTAINER=            reed%reedmedia.net@localhost
diff -r ecbb984968ab -r 042245647469 print/poppler-glib/PLIST
--- a/print/poppler-glib/PLIST  Wed Sep 09 18:15:37 2009 +0000
+++ b/print/poppler-glib/PLIST  Wed Sep 09 19:57:05 2009 +0000
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:11:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/09/09 19:57:06 drochner Exp $
 include/poppler/glib/poppler-action.h
 include/poppler/glib/poppler-annot.h
 include/poppler/glib/poppler-attachment.h
+include/poppler/glib/poppler-date.h
 include/poppler/glib/poppler-document.h
 include/poppler/glib/poppler-enums.h
 include/poppler/glib/poppler-features.h
 include/poppler/glib/poppler-form-field.h
+include/poppler/glib/poppler-layer.h
 include/poppler/glib/poppler-page.h
 include/poppler/glib/poppler.h
 lib/libpoppler-glib.la
@@ -17,10 +19,13 @@
 share/gtk-doc/html/poppler/index.sgml
 share/gtk-doc/html/poppler/left.png
 share/gtk-doc/html/poppler/poppler-poppler-action.html
+share/gtk-doc/html/poppler/poppler-poppler-annot.html
 share/gtk-doc/html/poppler/poppler-poppler-attachment.html
 share/gtk-doc/html/poppler/poppler-poppler-document.html
 share/gtk-doc/html/poppler/poppler-poppler-enums.html
+share/gtk-doc/html/poppler/poppler-poppler-features.html
 share/gtk-doc/html/poppler/poppler-poppler-form-field.html
+share/gtk-doc/html/poppler/poppler-poppler-layer.html
 share/gtk-doc/html/poppler/poppler-poppler-page.html
 share/gtk-doc/html/poppler/poppler-poppler.html
 share/gtk-doc/html/poppler/poppler.devhelp
diff -r ecbb984968ab -r 042245647469 print/poppler-includes/Makefile
--- a/print/poppler-includes/Makefile   Wed Sep 09 18:15:37 2009 +0000
+++ b/print/poppler-includes/Makefile   Wed Sep 09 19:57:05 2009 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2009/06/11 22:52:56 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/09/09 19:57:06 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=               poppler-includes-${POPPLER_VERS}
-PKGREVISION=           1
 
 COMMENT=               Poppler Xpdf includes (unsupported)
 MAINTAINER=            dillo%NetBSD.org@localhost
diff -r ecbb984968ab -r 042245647469 print/poppler-includes/PLIST
--- a/print/poppler-includes/PLIST      Wed Sep 09 18:15:37 2009 +0000
+++ b/print/poppler-includes/PLIST      Wed Sep 09 19:57:05 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:11:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/09/09 19:57:06 drochner Exp $
 include/poppler/Annot.h
 include/poppler/Array.h
 include/poppler/BuiltinFont.h
@@ -21,6 +21,7 @@
 include/poppler/Gfx.h
 include/poppler/GfxFont.h
 include/poppler/GfxState.h
+include/poppler/GfxState_helpers.h
 include/poppler/GlobalParams.h
 include/poppler/JArithmeticDecoder.h
 include/poppler/JBIG2Stream.h
@@ -40,6 +41,7 @@
 include/poppler/Page.h
 include/poppler/PageTransition.h
 include/poppler/Parser.h
+include/poppler/PopplerCache.h
 include/poppler/PreScanOutputDev.h
 include/poppler/ProfileData.h
 include/poppler/SecurityHandler.h
@@ -64,8 +66,10 @@
 include/poppler/goo/GooString.h
 include/poppler/goo/GooTimer.h
 include/poppler/goo/GooVector.h
+include/poppler/goo/PNGWriter.h
 include/poppler/goo/gfile.h
 include/poppler/goo/gmem.h
+include/poppler/goo/gstrtod.h
 include/poppler/goo/gtypes.h
 include/poppler/poppler-config.h
 include/poppler/splash/Splash.h
diff -r ecbb984968ab -r 042245647469 print/poppler-includes/buildlink3.mk
--- a/print/poppler-includes/buildlink3.mk      Wed Sep 09 18:15:37 2009 +0000
+++ b/print/poppler-includes/buildlink3.mk      Wed Sep 09 19:57:05 2009 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:15 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/09/09 19:57:06 drochner Exp $
+
+BUILDLINK_DEPMETHOD.poppler-includes?= build
 
 BUILDLINK_TREE+=       poppler-includes
 
diff -r ecbb984968ab -r 042245647469 print/poppler-qt/Makefile
--- a/print/poppler-qt/Makefile Wed Sep 09 18:15:37 2009 +0000
+++ b/print/poppler-qt/Makefile Wed Sep 09 19:57:05 2009 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2009/08/26 19:56:45 sno Exp $
+# $NetBSD: Makefile,v 1.20 2009/09/09 19:57:06 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=               poppler-qt-${POPPLER_VERS}
-PKGREVISION=           1
 
 COMMENT=               PDF rendering library (QT wrapper)
 MAINTAINER=            reed%reedmedia.net@localhost
diff -r ecbb984968ab -r 042245647469 print/poppler-qt4/Makefile
--- a/print/poppler-qt4/Makefile        Wed Sep 09 18:15:37 2009 +0000
+++ b/print/poppler-qt4/Makefile        Wed Sep 09 19:57:05 2009 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2009/08/26 19:56:45 sno Exp $
+# $NetBSD: Makefile,v 1.9 2009/09/09 19:57:06 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=               poppler-qt4-${POPPLER_VERS}
-PKGREVISION=           1
 
 COMMENT=               PDF rendering library (QT4 wrapper)
 MAINTAINER=            reed%reedmedia.net@localhost
diff -r ecbb984968ab -r 042245647469 print/poppler-utils/Makefile
--- a/print/poppler-utils/Makefile      Wed Sep 09 18:15:37 2009 +0000
+++ b/print/poppler-utils/Makefile      Wed Sep 09 19:57:05 2009 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2009/08/26 19:58:14 sno Exp $
+# $NetBSD: Makefile,v 1.9 2009/09/09 19:57:06 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=               poppler-utils-${POPPLER_VERS}
-PKGREVISION=           1
 
 COMMENT=               PDF utilities (from poppler)
 MAINTAINER=            reed%reedmedia.net@localhost
@@ -45,4 +44,5 @@
 .endif
 MAKE_ENV+=             PTHREAD_STUBLIB=${PTHREAD_STUBLIB}
 
+.include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ecbb984968ab -r 042245647469 print/poppler/Makefile
--- a/print/poppler/Makefile    Wed Sep 09 18:15:37 2009 +0000
+++ b/print/poppler/Makefile    Wed Sep 09 19:57:05 2009 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2009/08/26 19:56:42 sno Exp $
+# $NetBSD: Makefile,v 1.43 2009/09/09 19:57:05 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
-PKGREVISION=   2
-
 COMMENT=               PDF rendering library
 MAINTAINER=            reed%reedmedia.net@localhost
 
@@ -53,5 +51,6 @@
 
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ecbb984968ab -r 042245647469 print/poppler/Makefile.common
--- a/print/poppler/Makefile.common     Wed Sep 09 18:15:37 2009 +0000
+++ b/print/poppler/Makefile.common     Wed Sep 09 19:57:05 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2009/05/25 21:05:23 drochner Exp $
+# $NetBSD: Makefile.common,v 1.31 2009/09/09 19:57:05 drochner Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-glib/Makefile
@@ -7,7 +7,7 @@
 # used by print/poppler-qt4/Makefile
 # used by print/poppler-utils/Makefile
 
-POPPLER_VERS=          0.10.7
+POPPLER_VERS=          0.12.0
 DISTNAME=              poppler-${POPPLER_VERS}
 CATEGORIES=            print
 MASTER_SITES=          http://poppler.freedesktop.org/
diff -r ecbb984968ab -r 042245647469 print/poppler/buildlink3.mk
--- a/print/poppler/buildlink3.mk       Wed Sep 09 18:15:37 2009 +0000
+++ b/print/poppler/buildlink3.mk       Wed Sep 09 19:57:05 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/08/26 19:56:42 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/09/09 19:57:05 drochner Exp $
 
 BUILDLINK_TREE+=       poppler
 
@@ -6,7 +6,7 @@
 POPPLER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.poppler+=        poppler>=0.5.1
-BUILDLINK_ABI_DEPENDS.poppler+=        poppler>=0.10.7nb2
+BUILDLINK_ABI_DEPENDS.poppler+=        poppler>=0.11.2
 BUILDLINK_PKGSRCDIR.poppler?=  ../../print/poppler
 
 pkgbase := poppler
diff -r ecbb984968ab -r 042245647469 print/poppler/distinfo
--- a/print/poppler/distinfo    Wed Sep 09 18:15:37 2009 +0000
+++ b/print/poppler/distinfo    Wed Sep 09 19:57:05 2009 +0000
@@ -1,16 +1,9 @@
-$NetBSD: distinfo,v 1.45 2009/07/28 18:22:49 drochner Exp $
+$NetBSD: distinfo,v 1.46 2009/09/09 19:57:05 drochner Exp $
 
-SHA1 (poppler-0.10.7.tar.gz) = 891284d3fcac9bb250218e3439e596778c7f5edb
-RMD160 (poppler-0.10.7.tar.gz) = a275742a11df1965e4b7d06115f071f67d781d8f
-Size (poppler-0.10.7.tar.gz) = 1531154 bytes
+SHA1 (poppler-0.12.0.tar.gz) = 6165cfc46340644e8750ab8a37f3a3d634144106
+RMD160 (poppler-0.12.0.tar.gz) = c90a6a437fb7b5e5c9c9cdaf72782be16cd8ae07
+Size (poppler-0.12.0.tar.gz) = 1595424 bytes
 SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615
-SHA1 (patch-ab) = 096382d2f7c240c7fbf5eee88d7ba5af5cf7cd1b
-SHA1 (patch-ag) = 0bf1bc080cad55792fe6cc761bf22ecccba7d13a
-SHA1 (patch-ai) = b58704153418b5e3b5d65a2e02e5a9b306b00cf7
-SHA1 (patch-aj) = 8bb1fe169bddb76ecc72129cc1dbd32030073dfd
-SHA1 (patch-ak) = ab4d0c91a6f2806b405954f8dab6e3d61a03b054
-SHA1 (patch-al) = b1d76a92a5ffad01543f0072a1a00e74e751a56f
-SHA1 (patch-am) = 2ee61c446ea85acde8c1ee798a0201901e565d55
-SHA1 (patch-an) = 357b88ed15a4d355b1532e0d95cc511b137b4c44
-SHA1 (patch-ca) = 5bd31c497c8cbfb6c1d6cb5b9183088113bef6e3
-SHA1 (patch-cb) = e8cfb16a0641788759b13cf5fcf97d82f9485adc
+SHA1 (patch-ab) = 6bde603d2934099631e057f022ab61b6ff965022
+SHA1 (patch-ag) = 89d4ca8d5325b703c953317f422501873d659ac6
+SHA1 (patch-ai) = 52376e12baaba63629156055d5254c29f6e89824
diff -r ecbb984968ab -r 042245647469 print/poppler/patches/patch-ab
--- a/print/poppler/patches/patch-ab    Wed Sep 09 18:15:37 2009 +0000
+++ b/print/poppler/patches/patch-ab    Wed Sep 09 19:57:05 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2009/05/25 21:05:24 drochner Exp $
+$NetBSD: patch-ab,v 1.11 2009/09/09 19:57:05 drochner Exp $
 
---- utils/Makefile.in.orig     2009-05-16 17:40:51.000000000 +0200
+--- utils/Makefile.in.orig     2009-08-18 21:04:22.000000000 +0200
 +++ utils/Makefile.in
-@@ -51,7 +51,7 @@ mkinstalldirs = $(install_sh) -d
+@@ -52,7 +52,7 @@ mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h \
        $(top_builddir)/poppler/poppler-config.h
  CONFIG_CLEAN_FILES =
@@ -11,7 +11,7 @@
  @BUILD_ABIWORD_OUTPUT_TRUE@am__EXEEXT_2 = pdftoabw$(EXEEXT)
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-@@ -61,19 +61,19 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
+@@ -62,25 +62,25 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
  am__DEPENDENCIES_1 =
@@ -34,7 +34,14 @@
        $(am__DEPENDENCIES_1)
  am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.c parseargs.h
  @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
-@@ -88,25 +88,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
+ @BUILD_ABIWORD_OUTPUT_TRUE@   $(am__objects_1)
+ pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS)
+-am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
++am__DEPENDENCIES_2 = $(prefix)/lib/libpoppler.la \
+       $(am__DEPENDENCIES_1)
+ @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_DEPENDENCIES =  \
+ @BUILD_ABIWORD_OUTPUT_TRUE@   $(am__DEPENDENCIES_2) \
+@@ -89,25 +89,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
        HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
@@ -66,7 +73,7 @@
        $(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -307,12 +307,12 @@ top_build_prefix = @top_build_prefix@
+@@ -319,12 +319,12 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  win32_libs = @win32_libs@
@@ -83,8 +90,8 @@
 +pdftoppm_manpage = pdftoppm.1
  INCLUDES = \
        -I$(top_srcdir)                         \
-       -I$(top_srcdir)/utils                   \
-@@ -322,9 +322,10 @@ INCLUDES = \