Update to 0.6.

7 files changed, 26 insertions, 15 deletions

diff --git a/graphics/poppler-gtk/pkg-plist b/graphics/poppler-gtk/pkg-plist
index 21eab7fb4d3a..a65344cde4fa 100644
--- a/graphics/poppler-gtk/pkg-plist
+++ b/graphics/poppler-gtk/pkg-plist
@@ -9,7 +9,7 @@ include/poppler/glib/poppler.h
 lib/libpoppler-glib.a
 lib/libpoppler-glib.la
 lib/libpoppler-glib.so
-lib/libpoppler-glib.so.1
+lib/libpoppler-glib.so.2
 libdata/pkgconfig/poppler-glib.pc
 %%DOCSDIR%%/poppler/ch01.html
 %%DOCSDIR%%/poppler/home.png
@@ -17,8 +17,10 @@ libdata/pkgconfig/poppler-glib.pc
 %%DOCSDIR%%/poppler/index.sgml
 %%DOCSDIR%%/poppler/left.png
 %%DOCSDIR%%/poppler/poppler-poppler-action.html
+%%DOCSDIR%%/poppler/poppler-poppler-attachment.html
 %%DOCSDIR%%/poppler/poppler-poppler-document.html
 %%DOCSDIR%%/poppler/poppler-poppler-enums.html
+%%DOCSDIR%%/poppler/poppler-poppler-form-field.html
 %%DOCSDIR%%/poppler/poppler-poppler-page.html
 %%DOCSDIR%%/poppler/poppler-poppler.html
 %%DOCSDIR%%/poppler/poppler.devhelp
diff --git a/graphics/poppler-qt/pkg-plist b/graphics/poppler-qt/pkg-plist
index 2e41ad8a4f1d..77f6db2e22e8 100644
--- a/graphics/poppler-qt/pkg-plist
+++ b/graphics/poppler-qt/pkg-plist
@@ -4,6 +4,6 @@ include/poppler/qt3/poppler-qt.h
 lib/libpoppler-qt.a
 lib/libpoppler-qt.la
 lib/libpoppler-qt.so
-lib/libpoppler-qt.so.1
+lib/libpoppler-qt.so.2
 libdata/pkgconfig/poppler-qt.pc
 @dirrm include/poppler/qt3
diff --git a/graphics/poppler-qt4/pkg-plist b/graphics/poppler-qt4/pkg-plist
index 06668ac27ce8..e3723c05f403 100644
--- a/graphics/poppler-qt4/pkg-plist
+++ b/graphics/poppler-qt4/pkg-plist
@@ -6,6 +6,6 @@ include/poppler/qt4/poppler-qt4.h
 lib/libpoppler-qt4.a
 lib/libpoppler-qt4.la
 lib/libpoppler-qt4.so
-lib/libpoppler-qt4.so.1
+lib/libpoppler-qt4.so.2
 libdata/pkgconfig/poppler-qt4.pc
 @dirrm include/poppler/qt4
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index ce56392bf76a..c8a9b954d554 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	poppler
-PORTVERSION=	0.5.91
+PORTVERSION=	0.6
 PORTREVISION?=	0
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
@@ -34,7 +34,7 @@ OPTIONS=	CAIRO "Enable cairo output backend" on
 .include <bsd.port.pre.mk>
 
 .if defined(SLAVEPORT)
-LIB_DEPENDS+=	poppler.1:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS+=	poppler.2:${PORTSDIR}/graphics/poppler
 .if ${SLAVEPORT}=="gtk"
 CONFIGURE_ARGS+=--enable-poppler-glib
 USE_GNOME+=	gtk20
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index a64bce22bcb5..42092b82d881 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.5.91.tar.gz) = 0cc1b0f183b1559f10154bb57268c6e1
-SHA256 (poppler-0.5.91.tar.gz) = 4e046b243c2a322008aa2dd7ed09e39d6b2e183482d09486873735031c30b888
-SIZE (poppler-0.5.91.tar.gz) = 1184826
+MD5 (poppler-0.6.tar.gz) = 96883867572aa1e55e979ec75369c562
+SHA256 (poppler-0.6.tar.gz) = ef4bb8fd1bb4dffd5dc689509bf3e33260774550425ee78995a8d0297f76bfae
+SIZE (poppler-0.6.tar.gz) = 1228142
diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in
index a073bf3e692c..1df868bc4b3c 100644
--- a/graphics/poppler/files/patch-glib_Makefile.in
+++ b/graphics/poppler/files/patch-glib_Makefile.in
@@ -1,6 +1,6 @@
---- glib/Makefile.in.orig	Wed Jun 20 07:19:52 2007
-+++ glib/Makefile.in	Wed Jun 20 07:30:35 2007
-@@ -66,7 +66,6 @@
+--- glib/Makefile.in.orig	2007-09-10 23:46:36.000000000 -0400
++++ glib/Makefile.in	2007-09-10 23:49:39.000000000 -0400
+@@ -66,7 +66,6 @@ am__DEPENDENCIES_1 =
  @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \
  @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1)
  libpoppler_glib_la_DEPENDENCIES =  \
@@ -8,7 +8,7 @@
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_2)
  am__objects_1 = poppler-enums.lo
-@@ -78,7 +77,7 @@
+@@ -78,7 +77,7 @@ PROGRAMS = $(noinst_PROGRAMS)
  am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
  test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
  test_poppler_glib_DEPENDENCIES =  \
@@ -17,7 +17,16 @@
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_2)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -319,7 +318,7 @@
+@@ -285,7 +284,7 @@ win32_libs = @win32_libs@
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(top_builddir)/poppler/libpoppler-cairo.la	\
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(CAIRO_LIBS)
+ 
+-SUBDIRS = . reference demo
++SUBDIRS = . reference
+ INCLUDES = \
+ 	-DG_LOG_DOMAIN=\"Poppler\"		\
+ 	-I$(top_srcdir)				\
+@@ -323,7 +322,7 @@ libpoppler_glib_la_SOURCES = \
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
@@ -26,7 +35,7 @@
  	$(POPPLER_GLIB_LIBS)				\
  	$(FREETYPE_LIBS)				\
  	$(FONTCONFIG_LIBS)				\
-@@ -330,7 +329,7 @@
+@@ -334,7 +333,7 @@ test_poppler_glib_SOURCES = \
         test-poppler-glib.c
  
  test_poppler_glib_LDADD = \
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index 8a998462d061..e9107d64c59f 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -92,7 +92,7 @@ include/poppler/splash/SplashXPathScanner.h
 lib/libpoppler.a
 lib/libpoppler.la
 lib/libpoppler.so
-lib/libpoppler.so.1
+lib/libpoppler.so.2
 libdata/pkgconfig/poppler-cairo.pc
 libdata/pkgconfig/poppler-splash.pc
 libdata/pkgconfig/poppler.pc