Update poppler to 0.24.4.

Update comment.
Use new LIB_DEPENDS syntax, use USES=pathfix.
Stagify.

Bump portrevision of all affected ports, and Update poppler* LIB_DEPENDS to
new syntax.

56 files changed, 174 insertions, 125 deletions

diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile
index 8b88d5dd3760..c964d193f13d 100644
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pdf2djvu
 PORTVERSION=	0.7.17
+PORTREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX}
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index a2aeb7298334..ac0212f497cd 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kbibtex
 DISTVERSION=	0.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases kde
 MASTER_SITES=	http://download.gna.org/${PORTNAME}/${PORTVERSION:C,(^[[:digit:]]\.[[:digit:]]).*,\1,}/
 
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index e5f50261b638..0a58c0499150 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	calibre
 PORTVERSION=	1.13.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
diff --git a/deskutils/xfce4-tumbler/Makefile b/deskutils/xfce4-tumbler/Makefile
index 666b24031fc7..0f8b0fbdc6b1 100644
--- a/deskutils/xfce4-tumbler/Makefile
+++ b/deskutils/xfce4-tumbler/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tumbler
 PORTVERSION=	0.1.29
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 2136b95972e3..0896fe18a756 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	calligra
 PORTVERSION=	${CALLIGRA_VERSION}
+PORTREVISION=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/
diff --git a/editors/gummi/Makefile b/editors/gummi/Makefile
index 0955250055b3..1d17b3dd807d 100644
--- a/editors/gummi/Makefile
+++ b/editors/gummi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gummi
 PORTVERSION=	0.6.5
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://dev.midnightcoding.org/attachments/download/301/
 
@@ -12,7 +13,7 @@ COMMENT=	Simple LaTex editor for GTK users
 LICENSE=	MIT
 
 BUILD_DEPENDS+=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS+=	poppler-glib:${PORTSDIR}/graphics/poppler-glib \
+LIB_DEPENDS+=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
 		gtkspell:${PORTSDIR}/textproc/gtkspell
 
 USES=		iconv gmake pkgconfig
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 05776785a8cb..7e9f945b9c04 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -2,7 +2,7 @@
 
 .include "${.CURDIR}/Makefile.common"
 
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Full integrated office productivity suite
 
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 084f359356a7..98a98c2c372a 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	3.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors java
 MASTER_SITES=	ftp://ftp.riken.jp/net/apache/incubator/ooo/3.4.1/source/ \
 		${MASTER_SITE_LOCAL:S@%SUBDIR%@maho/openoffice@}:extsrc
@@ -113,7 +113,7 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		curl:${PORTSDIR}/ftp/curl \
 		hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
-		poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
+		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
 		rdf.0:${PORTSDIR}/textproc/redland \
 		textcat.0:${PORTSDIR}/textproc/libtextcat \
 		freetype.9:${PORTSDIR}/print/freetype2 \
diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
index dd22c64d1903..add5eff6d194 100644
--- a/editors/openoffice-4/Makefile
+++ b/editors/openoffice-4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	4.0.1
+PORTREVISION=	1
 CATEGORIES=	editors java
 MASTER_SITES=	http://www.apache.org/dist/openoffice/${PORTVERSION}/source/ \
 		ftp://ftp.riken.jp/net/apache/openoffice/${PORTVERSION}/source/ \
@@ -116,7 +117,7 @@ LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		curl:${PORTSDIR}/ftp/curl \
 		hunspell-1.3:${PORTSDIR}/textproc/hunspell \
-		poppler-glib:${PORTSDIR}/graphics/poppler-glib \
+		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
 		rdf:${PORTSDIR}/textproc/redland \
 		textcat:${PORTSDIR}/textproc/libtextcat \
 		freetype:${PORTSDIR}/print/freetype2 \
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 499caecbb18e..92f38be0c5ba 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	4.0.${SVNREVISION}
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	editors java
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -116,7 +117,7 @@ LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		curl:${PORTSDIR}/ftp/curl \
 		hunspell-1.3:${PORTSDIR}/textproc/hunspell \
-		poppler-glib:${PORTSDIR}/graphics/poppler-glib \
+		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
 		rdf:${PORTSDIR}/textproc/redland \
 		textcat:${PORTSDIR}/textproc/libtextcat \
 		freetype:${PORTSDIR}/print/freetype2 \
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 2472a2afcadb..ff57a08557fe 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	texmaker
 PORTVERSION=	4.1
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	editors
 MASTER_SITES=	http://www.xm1math.net/texmaker/
