Update poppler to 0.40.0. [1]

Add patches to py-poppler [2] and rubygem-poppler [3] to fix the build
of these ports with poppler 0.39+.

PR:		206293 [1]
Submitted by:	olivierd@ [1]
Obtained from:	ubuntu [2], rubygem-poppler upstream [3]

26 files changed, 53 insertions, 31 deletions

diff --git a/graphics/apvlv/Makefile b/graphics/apvlv/Makefile
index 1de8bc126345..8fc046cb8d01 100644
--- a/graphics/apvlv/Makefile
+++ b/graphics/apvlv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apvlv
 PORTVERSION=	0.1.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	GHC
 DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
diff --git a/graphics/atril/Makefile b/graphics/atril/Makefile
index 0c127f1db389..e74f9e9fdc1f 100644
--- a/graphics/atril/Makefile
+++ b/graphics/atril/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	atril
 PORTVERSION=	1.10.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	graphics print mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile
index 616832de3474..602deeffffae 100644
--- a/graphics/electrix/Makefile
+++ b/graphics/electrix/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	electrix
 PORTVERSION=	0.2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics print
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTVERSION}
 
diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index 9721fe9c4796..3ef4212d4341 100644
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	epdfview
 PORTVERSION=	0.1.8
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	FRUGALWARE/xapps-extra/${PORTNAME} \
 		ftp://ftp.slackware.com/.1/blfs/conglomeration/${PORTNAME}/ \
diff --git a/graphics/evas_generic_loaders-pdf/Makefile b/graphics/evas_generic_loaders-pdf/Makefile
index 19dcbdba00cd..2c82904047d1 100644
--- a/graphics/evas_generic_loaders-pdf/Makefile
+++ b/graphics/evas_generic_loaders-pdf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pdf
 PORTVERSION=	1.16.0
+PORTREVISION=	1
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PKGNAMEPREFIX:S/-//}/
 PKGNAMEPREFIX=	evas_generic_loaders-
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index cd26b4ae25b4..7860fb65e4dc 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	evince
 PORTVERSION=	3.16.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index fca31c1575f3..47d200c7dc2f 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gdal
 PORTVERSION=	2.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics geography
 MASTER_SITES=	http://download.osgeo.org/gdal/${PORTVERSION}/ \
 		ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index ed3170ae9631..d4bb62657802 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	gimp-app
 PORTVERSION=	2.8.16
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	GIMP/gimp/v${PORTVERSION:R}
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index ddd44a9cb7aa..aa3243049f91 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	graphviz
 PORTVERSION=	2.38.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index f31261251d3a..7a454f966be4 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.91
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics gnome
 MASTER_SITES=	https://inkscape.global.ssl.fastly.net/media/resources/file/ \
 		LOCAL/kwm
diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index 005741f31f6f..e13e36778a88 100644
--- a/graphics/okular/Makefile
+++ b/graphics/okular/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	okular
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 83013fca543e..e8c7df577a75 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	osg
 PORTVERSION=	3.3.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://trac.openscenegraph.org/downloads/developer_releases/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index 0210a88c3a67..27a0b89469f1 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	osg
 PORTVERSION=	3.2.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	http://trac.openscenegraph.org/downloads/developer_releases/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/pdf2svg/Makefile b/graphics/pdf2svg/Makefile
index 27f7dcf89356..9dd2635c7241 100644
--- a/graphics/pdf2svg/Makefile
+++ b/graphics/pdf2svg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdf2svg
 PORTVERSION=	0.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
 
diff --git a/graphics/poppler-qt4/pkg-plist b/graphics/poppler-qt4/pkg-plist
index 82127b1b96d1..714409ac2efe 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.6.0
+lib/libpoppler-qt4.so.4.9.0
 libdata/pkgconfig/poppler-qt4.pc
diff --git a/graphics/poppler-qt5/pkg-plist b/graphics/poppler-qt5/pkg-plist
index c6df6b17b58f..61ea08a4127f 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.3.0
+lib/libpoppler-qt5.so.1.6.0
 libdata/pkgconfig/poppler-qt5.pc
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 033a2fcf0835..dfb81d18ee5d 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	poppler
-PORTVERSION=	0.34.0
+PORTVERSION=	0.40.0
 PORTREVISION?=	0
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 18c18980221f..bc27b4f07e1a 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.34.0.tar.xz) = 1ba4ba9a2f9eb1e62ee6d736f4d82be4fc5f6dd177dc2b03febbe2ef2e515cb0
-SIZE (poppler-0.34.0.tar.xz) = 1615264
+SHA256 (poppler-0.40.0.tar.xz) = bc0da278d6038ffc9cd2b8c1bba530a6ec7c072a593219a48f0a52a600ee6ead
+SIZE (poppler-0.40.0.tar.xz) = 1642708
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index 60fb8cd89e02..7a76983f16b4 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -136,8 +136,8 @@ lib/libpoppler-cpp.so
 lib/libpoppler-cpp.so.0
 lib/libpoppler-cpp.so.0.2.1
 lib/libpoppler.so
