Index: head/graphics/poppler/Makefile
===================================================================
--- head/graphics/poppler/Makefile	(revision 421385)
+++ head/graphics/poppler/Makefile	(revision 421386)
@@ -1,141 +1,139 @@
 # Created by: marcus@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	poppler
-PORTVERSION=	0.40.0
+PORTVERSION=	0.46.0
 PORTREVISION?=	0
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
 
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	PDF rendering library
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libfontconfig.so:x11-fonts/fontconfig \
 		liblcms2.so:graphics/lcms2 \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	poppler-data>0:graphics/poppler-data
 
-USES=		cpe gmake jpeg libtool pathfix pkgconfig tar:xz
+USES=		cpe gmake jpeg libtool localbase pathfix pkgconfig tar:xz
 CPE_VENDOR=	freedesktop
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-zlib \
 		--enable-xpdf-headers \
 		--disable-gtk-test \
 		--without-html-dir \
 		--disable-static
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 INSTALL_TARGET=	install-strip
 
 .if !defined(SLAVEPORT)
 PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	CAIRO CURL OPENJPEG
 OPTIONS_DEFAULT=CAIRO OPENJPEG
 
 USES+=		iconv
 .endif
 
 .include <bsd.port.options.mk>
 
 .if defined(SLAVEPORT)
 PORTSCOUT=	ignore:1
 LIB_DEPENDS+=	libpoppler.so:graphics/poppler
 
 .if ${SLAVEPORT}==glib
 CONFIGURE_ARGS+=--enable-poppler-glib --enable-introspection=yes
 USE_GNOME+=	cairo glib20 introspection:build
 BUILD_WRKSRC=	${WRKSRC}/glib
 INSTALL_WRKSRC=	${WRKSRC}/glib
 .else
 CONFIGURE_ARGS+=--disable-poppler-glib
 .endif
 
 .if ${SLAVEPORT}==qt4
 CONFIGURE_ARGS+=--enable-poppler-qt4
 CONFIGURE_ENV+=	MOCQT4=${MOC}
 USE_QT4=	gui corelib xml qtestlib moc_build
 BUILD_WRKSRC=	${WRKSRC}/qt4
 INSTALL_WRKSRC=	${WRKSRC}/qt4
 .else
 CONFIGURE_ARGS+=--disable-poppler-qt4
 .endif
 
 .if ${SLAVEPORT}==qt5
 CONFIGURE_ARGS+=--enable-poppler-qt5
 CONFIGURE_ENV+=	MOCQT5=${MOC}
 USE_QT5=	core gui widgets xml buildtools_build testlib_build
 BUILD_WRKSRC=	${WRKSRC}/qt5
 INSTALL_WRKSRC=	${WRKSRC}/qt5
 .else
 CONFIGURE_ARGS+=--disable-poppler-qt5
 .endif
 
 .if ${SLAVEPORT}==utils
 LIB_DEPENDS+=	libpoppler-glib.so:graphics/poppler-glib
 CONFIGURE_ARGS+=--enable-utils
 BUILD_WRKSRC=	${WRKSRC}/utils
 INSTALL_WRKSRC=	${WRKSRC}/utils
 .else
 CONFIGURE_ARGS+=--disable-utils
 .endif
 
 .else # ! SLAVE options below
 CONFIGURE_ARGS+=--disable-poppler-glib \
 		--disable-poppler-qt4 \
 		--disable-poppler-qt5 \
 		--disable-utils
 
 .if ${PORT_OPTIONS:MCAIRO}
 LIB_DEPENDS+=	libcairo.so:graphics/cairo
 PLIST_SUB+=	CAIRO=""
 .else
 CONFIGURE_ARGS+=--disable-cairo-output
 PLIST_SUB+=	CAIRO="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
 LIB_DEPENDS+=	libcurl.so:ftp/curl
 CONFIGURE_ARGS+=--enable-libcurl
 PLIST_SUB+=	CURL=""
 .else
 CONFIGURE_ARGS+=--disable-libcurl
 PLIST_SUB+=	CURL="@comment "
 .endif
 
 # stick with openjpeg1 for now due to regression in openjpeg2 (configure)
 # https://bugs.freedesktop.org/show_bug.cgi?id=58906 Comment #35
 .if ${PORT_OPTIONS:MOPENJPEG}
 CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg1
 LIB_DEPENDS+=	libopenjpeg.so:graphics/openjpeg15
 .else
 CONFIGURE_ARGS+=--disable-libopenjpeg
 .endif
 .endif # end of options
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-fno-check-new||g' ${WRKSRC}/configure
 
 post-install:
 .if defined(SLAVEPORT)
 . if ${SLAVEPORT}==glib
 	${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig
 . elif ${SLAVEPORT}==qt4
 	${INSTALL_DATA} ${WRKSRC}/poppler-qt4.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig
 . elif ${SLAVEPORT}==qt5
 	${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig
 . endif
 .endif
 
 .include <bsd.port.mk>
Index: head/graphics/poppler/distinfo
===================================================================
--- head/graphics/poppler/distinfo	(revision 421385)
+++ head/graphics/poppler/distinfo	(revision 421386)
@@ -1,2 +1,3 @@
-SHA256 (poppler-0.40.0.tar.xz) = bc0da278d6038ffc9cd2b8c1bba530a6ec7c072a593219a48f0a52a600ee6ead
-SIZE (poppler-0.40.0.tar.xz) = 1642708
+TIMESTAMP = 1469476012
+SHA256 (poppler-0.46.0.tar.xz) = 967d35d13d61dee2fee656b80efef9e388a9e752bc79b7123f15b49c7769e487
+SIZE (poppler-0.46.0.tar.xz) = 1680940
Index: head/graphics/poppler/files/patch-utils_Makefile.in
===================================================================
--- head/graphics/poppler/files/patch-utils_Makefile.in	(revision 421385)
+++ head/graphics/poppler/files/patch-utils_Makefile.in	(revision 421386)
@@ -1,105 +1,111 @@
---- utils/Makefile.in.orig	2014-11-04 18:46:22 UTC
+--- utils/Makefile.in.orig	2016-03-16 22:22:14 UTC
 +++ utils/Makefile.in
-@@ -125,40 +125,34 @@ PROGRAMS = $(bin_PROGRAMS)
+@@ -136,45 +136,38 @@ PROGRAMS = $(bin_PROGRAMS)
  am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT)
  pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
  pdfdetach_LDADD = $(LDADD)
 -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 = libparseargs.la \
 -	$(top_builddir)/poppler/libpoppler.la
 +pdffonts_DEPENDENCIES = libparseargs.la
  am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
  	JSInfo.$(OBJEXT)
  pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
  pdfimages_LDADD = $(LDADD)
 -pdfimages_DEPENDENCIES = libparseargs.la \
 -	$(top_builddir)/poppler/libpoppler.la
 +pdfimages_DEPENDENCIES = libparseargs.la
  am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
  	JSInfo.$(OBJEXT)
  pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
  pdfinfo_LDADD = $(LDADD)
 -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 = libparseargs.la \
 -	$(top_builddir)/poppler/libpoppler.la
 +pdfseparate_DEPENDENCIES = libparseargs.la
+ am_pdfsig_OBJECTS = pdfsig.$(OBJEXT)
+ pdfsig_OBJECTS = $(am_pdfsig_OBJECTS)
+ pdfsig_LDADD = $(LDADD)
+-pdfsig_DEPENDENCIES = libparseargs.la \
+-	$(top_builddir)/poppler/libpoppler.la
++pdfsig_DEPENDENCIES = libparseargs.la
  am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \
  	pdftocairo-pdftocairo-win32.$(OBJEXT)
  pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
 -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)
 -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