diff --git a/editors/texmakerx/Makefile b/editors/texmakerx/Makefile
index 1d9413a2b0a6..b9b5c6ecbbcf 100644
--- a/editors/texmakerx/Makefile
+++ b/editors/texmakerx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	texmakerx
 PORTVERSION=	2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TexMakerX%20${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S:.0::}
diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
index 7eabd68f3bda..89ef4ba3e547 100644
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	texworks
 PORTVERSION=	0.4.5
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	GOOGLE_CODE
 DISTNAME=	${PORTNAME}-${PORTVERSION}-r${VCS_REVISION}
diff --git a/graphics/apvlv/Makefile b/graphics/apvlv/Makefile
index cad1830d1690..37c39fb94209 100644
--- a/graphics/apvlv/Makefile
+++ b/graphics/apvlv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apvlv
 PORTVERSION=	0.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cloud.github.com/downloads/naihe2010/apvlv/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile
index e69d7c0a676a..50470e8f0e8f 100644
--- a/graphics/electrix/Makefile
+++ b/graphics/electrix/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	electrix
 PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print
 MASTER_SITES=	SF/${PORTNAME:L}/${PORTVERSION}
 
@@ -43,7 +43,7 @@ PLIST_SUB=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPDF}
-LIB_DEPENDS=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 .else
 CONFIGURE_ARGS+=	--disable-pdf
 .endif
diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index 214150b977d2..2f03c104943e 100644
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	epdfview
 PORTVERSION=	0.1.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	http://trac.emma-soft.com/epdfview/chrome/site/releases/ \
 		http://mirror.slitaz.org/sources/packages/e/
@@ -14,7 +14,7 @@ COMMENT=	A lightweight PDF document viewer
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	cppunit-config:${PORTSDIR}/devel/cppunit
-LIB_DEPENDS=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/evas_generic_loaders-pdf/Makefile b/graphics/evas_generic_loaders-pdf/Makefile
index e56ef89a3a0c..9b4a74d4f7cc 100644
--- a/graphics/evas_generic_loaders-pdf/Makefile
+++ b/graphics/evas_generic_loaders-pdf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pdf
 PORTVERSION=	1.7.9
+PORTREVISION=	1
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
 		LOCAL/gblach/e17/
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index a19cefa89c05..b78f87785929 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	evince
 PORTVERSION=	2.32.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -13,7 +13,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 multi-format document viewer
 
 BUILD_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme
-LIB_DEPENDS=	poppler-glib:${PORTSDIR}/graphics/poppler-glib \
+LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
 		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		spectre:${PORTSDIR}/print/libspectre
 RUN_DEPENDS=	${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 18cf29d434cc..b724f084d179 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gdal
 PORTVERSION=	1.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 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 88730c10a9b2..5c84a3def746 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME?=	gimp-app
 PORTVERSION=	2.8.10
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 82f4e199d51a..39be6772916a 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	graphviz
 PORTVERSION=	2.34.0
+PORTREVISION=	1
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index c6fac67020a1..9c8fdc45d38d 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.48.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION}
diff --git a/graphics/mate-document-viewer/Makefile b/graphics/mate-document-viewer/Makefile
index b261ff4bde3d..8b52e0d5e4a5 100644
--- a/graphics/mate-document-viewer/Makefile
+++ b/graphics/mate-document-viewer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mate-document-viewer
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	graphics print mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile
index e51d99f87cfb..dc2aeb33343a 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=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -15,7 +15,7 @@ LIB_DEPENDS=	djvulibre:${PORTSDIR}/graphics/djvulibre \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		qca:${PORTSDIR}/devel/qca \
 		tiff:${PORTSDIR}/graphics/tiff \
-		poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \
+		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
 		spectre:${PORTSDIR}/print/libspectre \
 		chm:${PORTSDIR}/misc/chmlib \
 		freetype:${PORTSDIR}/print/freetype2 \
diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile
index 94e3955b7b03..d5a3a9538902 100644
--- a/graphics/osg-devel/Makefile
+++ b/graphics/osg-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	osg
 PORTVERSION=	3.1.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.openscenegraph.org/downloads/developer_releases/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -184,7 +184,7 @@ PLIST_SUB+=	SVG="@comment "
 
 .if ${PORT_OPTIONS:MPDF}
 FORCE_REQUIRE+=	Poppler-glib
