Index: poppler/Makefile
===================================================================
--- poppler/Makefile	(révision 376983)
+++ poppler/Makefile	(copie de travail)
@@ -3,8 +3,8 @@
 #   $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $
 
 PORTNAME=	poppler
-PORTVERSION=	0.26.3
-PORTREVISION?=	1
+PORTVERSION=	0.30.0
+PORTREVISION?=	0
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
 
Index: poppler/distinfo
===================================================================
--- poppler/distinfo	(révision 376983)
+++ poppler/distinfo	(copie de travail)
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.26.3.tar.xz) = 88cb1af3574f861bc08853a681be97ae79bf5302782fbac803f877b879a642b1
-SIZE (poppler-0.26.3.tar.xz) = 1593760
+SHA256 (poppler-0.30.0.tar.xz) = b616ee869d0b1f8a7a2c71cf346f55c1bff624cce4badebe17f506ec8ce7ddf5
+SIZE (poppler-0.30.0.tar.xz) = 1605292
Index: poppler/files/patch-glib_Makefile.in
===================================================================
--- poppler/files/patch-glib_Makefile.in	(révision 376983)
+++ poppler/files/patch-glib_Makefile.in	(copie de travail)
@@ -1,15 +1,15 @@
---- glib/Makefile.in.orig	2011-10-03 23:55:25.000000000 +0200
-+++ glib/Makefile.in	2011-10-03 23:56:20.000000000 +0200
-@@ -84,7 +84,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+--- glib/Makefile.in.orig	2014-11-04 18:46:21 UTC
++++ glib/Makefile.in
+@@ -134,7 +134,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libpoppler_glib_la_DEPENDENCIES =  \
 -	$(top_builddir)/poppler/libpoppler.la \
  	$(top_builddir)/poppler/libpoppler-cairo.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
-@@ -433,7 +432,7 @@ libpoppler_glib_la_SOURCES = \
- 	poppler-private.h
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am__objects_1 = libpoppler_glib_la-poppler-enums.lo
+@@ -553,7 +552,7 @@ libpoppler_glib_la_CPPFLAGS = \
+ 	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
  
  libpoppler_glib_la_LIBADD = \
 -	$(top_builddir)/poppler/libpoppler.la		\
@@ -16,4 +16,13 @@
 +	-lpoppler		\
  	$(top_builddir)/poppler/libpoppler-cairo.la	\
  	$(POPPLER_GLIB_LIBS)				\
- 	$(FREETYPE_LIBS)				\
+ 	$(FREETYPE_LIBS)
+@@ -576,7 +575,7 @@ MAINTAINERCLEANFILES = $(BUILT_SOURCES) 
+ @HAVE_INTROSPECTION_TRUE@introspection_files = $(filter-out poppler-private.h poppler-input-stream.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS)
+ @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0
+ @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir)
+-@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la $(top_builddir)/poppler/libpoppler.la $(top_builddir)/poppler/libpoppler-cairo.la
++@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la poppler $(top_builddir)/poppler/libpoppler-cairo.la
+ @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_FILES = $(introspection_files)
+ @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_SCANNERFLAGS = --c-include poppler.h
+ @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_EXPORT_PACKAGES = poppler-glib
Index: poppler/files/patch-utils_Makefile.in
===================================================================
--- poppler/files/patch-utils_Makefile.in	(révision 376983)
+++ poppler/files/patch-utils_Makefile.in	(copie de travail)
@@ -1,101 +1,105 @@
---- utils/Makefile.in.orig	2014-11-25 11:49:19 UTC
+--- utils/Makefile.in.orig	2014-11-04 18:46:22 UTC
 +++ utils/Makefile.in
-@@ -111,7 +111,7 @@
- am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)
+@@ -125,40 +125,34 @@ PROGRAMS = $(bin_PROGRAMS)
+ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT)
  pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
  pdfdetach_LDADD = $(LDADD)
--pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfdetach_DEPENDENCIES =
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -119,31 +119,31 @@
- am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
+-pdfdetach_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdfdetach_DEPENDENCIES = libparseargs.la
+ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
--pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdffonts_DEPENDENCIES =
+-pdffonts_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdffonts_DEPENDENCIES = libparseargs.la
  am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
- 	JSInfo.$(OBJEXT) $(am__objects_1)
+ 	JSInfo.$(OBJEXT)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
--pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfimages_DEPENDENCIES =
+-pdfimages_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdfimages_DEPENDENCIES = libparseargs.la
  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
- 	JSInfo.$(OBJEXT) $(am__objects_1)
+ 	JSInfo.$(OBJEXT)
  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  pdfinfo_LDADD = $(LDADD)
--pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfinfo_DEPENDENCIES =
- am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) $(am__objects_1)
+-pdfinfo_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdfinfo_DEPENDENCIES = libparseargs.la
+ am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT)
  pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
  pdfseparate_LDADD = $(LDADD)
--pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfseparate_DEPENDENCIES =
- am__pdftocairo_SOURCES_DIST = pdftocairo.cc parseargs.cc parseargs.h
- @BUILD_CAIRO_OUTPUT_TRUE@am_pdftocairo_OBJECTS = pdftocairo.$(OBJEXT) \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__objects_1)
+-pdfseparate_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdfseparate_DEPENDENCIES = libparseargs.la
+ am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \
+ 	pdftocairo-pdftocairo-win32.$(OBJEXT)
  pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
