Presenting GNOME 2.26 for FreeBSD. See

http://library.gnome.org/misc/release-notes/2.26/ for a list of what's new.
On the FreeBSD front, we introduced a port of libxul 1.9 as an alternative
for Firefox 2.0 as a Gecko provider.  Almost all of the Gecko consumers
can make use of this provider by setting:

WITH_GECKO=libxul

The GNOME 2.26 port was done by ahze, kwm, marcus, and mezz with
contributions by Joseph S. Atkinson, Peter Wemm, Eric L. Chen,
Martin Matuska, Craig Butler, and Pawel Worach.

4 files changed, 18 insertions, 17 deletions

diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index cdb137f73bb7..3f083d61e97c 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 marcus@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports-stable/graphics/poppler/Makefile,v 1.8 2008/06/20 17:47:36 mezz Exp $
+#   $MCom: ports/graphics/poppler/Makefile,v 1.44 2009/03/14 05:12:31 marcus Exp $
 #
 
 PORTNAME=	poppler
-PORTVERSION=	0.8.7
-PORTREVISION?=	1
+PORTVERSION=	0.10.5
+PORTREVISION?=	0
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
 
@@ -36,7 +36,7 @@ OPTIONS=	CAIRO "Enable cairo output backend" on
 .include <bsd.port.pre.mk>
 
 .if defined(SLAVEPORT)
-LIB_DEPENDS+=	poppler.3:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS+=	poppler.4:${PORTSDIR}/graphics/poppler
 
 .if ${SLAVEPORT}=="gtk"
 CONFIGURE_ARGS+=--enable-poppler-glib
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 7083d1f67d6d..900de9a128c4 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.8.7.tar.gz) = 9af81429d6f8639c357a5eed25583365
-SHA256 (poppler-0.8.7.tar.gz) = 3f96dee17eecf16cfd3cae711819f07b42fcc512c3151cc8b911b19ccecf22f7
-SIZE (poppler-0.8.7.tar.gz) = 1469587
+MD5 (poppler-0.10.5.tar.gz) = 125f671a19707861132fb03e73b61184
+SHA256 (poppler-0.10.5.tar.gz) = cfd4115f787cac7f0f673be48e95c645a323dc5b6b756280e47e28faa5d98d92
+SIZE (poppler-0.10.5.tar.gz) = 1516687
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
index 72154021da8d..e0faea3d198e 100644
--- a/graphics/poppler/files/patch-utils_Makefile.in
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -1,6 +1,6 @@
---- utils/Makefile.in.orig	2008-03-27 08:18:44.000000000 -0400
-+++ utils/Makefile.in	2008-03-27 08:19:51.000000000 -0400
-@@ -58,48 +58,48 @@
+--- utils/Makefile.in.orig	2009-02-26 18:44:48.000000000 -0500
++++ utils/Makefile.in	2009-02-26 18:45:57.000000000 -0500
+@@ -61,50 +61,50 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
  am__DEPENDENCIES_1 =
@@ -14,7 +14,8 @@
 -pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 +pdfimages_DEPENDENCIES = \
  	$(am__DEPENDENCIES_1)
- am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) $(am__objects_1)
+ am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
+ 	$(am__objects_1)
  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  pdfinfo_LDADD = $(LDADD)
 -pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
@@ -49,7 +50,8 @@
 -pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
 +pdftops_DEPENDENCIES = \
  	$(am__DEPENDENCIES_1)
- am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) $(am__objects_1)
+ am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \
+ 	$(am__objects_1)
  pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
  pdftotext_LDADD = $(LDADD)
 -pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
@@ -57,7 +59,7 @@
  	$(am__DEPENDENCIES_1)
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -302,7 +302,7 @@
+@@ -320,7 +320,7 @@ INCLUDES = \
  	$(ABIWORD_CFLAGS)
  
  LDADD = \
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index 34676e685587..1ea3318716f2 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -1,6 +1,5 @@
 include/poppler/Annot.h
 include/poppler/Array.h
-include/poppler/BaseFile.h
 include/poppler/BuiltinFont.h
 include/poppler/BuiltinFontTables.h
 include/poppler/CMap.h
@@ -8,14 +7,15 @@ include/poppler/Catalog.h
 include/poppler/CharCodeToUnicode.h
 include/poppler/CharTypes.h
 include/poppler/CompactFontTables.h
+include/poppler/DateInfo.h
 include/poppler/Decrypt.h
 include/poppler/Dict.h
 include/poppler/Error.h
 include/poppler/ErrorCodes.h
+include/poppler/FileSpec.h
 include/poppler/FontEncodingTables.h
 include/poppler/FontInfo.h
 include/poppler/Form.h
-include/poppler/Function.cc
 include/poppler/Function.h
 include/poppler/Gfx.h
 include/poppler/GfxFont.h
@@ -23,7 +23,6 @@ include/poppler/GfxState.h
 include/poppler/GlobalParams.h
 include/poppler/JArithmeticDecoder.h
 include/poppler/JBIG2Stream.h
-include/poppler/JPXStream.h
 include/poppler/Lexer.h
 include/poppler/Link.h
 include/poppler/Movie.h
@@ -94,7 +93,7 @@ include/poppler/splash/SplashXPathScanner.h
 lib/libpoppler.a
 lib/libpoppler.la
 lib/libpoppler.so
-lib/libpoppler.so.3
+lib/libpoppler.so.4
 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
 libdata/pkgconfig/poppler-splash.pc
 libdata/pkgconfig/poppler.pc