-LIB_DEPENDS+=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS+=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 PLIST_SUB+=	PDF=""
 .else
 FORCE_IGNORE+=	Poppler-glib
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index f071699b631d..1b3714a97187 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	osg
 PORTVERSION=	3.0.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PORTVERSION}/source/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/pdf2svg/Makefile b/graphics/pdf2svg/Makefile
index 038be1a45d57..501490b993f9 100644
--- a/graphics/pdf2svg/Makefile
+++ b/graphics/pdf2svg/Makefile
@@ -3,13 +3,14 @@
 
 PORTNAME=	pdf2svg
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cityinthesky.co.uk/_media/opensource/
 
 MAINTAINER=	martin.dieringer@gmx.de
 COMMENT=	Convert PDF to SVG
 
-LIB_DEPENDS=	poppler-glib:${PORTSDIR}/graphics/poppler-glib \
+LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
 		cairo:${PORTSDIR}/graphics/cairo \
 		gtk:${PORTSDIR}/x11-toolkits/gtk20
 
diff --git a/graphics/poppler-glib/Makefile b/graphics/poppler-glib/Makefile
index 2d102ee17d3f..f77c0fb5c40c 100644
--- a/graphics/poppler-glib/Makefile
+++ b/graphics/poppler-glib/Makefile
@@ -10,10 +10,8 @@ COMMENT=	Glib bindings to poppler
 
 MASTERDIR=	${.CURDIR}/../../graphics/poppler
 SLAVEPORT=	glib
-PLIST=	${.CURDIR}/pkg-plist
-MAKE_ENV+=	GI_SCANNER_DISABLE_CACHE=yes
+PLIST=		${.CURDIR}/pkg-plist
 
-NO_STAGE=	yes
 pre-build:
 	@cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 		Makefile ${MAKE_ARGS} libpoppler-cairo.la
diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile
index 23c5d9638ca9..27ffd9a56b50 100644
--- a/graphics/poppler-qt4/Makefile
+++ b/graphics/poppler-qt4/Makefile
@@ -12,9 +12,4 @@ MASTERDIR=	${.CURDIR}/../../graphics/poppler
 SLAVEPORT=	qt4
 PLIST=		${.CURDIR}/pkg-plist
 
-NO_STAGE=	yes
-pre-build:
-	cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		Makefile ${MAKE_ARGS} libpoppler-arthur.la
-
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile
index 7545f0e0ae46..fe9540f610dc 100644
--- a/graphics/poppler-utils/Makefile
+++ b/graphics/poppler-utils/Makefile
@@ -12,5 +12,4 @@ MASTERDIR=	${.CURDIR}/../../graphics/poppler
 SLAVEPORT=	utils
 PLIST=		${.CURDIR}/pkg-plist
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/poppler-utils/pkg-plist b/graphics/poppler-utils/pkg-plist
index 4782d6236779..7b6ed7ba5d5e 100644
--- a/graphics/poppler-utils/pkg-plist
+++ b/graphics/poppler-utils/pkg-plist
@@ -9,3 +9,14 @@ bin/pdftoppm
 bin/pdftops
 bin/pdftotext
 bin/pdfunite
+man/man1/pdfdetach.1.gz
+man/man1/pdffonts.1.gz
+man/man1/pdfimages.1.gz
+man/man1/pdfinfo.1.gz
+man/man1/pdfseparate.1.gz
+man/man1/pdftocairo.1.gz
+man/man1/pdftohtml.1.gz
+man/man1/pdftops.1.gz
+man/man1/pdftotext.1.gz
+man/man1/pdftoppm.1.gz
+man/man1/pdfunite.1.gz
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index d89ff72931b5..c4934c9853cc 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,32 +3,35 @@
 #   $MCom: ports/graphics/poppler/Makefile,v 1.84 2013/03/12 14:53:49 kwm Exp $
 
 PORTNAME=	poppler
-PORTVERSION=	0.22.2
+PORTVERSION=	0.24.4
 PORTREVISION?=	0
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
 
 MAINTAINER?=	gnome@FreeBSD.org
