Update poppler to 0.20.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16906 df743ca5-7f9a-e211-a948-0013205c9059

15 files changed, 592 insertions, 0 deletions

diff --git a/graphics/poppler-glib/Makefile b/graphics/poppler-glib/Makefile
new file mode 100644
index 000000000..8d945f749
--- /dev/null
+++ b/graphics/poppler-glib/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	poppler-gtk
+# Date created:		2006-01-12
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD: ports/graphics/poppler-glib/Makefile,v 1.3 2012/06/01 05:20:37 dinoex Exp $
+#   $MCom$
+#
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-glib
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Glib bindings to poppler
+
+MASTERDIR=	${.CURDIR}/../../graphics/poppler
+SLAVEPORT=	glib
+PLIST=	${.CURDIR}/pkg-plist
+
+pre-build:
+	cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		Makefile ${MAKE_ARGS} libpoppler-cairo.la
+
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/poppler-glib/pkg-plist b/graphics/poppler-glib/pkg-plist
new file mode 100644
index 000000000..e638bd6cc
--- /dev/null
+++ b/graphics/poppler-glib/pkg-plist
@@ -0,0 +1,53 @@
+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.h
+lib/girepository-1.0/Poppler-0.18.typelib
+lib/libpoppler-glib.a
+lib/libpoppler-glib.la
+lib/libpoppler-glib.so
+lib/libpoppler-glib.so.8
+libdata/pkgconfig/poppler-glib.pc
+%%DOCSDIR%%/poppler/PopplerAnnot.html
+%%DOCSDIR%%/poppler/PopplerAttachment.html
+%%DOCSDIR%%/poppler/PopplerDocument.html
+%%DOCSDIR%%/poppler/PopplerFormField.html
+%%DOCSDIR%%/poppler/PopplerLayer.html
+%%DOCSDIR%%/poppler/PopplerMedia.html
+%%DOCSDIR%%/poppler/PopplerMovie.html
+%%DOCSDIR%%/poppler/PopplerPage.html
+%%DOCSDIR%%/poppler/annotation-glossary.html
+%%DOCSDIR%%/poppler/api-index-0-12.html
+%%DOCSDIR%%/poppler/api-index-0-14.html
+%%DOCSDIR%%/poppler/api-index-0-16.html
+%%DOCSDIR%%/poppler/api-index-0-18.html
+%%DOCSDIR%%/poppler/api-index-0-20.html
+%%DOCSDIR%%/poppler/api-index-deprecated.html
+%%DOCSDIR%%/poppler/api-index-full.html
+%%DOCSDIR%%/poppler/ch01.html
+%%DOCSDIR%%/poppler/home.png
+%%DOCSDIR%%/poppler/index.html
+%%DOCSDIR%%/poppler/index.sgml
+%%DOCSDIR%%/poppler/left.png
+%%DOCSDIR%%/poppler/poppler-PopplerAction.html
+%%DOCSDIR%%/poppler/poppler-Version-and-Features-Information.html
+%%DOCSDIR%%/poppler/poppler-poppler.html
+%%DOCSDIR%%/poppler/poppler.devhelp2
+%%DOCSDIR%%/poppler/right.png
+%%DOCSDIR%%/poppler/style.css
+%%DOCSDIR%%/poppler/up.png
+share/gir-1.0/Poppler-0.18.gir
+@dirrmtry share/gir-1.0
+@dirrmtry lib/girepository-1.0
+@dirrmtry %%DOCSDIR%%/poppler
+@dirrmtry %%DOCSDIR%%
+@dirrm include/poppler/glib
diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile
new file mode 100644
index 000000000..3f426d86c
--- /dev/null
+++ b/graphics/poppler-qt4/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	poppler-qt4
+# Date created:		June 26, 2007
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/graphics/poppler-qt4/Makefile,v 1.15 2010/07/07 13:03:19 kwm Exp $
+#
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-qt4
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Qt4 bindings to poppler
+
+MASTERDIR=	${.CURDIR}/../../graphics/poppler
+SLAVEPORT=	qt4
+PLIST=		${.CURDIR}/pkg-plist
+
+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-qt4/pkg-plist b/graphics/poppler-qt4/pkg-plist
new file mode 100644
index 000000000..bd564b99d
--- /dev/null
+++ b/graphics/poppler-qt4/pkg-plist
@@ -0,0 +1,14 @@
+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.a
+lib/libpoppler-qt4.la
+lib/libpoppler-qt4.so
+lib/libpoppler-qt4.so.4
+libdata/pkgconfig/poppler-qt4.pc
+@dirrm include/poppler/qt4
diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile
new file mode 100644
index 000000000..263fca70e
--- /dev/null
+++ b/graphics/poppler-utils/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	poppler-utils
+# Date created:		2006-05-01
+# Whom:			Michael Nottebrock <lofi@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/graphics/poppler-utils/Makefile,v 1.5 2010/07/07 13:03:19 kwm Exp $
+#
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-utils
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Poppler's xpdf-workalike command line utilities
+
+MASTERDIR=	${.CURDIR}/../../graphics/poppler
+SLAVEPORT=	utils
+PLIST=		${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/poppler-utils/pkg-plist b/graphics/poppler-utils/pkg-plist
new file mode 100644
index 000000000..4782d6236
--- /dev/null
+++ b/graphics/poppler-utils/pkg-plist
@@ -0,0 +1,11 @@
+bin/pdfdetach
+bin/pdffonts
+bin/pdfimages
+bin/pdfinfo
+bin/pdfseparate
+bin/pdftocairo
+bin/pdftohtml
+bin/pdftoppm
+bin/pdftops
+bin/pdftotext
+bin/pdfunite
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
new file mode 100644
index 000000000..a03564641
--- /dev/null
+++ b/graphics/poppler/Makefile
@@ -0,0 +1,121 @@
+# New ports collection makefile for:	poppler
+# Date created:         03 March 2005
+# Whom:                 marcus@FreeBSD.org
+#
+# $FreeBSD$
+#   $MCom: ports/graphics/poppler/Makefile,v 1.74 2011/08/05 14:05:23 kwm Exp $
+#
+
+PORTNAME=	poppler
+PORTVERSION=	0.20.1
+PORTREVISION?=	0
+CATEGORIES=	graphics print
+MASTER_SITES=	http://poppler.freedesktop.org/
+
+MAINTAINER?=	gnome@FreeBSD.org
+COMMENT?=	A PDF rendering library
+
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
+		lcms.1:${PORTSDIR}/graphics/lcms
+RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data
+
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack libxml2 ltverhack
+USE_AUTOTOOLS=	libtool
+MAKE_JOBS_UNSAFE=	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}
+
+.if !defined(SLAVEPORT)
+OPTIONS=	CAIRO "Enable cairo output backend" on \
+		OPENJPEG "Enable JPEG 2000 support" on
+.endif
+
+.include <bsd.port.options.mk>
+
+.if defined(SLAVEPORT)
+LIB_DEPENDS+=	poppler.26:${PORTSDIR}/graphics/poppler
+
+.if ${SLAVEPORT}=="glib"
+BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+CONFIGURE_ARGS+=--enable-poppler-glib
+USE_GNOME+=	gnomehier glib20
+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+=	ac_cv_prog_MOCQT4=${LOCALBASE}/bin/moc-qt4
+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}=="utils"
+LIB_DEPENDS+=	poppler-glib.8:${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
+
+.else
+CONFIGURE_ARGS+=--disable-poppler-glib \
+		--disable-poppler-qt4 \
+		--disable-utils
+
+.if defined(WITHOUT_CAIRO)
+CONFIGURE_ARGS+=--disable-cairo-output
+PLIST_SUB+=	CAIRO="@comment "
+.else
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+PLIST_SUB+=	CAIRO=""
+.endif
+
+.if defined(WITHOUT_OPENJPEG)
+CONFIGURE_ARGS+=--disable-libopenjpeg
+.else
+CONFIGURE_ARGS+=--enable-libopenjpeg
+LIB_DEPENDS+=	openjpeg.2:${PORTSDIR}/graphics/openjpeg
+.endif
+.endif
+
+post-patch:
+.if ${CXX:M*clang*} && ${CXXFLAGS:M-stdlib=libc++}
+	@${REINPLACE_CMD} '/CXXFLAGS.*-ansi/d' ${WRKSRC}/configure
+.endif
+#	@${REINPLACE_CMD} -e 's|-version-info 26:0:0|-version-info 26: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
+
+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
+.endif
+
+.include <bsd.port.mk>
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
new file mode 100644
index 000000000..29e886cfe
--- /dev/null
+++ b/graphics/poppler/distinfo
@@ -0,0 +1,2 @@
+SHA256 (poppler-0.20.1.tar.gz) = b4620f645319f4a8790465730bc472d5745155d0780809406fb29c62316d49a8
+SIZE (poppler-0.20.1.tar.gz) = 2141147
diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in
new file mode 100644
index 000000000..3cebc9ce2
--- /dev/null
+++ b/graphics/poppler/files/patch-glib_Makefile.in
@@ -0,0 +1,19 @@
+--- 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)" 
+ 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
+ 
+ libpoppler_glib_la_LIBADD = \
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler		\
+ 	$(top_builddir)/poppler/libpoppler-cairo.la	\
+ 	$(POPPLER_GLIB_LIBS)				\
+ 	$(FREETYPE_LIBS)				\
diff --git a/graphics/poppler/files/patch-glib_demo_Makefile.in b/graphics/poppler/files/patch-glib_demo_Makefile.in
new file mode 100644
index 000000000..9e5537da8
--- /dev/null
+++ b/graphics/poppler/files/patch-glib_demo_Makefile.in
@@ -0,0 +1,20 @@
+--- glib/demo/Makefile.in.orig	2012-06-13 13:31:37.000000000 +0200
++++ glib/demo/Makefile.in	2012-06-13 13:32:45.000000000 +0200
+@@ -66,7 +66,7 @@
+ am__DEPENDENCIES_1 =
+ poppler_glib_demo_DEPENDENCIES =  \
+ 	$(top_builddir)/glib/libpoppler-glib.la \
+-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+@@ -365,7 +365,7 @@
+ 
+ LDADD = \
+ 	$(top_builddir)/glib/libpoppler-glib.la	\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler	\
+ 	$(GTK_TEST_LIBS)
+ 
+ all: all-am
diff --git a/graphics/poppler/files/patch-qt4_Makefile.in b/graphics/poppler/files/patch-qt4_Makefile.in
new file mode 100644
index 000000000..ffb4777b4
--- /dev/null
+++ b/graphics/poppler/files/patch-qt4_Makefile.in
@@ -0,0 +1,11 @@
+--- qt4/Makefile.in.orig	2008-03-24 08:30:49.000000000 -0400
++++ qt4/Makefile.in	2008-03-24 08:30:34.000000000 -0400
+@@ -223,7 +223,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ win32_libs = @win32_libs@
+-SUBDIRS = src tests demos
++SUBDIRS = src
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/graphics/poppler/files/patch-qt4_src_Makefile.in b/graphics/poppler/files/patch-qt4_src_Makefile.in
new file mode 100644
index 000000000..916eabc22
--- /dev/null
+++ b/graphics/poppler/files/patch-qt4_src_Makefile.in
@@ -0,0 +1,19 @@
+--- 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 @@
+ 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
+ 
+ libpoppler_qt4_la_LIBADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler	\
+ 	$(top_builddir)/poppler/libpoppler-arthur.la	\
+ 	$(FONTCONFIG_LIBS)				\
+ 	$(POPPLER_QT4_LIBS)
diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in
new file mode 100644
index 000000000..58cdb32bb
--- /dev/null
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -0,0 +1,108 @@
+--- utils/Makefile.in.orig	2012-06-13 13:33:03.000000000 +0200
++++ utils/Makefile.in	2012-06-13 13:35:43.000000000 +0200
+@@ -68,7 +68,7 @@
+ pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
+ pdfdetach_LDADD = $(LDADD)
+ am__DEPENDENCIES_1 =
+-pdfdetach_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfdetach_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -76,35 +76,35 @@
+ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) $(am__objects_1)
+ pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
+ pdffonts_LDADD = $(LDADD)
+-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdffonts_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
+ 	$(am__objects_1)
+ pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
+ pdfimages_LDADD = $(LDADD)
+-pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfimages_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
+ 	$(am__objects_1)
+ pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
+ pdfinfo_LDADD = $(LDADD)
+-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfinfo_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) $(am__objects_1)
+ pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
+ pdfseparate_LDADD = $(LDADD)
+-pdfseparate_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdfseparate_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ 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_2 = $(top_builddir)/poppler/libpoppler.la \
++am__DEPENDENCIES_2 = -lpoppler \
+ 	$(am__DEPENDENCIES_1)
+ @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 =  \
+ @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@	$(am__DEPENDENCIES_1)
+ am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
+-@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
++@BUILD_CAIRO_OUTPUT_TRUE@pdftocairo_DEPENDENCIES = -lpoppler \
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_2) \
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_4)
+ am__objects_2 = pdftohtml-parseargs.$(OBJEXT)
+@@ -113,7 +113,7 @@
+ 	pdftohtml-HtmlOutputDev.$(OBJEXT) $(am__objects_2)
+ pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
+ pdftohtml_LDADD = $(LDADD)
+-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftohtml_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
+@@ -123,23 +123,23 @@
+ @BUILD_SPLASH_OUTPUT_TRUE@	$(am__objects_1)
+ pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
+ pdftoppm_LDADD = $(LDADD)
+-pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftoppm_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ 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 = \
+ 	$(am__DEPENDENCIES_1)
+ 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 = \
+ 	$(am__DEPENDENCIES_1)
+ 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 = \
+ 	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -441,7 +441,7 @@
+ 	$(PDFTOCAIRO_CFLAGS)
+ 
+ LDADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler	\
+ 	$(UTILS_LIBS)				\
+ 	$(FONTCONFIG_LIBS)
+ 
+@@ -450,7 +450,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
diff --git a/graphics/poppler/pkg-descr b/graphics/poppler/pkg-descr
new file mode 100644
index 000000000..d10674940
--- /dev/null
+++ b/graphics/poppler/pkg-descr
@@ -0,0 +1,6 @@
+Poppler is a fork of the xpdf PDF viewer developed by Derek Noonburg
+of Glyph and Cog, LLC.  It provides PDF rendering functionality as a
+shared library, and uses modern components from Freedesktop.org such as
+fontconfig and cairo to take advantage of modern UNIX desktops.
+
+WWW: http://poppler.freedesktop.org/
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
new file mode 100644
index 000000000..e6ca41182
--- /dev/null
+++ b/graphics/poppler/pkg-plist
@@ -0,0 +1,143 @@
+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
+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/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/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/TextOutputDev.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/PNGWriter.h
+include/poppler/goo/TiffWriter.h
+include/poppler/goo/gfile.h
+include/poppler/goo/gmem.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.a
+lib/libpoppler-cpp.la
+lib/libpoppler-cpp.so
+lib/libpoppler-cpp.so.0
+lib/libpoppler.a
+lib/libpoppler.la
+lib/libpoppler.so
+lib/libpoppler.so.26
+%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
+libdata/pkgconfig/poppler-cpp.pc
+libdata/pkgconfig/poppler-splash.pc
+libdata/pkgconfig/poppler.pc
+@dirrm include/poppler/splash
+@dirrm include/poppler/goo
+@dirrm include/poppler/fofi
+@dirrm include/poppler/cpp
+@dirrm include/poppler