-lib/libpoppler.so.53
-lib/libpoppler.so.53.0.0
+lib/libpoppler.so.58
+lib/libpoppler.so.58.0.0
 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
 libdata/pkgconfig/poppler-cpp.pc
 libdata/pkgconfig/poppler-splash.pc
diff --git a/graphics/pqiv/Makefile b/graphics/pqiv/Makefile
index 0b632b796d4f..7d15822cbcf2 100644
--- a/graphics/pqiv/Makefile
+++ b/graphics/pqiv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pqiv
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	danilo@FreeBSD.org
diff --git a/graphics/py-poppler-qt4/Makefile b/graphics/py-poppler-qt4/Makefile
index 2c009cc699d5..827d94a7137c 100644
--- a/graphics/py-poppler-qt4/Makefile
+++ b/graphics/py-poppler-qt4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	poppler-qt4
 PORTVERSION=	0.18.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile
index 44196ae22524..3b95367251a5 100644
--- a/graphics/py-poppler/Makefile
+++ b/graphics/py-poppler/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	poppler
 PORTVERSION=	0.12.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics python
 MASTER_SITES=	https://launchpad.net/poppler-python/trunk/development/+download/ \
 		http://launchpadlibrarian.net/30270080/ \
diff --git a/graphics/py-poppler/files/patch-poppler.defs b/graphics/py-poppler/files/patch-poppler.defs
index f5c286ba9f43..92428660629b 100644
--- a/graphics/py-poppler/files/patch-poppler.defs
+++ b/graphics/py-poppler/files/patch-poppler.defs
@@ -1,6 +1,25 @@
---- poppler.defs.orig	2009-09-27 17:07:59.000000000 +0800
-+++ poppler.defs	2012-04-09 05:50:38.000000000 +0800
-@@ -1646,58 +1646,6 @@
+--- poppler.defs.orig	2009-09-27 11:07:59.000000000 +0200
++++ poppler.defs	2016-01-20 09:29:09.187672000 +0100
+@@ -578,18 +578,6 @@
+   )
+ )
+ 
+-(define-enum Orientation
+-  (in-module "Poppler")
+-  (c-name "PopplerOrientation")
+-  (gtype-id "POPPLER_TYPE_ORIENTATION")
+-  (values
+-    '("portrait" "POPPLER_ORIENTATION_PORTRAIT")
+-    '("landscape" "POPPLER_ORIENTATION_LANDSCAPE")
+-    '("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN")
+-    '("seascape" "POPPLER_ORIENTATION_SEASCAPE")
+-  )
+-)
+-
+ (define-enum PageTransitionType
+   (in-module "Poppler")
+   (c-name "PopplerPageTransitionType")
+@@ -1646,58 +1634,6 @@
    (return-type "GType")
  )
  
@@ -59,7 +78,7 @@
  (define-method render
    (of-object "PopplerPage")
    (c-name "poppler_page_render")
-@@ -1752,6 +1700,12 @@
+@@ -1752,6 +1688,12 @@
    (return-type "int")
  )
  
@@ -72,7 +91,7 @@
  (define-method get_duration
    (of-object "PopplerPage")
    (c-name "poppler_page_get_duration")
-@@ -1796,9 +1750,15 @@
+@@ -1796,9 +1738,15 @@
    (of-object "PopplerPage")
    (c-name "poppler_page_get_text")
    (return-type "char*")
@@ -89,7 +108,7 @@
    )
  )
  
-@@ -1886,6 +1846,16 @@
+@@ -1886,6 +1834,16 @@
    )
  )
  
@@ -106,7 +125,7 @@
  (define-method get_crop_box
    (of-object "PopplerPage")
    (c-name "poppler_page_get_crop_box")
-@@ -1895,6 +1865,16 @@
+@@ -1895,6 +1853,16 @@
    )
  )
  
diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index 7c7739835004..cafa233470e9 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qcomicbook
 PORTVERSION=	0.9.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	http://qcomicbook.org/releases/
 
diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile
index be40fa6ebc9a..1ddfad1548a9 100644
--- a/graphics/xournal/Makefile
+++ b/graphics/xournal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xournal
 PORTVERSION=	0.4.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
diff --git a/graphics/zathura-pdf-poppler/Makefile b/graphics/zathura-pdf-poppler/Makefile
index e08682e20ba8..151df131c404 100644
--- a/graphics/zathura-pdf-poppler/Makefile
+++ b/graphics/zathura-pdf-poppler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	zathura-pdf-poppler
 PORTVERSION=	0.2.6
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://pwmt.org/projects/zathura/plugins/download/