-COMMENT?=	A PDF rendering library
+COMMENT?=	PDF rendering library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
-		lcms2:${PORTSDIR}/graphics/lcms2
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		liblcms2.so:${PORTSDIR}/graphics/lcms2
 RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data
 
-USES=		gmake pkgconfig
-USE_GNOME=	gnomehack libxml2 ltverhack
-USE_AUTOTOOLS=	libtool
-MAKE_JOBS_UNSAFE=	yes
+USE_XZ=		yes
+USES=		gmake pathfix pkgconfig
+USE_GNOME=	libxml2 ltverhack
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-zlib \
 		--enable-xpdf-headers \
 		--disable-gtk-test \
 		--with-html-dir=${DOCSDIR}
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+# see https://bugs.freedesktop.org/show_bug.cgi?id=72499
+CPPFLAGS+=	 -D__LONG_LONG_SUPPORTED
 
 .if !defined(SLAVEPORT)
 PORTSCOUT=	limitw:1,even
@@ -37,25 +40,22 @@ OPTIONS_DEFINE=	CAIRO OPENJPEG
 OPTIONS_DEFAULT=CAIRO OPENJPEG
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if defined(SLAVEPORT)
 PORTSCOUT=	ignore:1
-LIB_DEPENDS+=	poppler:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS+=	libpoppler.so:${PORTSDIR}/graphics/poppler
 
-.if ${SLAVEPORT}=="glib"
-BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
+.if ${SLAVEPORT}==glib
 CONFIGURE_ARGS+=--enable-poppler-glib
-USE_GNOME+=	gnomehier glib20
+USE_GNOME+=	cairo gnomehier glib20 introspection:build
 BUILD_WRKSRC=	${WRKSRC}/glib
 INSTALL_WRKSRC=	${WRKSRC}/glib
 .else
 CONFIGURE_ARGS+=--disable-poppler-glib
 .endif
 
-.if ${SLAVEPORT}=="qt4"
+.if ${SLAVEPORT}==qt4
 CONFIGURE_ARGS+=--enable-poppler-qt4
 CONFIGURE_ENV+=	ac_cv_prog_MOCQT4=${LOCALBASE}/bin/moc-qt4
 USE_QT4=	gui corelib xml qtestlib moc_build
@@ -65,14 +65,22 @@ INSTALL_WRKSRC=	${WRKSRC}/qt4
 CONFIGURE_ARGS+=--disable-poppler-qt4
 .endif
 
-.if ${SLAVEPORT}=="utils"
-LIB_DEPENDS+=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
+# needs checking when Qt5 is available
+.if ${SLAVEPORT}==qt5
+CONFIGURE_ARGS+=--enable-poppler-qt5
+CONFIGURE_ENV+=	ac_cv_prog_MOCQT4=${LOCALBASE}/bin/moc-qt5
+USE_QT5=	gui corelib xml qtestlib moc_build
+BUILD_WRKSRC=	${WRKSRC}/qt5
+INSTALL_WRKSRC=	${WRKSRC}/qt5
+.else
+CONFIGURE_ARGS+=--disable-poppler-qt5
+.endif
+
+.if ${SLAVEPORT}==utils
+LIB_DEPENDS+=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 CONFIGURE_ARGS+=--enable-utils
 BUILD_WRKSRC=	${WRKSRC}/utils
 INSTALL_WRKSRC=	${WRKSRC}/utils
-MAN1=		pdfdetach.1 pdffonts.1 pdfimages.1 pdfinfo.1 pdfseparate.1 \
-		pdftocairo.1 pdftohtml.1  pdftops.1 pdftotext.1 pdftoppm.1 \
-		pdfunite.1
 .else
 CONFIGURE_ARGS+=--disable-utils
 .endif
@@ -83,7 +91,7 @@ CONFIGURE_ARGS+=--disable-poppler-glib \
 		--disable-utils
 
 .if ${PORT_OPTIONS:MCAIRO}
-LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=	libcairo.so:${PORTSDIR}/graphics/cairo
 PLIST_SUB+=	CAIRO=""
 .else
 CONFIGURE_ARGS+=--disable-cairo-output
@@ -92,7 +100,7 @@ PLIST_SUB+=	CAIRO="@comment "
 
 .if ${PORT_OPTIONS:MOPENJPEG}
 CONFIGURE_ARGS+=--enable-libopenjpeg