+@@ -182,31 +175,26 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
  	pdftohtml-HtmlOutputDev.$(OBJEXT)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
 -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 $@
  am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
  pdftoppm_LDADD = $(LDADD)
 -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 = 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 = 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 = 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
-@@ -527,7 +516,7 @@ AM_CPPFLAGS = \
+@@ -549,7 +537,7 @@ AM_CPPFLAGS = \
  
  LDADD = \
  	libparseargs.la				\
 -	$(top_builddir)/poppler/libpoppler.la	\
 +	-lpoppler	\
  	$(UTILS_LIBS)
  
  @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
-@@ -590,7 +579,7 @@ pdftocairo_SOURCES = \
+@@ -615,7 +603,7 @@ pdftocairo_SOURCES = \
  	pdftocairo-win32.h
  
  pdftocairo_LDADD = \
 -	$(top_builddir)/poppler/libpoppler-cairo.la	\
 +	-lpoppler-glib	\
  	$(LDADD)					\
  	$(PDFTOCAIRO_LIBS)				\
  	$(PTHREAD_LIBS)
Index: head/graphics/poppler/pkg-plist
===================================================================
--- head/graphics/poppler/pkg-plist	(revision 421385)
+++ head/graphics/poppler/pkg-plist	(revision 421386)
@@ -1,144 +1,145 @@
 include/poppler/Annot.h
 include/poppler/Array.h
 include/poppler/BuiltinFont.h
 include/poppler/BuiltinFontTables.h
 include/poppler/CMap.h
 include/poppler/CachedFile.h
 include/poppler/Catalog.h
 include/poppler/CharCodeToUnicode.h
 include/poppler/CharTypes.h
 include/poppler/CompactFontTables.h
 %%CURL%%include/poppler/CurlCachedFile.h
 %%CURL%%include/poppler/CurlPDFDocBuilder.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.h
 include/poppler/Gfx.h
 include/poppler/GfxFont.h
 include/poppler/GfxState.h
 include/poppler/GfxState_helpers.h
 include/poppler/GlobalParams.h
 include/poppler/Hints.h
 include/poppler/JArithmeticDecoder.h
 include/poppler/JBIG2Stream.h
 include/poppler/Lexer.h
 include/poppler/Linearization.h
 include/poppler/Link.h
 include/poppler/LocalPDFDocBuilder.h
 include/poppler/MarkedContentOutputDev.h
 include/poppler/Movie.h
 include/poppler/NameToCharCode.h
 include/poppler/NameToUnicodeTable.h
 include/poppler/Object.h
 include/poppler/OptionalContent.h
 include/poppler/Outline.h
 include/poppler/OutputDev.h
 include/poppler/PDFDoc.h
 include/poppler/PDFDocBuilder.h
 include/poppler/PDFDocEncoding.h
 include/poppler/PDFDocFactory.h
 include/poppler/PSOutputDev.h
 include/poppler/PSTokenizer.h
 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/Rendition.h
 include/poppler/SecurityHandler.h
