- Update to 0.46.0

- Replace CPPFLAGS and LDFLAGS by USES= localbase

PR:		211388
Submitted by:	myself
Approved by:	The GNOME team (timeout)
Exp-run by:	antoine@

7 files changed, 23 insertions, 17 deletions

diff --git a/graphics/poppler-glib/pkg-plist b/graphics/poppler-glib/pkg-plist
index b0cffb58d0d0..461b6b2f6de3 100644
--- a/graphics/poppler-glib/pkg-plist
+++ b/graphics/poppler-glib/pkg-plist
@@ -15,6 +15,6 @@ 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
diff --git a/graphics/poppler-qt4/pkg-plist b/graphics/poppler-qt4/pkg-plist
index 714409ac2efe..a6ce9f55c4bf 100644
--- a/graphics/poppler-qt4/pkg-plist
+++ b/graphics/poppler-qt4/pkg-plist
@@ -8,5 +8,5 @@ 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
diff --git a/graphics/poppler-qt5/pkg-plist b/graphics/poppler-qt5/pkg-plist
index 61ea08a4127f..b259f607fd59 100644
--- a/graphics/poppler-qt5/pkg-plist
+++ b/graphics/poppler-qt5/pkg-plist
@@ -8,5 +8,5 @@ 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
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index cdcb461dfb02..610e958f1d8d 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	poppler
-PORTVERSION=	0.40.0
+PORTVERSION=	0.46.0
 PORTREVISION?=	0
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		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
@@ -30,8 +30,6 @@ CONFIGURE_ARGS=	--enable-zlib \
 		--disable-gtk-test \
 		--without-html-dir \
 		--disable-static
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 INSTALL_TARGET=	install-strip
 
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index bc27b4f07e1a..57ef41c2e263 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -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
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
index 5e0465e25ea7..e67242f6cf99 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	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)
@@ -33,6 +33,12 @@
 -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)
@@ -48,7 +54,7 @@
  	$(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)
@@ -85,7 +91,7 @@
  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				\
@@ -94,7 +100,7 @@
  	$(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 = \
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index 7a76983f16b4..fe219ee8e146 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -54,6 +54,7 @@ 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
@@ -134,10 +135,10 @@ 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