-LIB_DEPENDS+=	openjpeg:${PORTSDIR}/graphics/openjpeg
+LIB_DEPENDS+=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg
 .else
 CONFIGURE_ARGS+=--disable-libopenjpeg
 .endif
@@ -102,20 +110,30 @@ post-patch:
 .if ${CXX:M*clang*} && ${CXXFLAGS:M-stdlib=libc++}
 	@${REINPLACE_CMD} '/CXXFLAGS.*-ansi/d' ${WRKSRC}/configure
 .endif
-	@${REINPLACE_CMD} -e 's|-version-info 35:0:0|-version-info 34:0:0|g' \
-		${WRKSRC}/poppler/Makefile.in
-.if defined(SLAVEPORT) && ${SLAVEPORT}=="qt4"
+#	@${REINPLACE_CMD} -e 's|-version-info 35:0:0|-version-info 34:0:0|g' \
+#		${WRKSRC}/poppler/Makefile.in
+.if defined(SLAVEPORT) && ${SLAVEPORT}==qt4
 	@${REINPLACE_CMD} -e 's|MOCQT4=`.*|MOCQT4="${LOCALBASE}/bin/moc-qt4"|' \
 		${WRKSRC}/configure
 .endif
+.if defined(SLAVEPORT) && ${SLAVEPORT}==qt5
+	@${REINPLACE_CMD} -e 's|MOCQT5=`.*|MOCQT5="${LOCALBASE}/bin/moc-qt5"|' \
+		${WRKSRC}/configure
+.endif
 
 post-install:
 .if defined(SLAVEPORT)
-.if ${SLAVEPORT}=="glib"
-	${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${PREFIX}/libdata/pkgconfig
-.elif ${SLAVEPORT}=="qt4"
-	${INSTALL_DATA} ${WRKSRC}/poppler-qt4.pc ${PREFIX}/libdata/pkgconfig
-.endif
+. 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
+	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpoppler*.so.*
 
 .include <bsd.port.mk>
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index b34e0426d0dd..3e4cbf05e8a4 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.22.2.tar.gz) = 108736ef84069317f6c5beacb5268f3b799ecf401e353e239611772eae8a662d
-SIZE (poppler-0.22.2.tar.gz) = 2215737
+SHA256 (poppler-0.24.4.tar.xz) = c8a3509a17e6f0bbb07eeb1b58276b485974a8bff3f5eef1bc8e150ccd7c01e2
+SIZE (poppler-0.24.4.tar.xz) = 1511248
diff --git a/graphics/poppler/files/patch-qt4_src_Makefile.in b/graphics/poppler/files/patch-qt4_src_Makefile.in
index 916eabc22f88..116cad640328 100644
--- a/graphics/poppler/files/patch-qt4_src_Makefile.in
+++ b/graphics/poppler/files/patch-qt4_src_Makefile.in
@@ -1,19 +1,20 @@
---- qt4/src/Makefile.in.orig	2010-07-07 14:22:29.000000000 +0200
-+++ qt4/src/Makefile.in	2010-07-07 14:23:40.000000000 +0200
-@@ -79,7 +79,6 @@
+--- qt4/src/Makefile.in.orig	2013-12-02 18:58:51.000000000 +0100
++++ qt4/src/Makefile.in	2013-12-02 18:59:39.000000000 +0100
+@@ -129,7 +129,7 @@
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  libpoppler_qt4_la_DEPENDENCIES =  \
--	$(top_builddir)/poppler/libpoppler.la \
- 	$(top_builddir)/poppler/libpoppler-arthur.la \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \
-@@ -384,7 +383,7 @@
- 	poppler-page-transition-private.h
+-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1)
+ am_libpoppler_qt4_la_OBJECTS = libpoppler_qt4_la-poppler-document.lo \
+ 	libpoppler_qt4_la-poppler-page.lo \
+ 	libpoppler_qt4_la-poppler-fontinfo.lo \
+@@ -505,7 +505,7 @@
+ 	-Dpoppler_qt4_EXPORTS
  
  libpoppler_qt4_la_LIBADD = \
 -	$(top_builddir)/poppler/libpoppler.la	\
 +	-lpoppler	\
- 	$(top_builddir)/poppler/libpoppler-arthur.la	\
- 	$(FONTCONFIG_LIBS)				\
  	$(POPPLER_QT4_LIBS)