+include/poppler/SignatureInfo.h
 include/poppler/Sound.h
 include/poppler/SplashOutputDev.h
 include/poppler/StdinCachedFile.h
 include/poppler/StdinPDFDocBuilder.h
 include/poppler/Stream-CCITT.h
 include/poppler/Stream.h
 include/poppler/StructElement.h
 include/poppler/StructTreeRoot.h
 include/poppler/TextOutputDev.h
 include/poppler/UTF.h
 include/poppler/UTF8.h
 include/poppler/UnicodeCClassTables.h
 include/poppler/UnicodeCompTables.h
 include/poppler/UnicodeDecompTables.h
 include/poppler/UnicodeMap.h
 include/poppler/UnicodeMapTables.h
 include/poppler/UnicodeTypeTable.h
 include/poppler/ViewerPreferences.h
 include/poppler/XRef.h
 include/poppler/XpdfPluginAPI.h
 include/poppler/cpp/poppler-document.h
 include/poppler/cpp/poppler-embedded-file.h
 include/poppler/cpp/poppler-font.h
 include/poppler/cpp/poppler-global.h
 include/poppler/cpp/poppler-image.h
 include/poppler/cpp/poppler-page-renderer.h
 include/poppler/cpp/poppler-page-transition.h
 include/poppler/cpp/poppler-page.h
 include/poppler/cpp/poppler-rectangle.h
 include/poppler/cpp/poppler-toc.h
 include/poppler/cpp/poppler-version.h
 include/poppler/fofi/FoFiBase.h
 include/poppler/fofi/FoFiEncodings.h
 include/poppler/fofi/FoFiIdentifier.h
 include/poppler/fofi/FoFiTrueType.h
 include/poppler/fofi/FoFiType1.h
 include/poppler/fofi/FoFiType1C.h
 include/poppler/goo/FixedPoint.h
 include/poppler/goo/GooHash.h
 include/poppler/goo/GooLikely.h
 include/poppler/goo/GooList.h
 include/poppler/goo/GooMutex.h
 include/poppler/goo/GooString.h
 include/poppler/goo/GooTimer.h
 include/poppler/goo/ImgWriter.h
 include/poppler/goo/JpegWriter.h
 include/poppler/goo/NetPBMWriter.h
 include/poppler/goo/PNGWriter.h
 include/poppler/goo/TiffWriter.h
 include/poppler/goo/gfile.h
 include/poppler/goo/gmem.h
 include/poppler/goo/grandom.h
 include/poppler/goo/gstrtod.h
 include/poppler/goo/gtypes.h
 include/poppler/poppler-config.h
 include/poppler/splash/Splash.h
 include/poppler/splash/SplashBitmap.h
 include/poppler/splash/SplashClip.h
 include/poppler/splash/SplashErrorCodes.h
 include/poppler/splash/SplashFTFont.h
 include/poppler/splash/SplashFTFontEngine.h
 include/poppler/splash/SplashFTFontFile.h
 include/poppler/splash/SplashFont.h
 include/poppler/splash/SplashFontEngine.h
 include/poppler/splash/SplashFontFile.h
 include/poppler/splash/SplashFontFileID.h
 include/poppler/splash/SplashGlyphBitmap.h
 include/poppler/splash/SplashMath.h
 include/poppler/splash/SplashPath.h
 include/poppler/splash/SplashPattern.h
 include/poppler/splash/SplashScreen.h
 include/poppler/splash/SplashState.h
 include/poppler/splash/SplashT1Font.h
 include/poppler/splash/SplashT1FontEngine.h
 include/poppler/splash/SplashT1FontFile.h
 include/poppler/splash/SplashTypes.h
 include/poppler/splash/SplashXPath.h
 include/poppler/splash/SplashXPathScanner.h
 lib/libpoppler-cpp.so
 lib/libpoppler-cpp.so.0