--am__DEPENDENCIES_1 = $(top_builddir)/poppler/libpoppler.la
-+am__DEPENDENCIES_1 =
+-am__DEPENDENCIES_1 = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++am__DEPENDENCIES_1 = libparseargs.la
  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)
--@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
-+@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1) \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_4) \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_2)
-@@ -153,7 +153,7 @@
- 	pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2)
+-pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
++pdftocairo_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
+ 	$(am__DEPENDENCIES_2)
+ am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \
+@@ -166,31 +160,26 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
+ 	pdftohtml-HtmlOutputDev.$(OBJEXT)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
--pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftohtml_DEPENDENCIES =
+-pdftohtml_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdftohtml_DEPENDENCIES = libparseargs.la
  pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
  	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -162,20 +162,20 @@
- @BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
+ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
  pdftoppm_LDADD = $(LDADD)
--pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftoppm_DEPENDENCIES =
- am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
+-pdftoppm_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdftoppm_DEPENDENCIES = libparseargs.la
+ am_pdftops_OBJECTS = pdftops.$(OBJEXT)
  pdftops_OBJECTS = $(am_pdftops_OBJECTS)
  pdftops_LDADD = $(LDADD)
--pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftops_DEPENDENCIES =
- am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \
- 	$(am__objects_1)
+-pdftops_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdftops_DEPENDENCIES = libparseargs.la
+ am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT)
  pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
  pdftotext_LDADD = $(LDADD)
--pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftotext_DEPENDENCIES =
- am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1)
+-pdftotext_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdftotext_DEPENDENCIES = libparseargs.la
+ am_pdfunite_OBJECTS = pdfunite.$(OBJEXT)
  pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
  pdfunite_LDADD = $(LDADD)
--pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfunite_DEPENDENCIES =
+-pdfunite_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdfunite_DEPENDENCIES = libparseargs.la
  AM_V_P = $(am__v_P_@AM_V@)
  am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
  am__v_P_0 = false
-@@ -516,7 +516,7 @@
- 	$(PDFTOCAIRO_CFLAGS)
+@@ -527,7 +516,7 @@ AM_CPPFLAGS = \
  
  LDADD = \
+ 	libparseargs.la				\
 -	$(top_builddir)/poppler/libpoppler.la	\
 +	-lpoppler	\
  	$(UTILS_LIBS)
  
- @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_SOURCES = \
-@@ -524,7 +524,7 @@
- @BUILD_CAIRO_OUTPUT_TRUE@	$(common)
+ @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
+@@ -590,7 +579,7 @@ pdftocairo_SOURCES = \
+ 	pdftocairo-win32.h
  
- @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_LDADD = \
--@BUILD_CAIRO_OUTPUT_TRUE@	$(top_builddir)/poppler/libpoppler-cairo.la \
-+@BUILD_CAIRO_OUTPUT_TRUE@	-lpoppler-glib \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(LDADD)				\
- @BUILD_CAIRO_OUTPUT_TRUE@	$(PDFTOCAIRO_LIBS)			\
- @BUILD_CAIRO_OUTPUT_TRUE@	$(PTHREAD_LIBS)
+ pdftocairo_LDADD = \
+-	$(top_builddir)/poppler/libpoppler-cairo.la	\
++	-lpoppler-glib	\
+ 	$(LDADD)					\
+ 	$(PDFTOCAIRO_LIBS)				\
+ 	$(PTHREAD_LIBS)
Index: poppler/pkg-plist
===================================================================
--- poppler/pkg-plist	(révision 376983)
+++ poppler/pkg-plist	(copie de travail)
@@ -134,10 +134,10 @@
 include/poppler/splash/SplashXPathScanner.h
 lib/libpoppler-cpp.so
 lib/libpoppler-cpp.so.0
-lib/libpoppler-cpp.so.0.2.0
+lib/libpoppler-cpp.so.0.2.1
 lib/libpoppler.so
-lib/libpoppler.so.46
-lib/libpoppler.so.46.0.0
+lib/libpoppler.so.49
+lib/libpoppler.so.49.0.0
 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
 libdata/pkgconfig/poppler-cpp.pc
 libdata/pkgconfig/poppler-splash.pc
Index: poppler-glib/Makefile
===================================================================
--- poppler-glib/Makefile	(révision 376983)
+++ poppler-glib/Makefile	(copie de travail)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/graphics/poppler-glib/Makefile,v 1.4 2012/10/14 23:04:21 kwm Exp $
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-glib
 
 MAINTAINER=	gnome@FreeBSD.org
Index: poppler-qt4/pkg-plist
===================================================================
--- poppler-qt4/pkg-plist	(révision 376983)
+++ poppler-qt4/pkg-plist	(copie de travail)
@@ -8,5 +8,5 @@
 include/poppler/qt4/poppler-qt4.h
 lib/libpoppler-qt4.so
 lib/libpoppler-qt4.so.4
-lib/libpoppler-qt4.so.4.4.0
+lib/libpoppler-qt4.so.4.5.0
 libdata/pkgconfig/poppler-qt4.pc
Index: poppler-qt5/pkg-plist
===================================================================
--- poppler-qt5/pkg-plist	(révision 376983)
+++ poppler-qt5/pkg-plist	(copie de travail)
@@ -8,5 +8,5 @@
 include/poppler/qt5/poppler-qt5.h
 lib/libpoppler-qt5.so
 lib/libpoppler-qt5.so.1
-lib/libpoppler-qt5.so.1.1.0
+lib/libpoppler-qt5.so.1.2.0
 libdata/pkgconfig/poppler-qt5.pc