+ 
+ libpoppler_qt4_la_LDFLAGS = -version-info 7:0:3 @create_shared_lib@ @auto_import_flags@
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
index 33a7ee9a7ae9..735fb3b3807c 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	2013-02-10 17:11:45.000000000 +0000
-+++ utils/Makefile.in	2013-02-10 17:13:35.000000000 +0000
-@@ -84,38 +84,38 @@
+--- utils/Makefile.in.orig	2013-12-02 19:00:03.000000000 +0100
++++ utils/Makefile.in	2013-12-02 19:01:25.000000000 +0100
+@@ -111,7 +111,7 @@
  am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) $(am__objects_1)
  pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
  pdfdetach_LDADD = $(LDADD)
@@ -9,6 +9,7 @@
  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)
  pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
  pdffonts_LDADD = $(LDADD)
@@ -30,23 +31,23 @@
  pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
  pdfseparate_LDADD = $(LDADD)
 -pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfseparate_DEPENDENCIES = 
++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)
  pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
 -am__DEPENDENCIES_1 = $(top_builddir)/poppler/libpoppler.la
-+am__DEPENDENCIES_1 = 
++am__DEPENDENCIES_1 =
  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@pdftocairo_DEPENDENCIES = \
  @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1) \
- @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_4)
- am__objects_2 = pdftohtml-parseargs.$(OBJEXT)
-@@ -124,7 +124,7 @@
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_4) \
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_2)
+@@ -153,7 +153,7 @@
  	pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2)
  pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
  pdftohtml_LDADD = $(LDADD)
@@ -55,32 +56,32 @@
  pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
  	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -133,20 +133,20 @@
+@@ -162,20 +162,20 @@
  @BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
  pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
  pdftoppm_LDADD = $(LDADD)
 -pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftoppm_DEPENDENCIES = 
++pdftoppm_DEPENDENCIES =
  am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1)
  pdftops_OBJECTS = $(am_pdftops_OBJECTS)
  pdftops_LDADD = $(LDADD)
 -pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftops_DEPENDENCIES = 
++pdftops_DEPENDENCIES =
  am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) \
  	$(am__objects_1)
  pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
  pdftotext_LDADD = $(LDADD)
 -pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdftotext_DEPENDENCIES = 
++pdftotext_DEPENDENCIES =
  am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) $(am__objects_1)
  pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
  pdfunite_LDADD = $(LDADD)
 -pdfunite_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la
-+pdfunite_DEPENDENCIES = 
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -451,7 +451,7 @@
++pdfunite_DEPENDENCIES =
+ 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)
  
  LDADD = \
@@ -89,12 +90,12 @@
  	$(UTILS_LIBS)
  
  @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_SOURCES = \
-@@ -459,7 +459,7 @@
+@@ -524,7 +524,7 @@
  @BUILD_CAIRO_OUTPUT_TRUE@	$(common)
  
  @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) $(PDFTOCAIRO_LIBS)
- 
- @BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_binary = pdftocairo
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(LDADD)				\
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(PDFTOCAIRO_LIBS)			\
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(PTHREAD_LIBS)
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index d831a0b66621..225b97a7f5d3 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -133,7 +133,7 @@ lib/libpoppler-cpp.so.0
 lib/libpoppler.a
 lib/libpoppler.la
 lib/libpoppler.so
-lib/libpoppler.so.34
+lib/libpoppler.so.44
 %%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
 libdata/pkgconfig/poppler-cpp.pc
 libdata/pkgconfig/poppler-splash.pc
diff --git a/graphics/py-poppler-qt4/Makefile b/graphics/py-poppler-qt4/Makefile
index 0a79afcd0f55..c667656e72c7 100644
--- a/graphics/py-poppler-qt4/Makefile
+++ b/graphics/py-poppler-qt4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	poppler-qt4
 PORTVERSION=	0.16.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics python
 MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	python-poppler-qt4
@@ -18,14 +18,17 @@ LICENSE_COMB=	dual
 BUILD_DEPENDS=	sip:${PORTSDIR}/devel/py-sip \
 		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
 		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml
-LIB_DEPENDS=	poppler-qt4:${PORTSDIR}/graphics/poppler-qt4
+LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
 		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml
 
+BROKEN=		Doesn't build with current poppler API
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 PYEASYINSTALL_ARCHDEP=	yes
 PYDISTUTILS_PKGNAME=	python_poppler_qt4