-lib/libpoppler-cpp.so.0.2.1
+lib/libpoppler-cpp.so.0.3.0
 lib/libpoppler.so
-lib/libpoppler.so.58
-lib/libpoppler.so.58.0.0
+lib/libpoppler.so.63
+lib/libpoppler.so.63.0.0
 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
 libdata/pkgconfig/poppler-cpp.pc
 libdata/pkgconfig/poppler-splash.pc
 libdata/pkgconfig/poppler.pc
Index: head/graphics/poppler-glib/pkg-plist
===================================================================
--- head/graphics/poppler-glib/pkg-plist	(revision 421385)
+++ head/graphics/poppler-glib/pkg-plist	(revision 421386)
@@ -1,20 +1,20 @@
 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-media.h
 include/poppler/glib/poppler-movie.h
 include/poppler/glib/poppler-page.h
 include/poppler/glib/poppler-structure-element.h
 include/poppler/glib/poppler.h
 lib/girepository-1.0/Poppler-0.18.typelib
 lib/libpoppler-glib.so
 lib/libpoppler-glib.so.8
-lib/libpoppler-glib.so.8.7.0
+lib/libpoppler-glib.so.8.8.0
 libdata/pkgconfig/poppler-glib.pc
 share/gir-1.0/Poppler-0.18.gir
Index: head/graphics/poppler-qt4/pkg-plist
===================================================================
--- head/graphics/poppler-qt4/pkg-plist	(revision 421385)
+++ head/graphics/poppler-qt4/pkg-plist	(revision 421386)
@@ -1,12 +1,12 @@
 include/poppler/qt4/poppler-annotation.h
 include/poppler/qt4/poppler-export.h
 include/poppler/qt4/poppler-form.h
 include/poppler/qt4/poppler-link.h
 include/poppler/qt4/poppler-media.h
 include/poppler/qt4/poppler-optcontent.h
 include/poppler/qt4/poppler-page-transition.h
 include/poppler/qt4/poppler-qt4.h
 lib/libpoppler-qt4.so
 lib/libpoppler-qt4.so.4
-lib/libpoppler-qt4.so.4.9.0
+lib/libpoppler-qt4.so.4.10.0
 libdata/pkgconfig/poppler-qt4.pc
Index: head/graphics/poppler-qt5/pkg-plist
===================================================================
--- head/graphics/poppler-qt5/pkg-plist	(revision 421385)
+++ head/graphics/poppler-qt5/pkg-plist	(revision 421386)
@@ -1,12 +1,12 @@
 include/poppler/qt5/poppler-annotation.h
 include/poppler/qt5/poppler-export.h
 include/poppler/qt5/poppler-form.h
 include/poppler/qt5/poppler-link.h
 include/poppler/qt5/poppler-media.h
 include/poppler/qt5/poppler-optcontent.h
 include/poppler/qt5/poppler-page-transition.h
 include/poppler/qt5/poppler-qt5.h
 lib/libpoppler-qt5.so
 lib/libpoppler-qt5.so.1
-lib/libpoppler-qt5.so.1.6.0
+lib/libpoppler-qt5.so.1.7.0
 libdata/pkgconfig/poppler-qt5.pc