+CFLAGS+=	-I${LOCALBASE}/include
 
 NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile
index 7891414111cc..fb6b61cd7f19 100644
--- a/graphics/py-poppler/Makefile
+++ b/graphics/py-poppler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	poppler
 PORTVERSION=	0.12.1
+PORTREVISION=	2
 CATEGORIES=	graphics python
 MASTER_SITES=	https://launchpad.net/poppler-python/trunk/development/+download/ \
 		http://launchpadlibrarian.net/30270080/ \
@@ -13,7 +14,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	Python bindings for the Poppler PDF rendering library
 
-LIB_DEPENDS=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/qcomicbook/Makefile b/graphics/qcomicbook/Makefile
index 85309ca24d7d..6cc1d804e310 100644
--- a/graphics/qcomicbook/Makefile
+++ b/graphics/qcomicbook/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qcomicbook
 PORTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://qcomicbook.linux-projects.net/releases/
 
@@ -12,7 +12,7 @@ COMMENT=	Qt-based comic book archive viewer
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	poppler-qt4:${PORTSDIR}/graphics/poppler-qt4
+LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
 RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip \
 		unrar:${PORTSDIR}/archivers/unrar
 USE_QT4=	corelib gui linguist_build moc_build qmake_build rcc_build \
diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile
index 030d37553477..774583b45b18 100644
--- a/graphics/xournal/Makefile
+++ b/graphics/xournal/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xournal
 PORTVERSION=	0.4.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -12,7 +12,7 @@ COMMENT=	A notetaking application that can annotate PDFs
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 
 USES=		pkgconfig
 USE_GNOME=	desktopfileutils libgnomecanvas
diff --git a/graphics/zathura-pdf-poppler/Makefile b/graphics/zathura-pdf-poppler/Makefile
index a3476bfcabfd..41a61fa832f0 100644
--- a/graphics/zathura-pdf-poppler/Makefile
+++ b/graphics/zathura-pdf-poppler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	zathura-pdf-poppler
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://pwmt.org/projects/zathura/plugins/download/
 
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 336bfcd8b9d5..43ef94718f91 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pdf_viewer
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	PDF and PostScript viewer plugin for Claws Mail
 
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index 8cf4fe9d9c46..6cc77fd7e417 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tellico
 PORTVERSION=	2.3.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc kde
 MASTER_SITES=	http://tellico-project.org/files/
 
@@ -13,7 +13,7 @@ COMMENT=	Collection manager for KDE
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib \
-		poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \
+		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
 		yaz:${PORTSDIR}/net/yaz \
 		exempi:${PORTSDIR}/textproc/exempi \
 		qjson:${PORTSDIR}/devel/qjson
diff --git a/print/deforaos-pdfviewer/Makefile b/print/deforaos-pdfviewer/Makefile
index aa8464a97b4d..2b6b97ce3a6f 100644
--- a/print/deforaos-pdfviewer/Makefile
+++ b/print/deforaos-pdfviewer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pdfviewer
 PORTVERSION=	0.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.defora.org/os/download/download/3686/
 PKGNAMEPREFIX=	deforaos-
diff --git a/print/pdfcube/Makefile b/print/pdfcube/Makefile
index 124b6a27cc26..9a91f35a8919 100644
--- a/print/pdfcube/Makefile
+++ b/print/pdfcube/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pdfcube
 PORTVERSION=	0.0.5
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://code.100allora.it/releases/pdfcube/
 
diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile
index 69c81f827904..3453a57ab1fb 100644
--- a/print/qpdfview/Makefile
+++ b/print/qpdfview/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qpdfview
 PORTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	https://launchpadlibrarian.net/140746246/
 
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 7495a03e28a2..481fc341cdf3 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scribus
 PORTVERSION=	1.5.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print editors
 MASTER_SITES=	http://download.tuxfamily.org/bartcoding/FreeBSD/ \
 				${MASTER_SITE_LOCAL}
diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile
index 516673f41a2b..7f020c89e7cf 100644
--- a/print/tex-luatex/Makefile
+++ b/print/tex-luatex/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	luatex
 PORTVERSION=	0.70.2
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2012/
 PKGNAMEPREFIX=	tex-
@@ -18,7 +19,7 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2 \
 		graphite:${PORTSDIR}/graphics/silgraphite \
 		icuio:${PORTSDIR}/devel/icu \
 		png15:${PORTSDIR}/graphics/png \
-		poppler:${PORTSDIR}/graphics/poppler \
+		libpoppler.so:${PORTSDIR}/graphics/poppler \
 		TECkit:${PORTSDIR}/textproc/teckit \
 		zzip:${PORTSDIR}/devel/zziplib
 
diff --git a/print/tex-xetex/Makefile b/print/tex-xetex/Makefile
index 897800c0cbd4..5e51f51c0419 100644
--- a/print/tex-xetex/Makefile
+++ b/print/tex-xetex/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	xetex
 PORTVERSION=	0.9999
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://people.allbsd.org/~hrs/FreeBSD/:web2c \
 		ftp://tug.org/historic/systems/texlive/2012/:texmf
diff --git a/sysutils/nepomuk-core/Makefile b/sysutils/nepomuk-core/Makefile
index eed45cba7c9b..9f0f60c2147d 100644
--- a/sysutils/nepomuk-core/Makefile
+++ b/sysutils/nepomuk-core/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nepomuk-core
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -11,7 +12,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Core Nepomuk system libraries and services for KDE
 
-LIB_DEPENDS=	poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \
+LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
 		tag.1:${PORTSDIR}/audio/taglib \
 		exiv2.12:${PORTSDIR}/graphics/exiv2 \
 		swscale:${PORTSDIR}/multimedia/ffmpeg
diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile
index d2bc01d60265..eb5952a7c4bb 100644
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	tracker
 PORTVERSION=	0.6.95
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX?=	-client
@@ -14,7 +14,7 @@ COMMENT=	Object database, tag/metadata database, search tool and indexer
 
 LIB_DEPENDS=	sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
+		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
 		exif.12:${PORTSDIR}/graphics/libexif \
 		wv-1.2.4:${PORTSDIR}/textproc/wv \
 		gmime-2.0.4:${PORTSDIR}/mail/gmime2 \
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index e1cf6b16c5ee..e726a9a47bd6 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libextractor
 PORTVERSION=	0.6.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -99,7 +99,7 @@ PLIST_SUB+=	GSF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPOPPLER}
-LIB_DEPENDS+=	poppler:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS+=	libpoppler.so:${PORTSDIR}/graphics/poppler
 PLIST_SUB+=	POPPLER=""
 .else
 PLIST_SUB+=	POPPLER="@comment "
diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile
index 255a1991d616..974db00e263f 100644
--- a/textproc/pdfgrep/Makefile
+++ b/textproc/pdfgrep/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pdfgrep
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -12,7 +13,7 @@ COMMENT=	A tool to search text in PDF files
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	poppler:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler
 
 GNU_CONFIGURE=	yes
 USES=		gmake pkgconfig
diff --git a/x11-toolkits/ruby-poppler/Makefile b/x11-toolkits/ruby-poppler/Makefile
index 400267e1ce90..ea921aea26cb 100644
--- a/x11-toolkits/ruby-poppler/Makefile
+++ b/x11-toolkits/ruby-poppler/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	poppler
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -13,7 +14,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for Poppler
 
-LIB_DEPENDS=	poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 BUILD_DEPENDS=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 
diff --git a/x11-toolkits/rubygem-poppler/Makefile b/x11-toolkits/rubygem-poppler/Makefile
index da5ccec1a235..cf944205b8d8 100644
--- a/x11-toolkits/rubygem-poppler/Makefile
+++ b/x11-toolkits/rubygem-poppler/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	poppler
 PORTVERSION=	2.0.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits rubygems
 MASTER_SITES=	RG
 
@@ -9,7 +10,7 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for Poppler
 
 RUN_DEPENDS=	rubygem-gtk2>=${PORTVERSION}:${PORTSDIR}/x11-toolkits/rubygem-gtk2
-LIB_DEPENDS=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 
 USE_RUBY=	yes
 USE_RUBYGEMS=	yes
diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile
index 3ed83ae28b7b..10774dd5299b 100644
--- a/x11/eaglemode/Makefile
+++ b/x11/eaglemode/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	eaglemode
 PORTVERSION=	0.84.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -53,7 +54,7 @@ PLIST_SUB+=	EMSVG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPDF}
-LIB_DEPENDS+=	poppler-glib:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS+=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 USE_GNOME+=	gtk20
 PLIST_SUB+=	EMPDF=""
 .else