Update poppler to 0.16.0.

Use bsd.port.options.mk instead of bsd.port.pre.mk so we don't have to resort
to hackery for the qt modules. by manualy including the bsd.qt.mk/bsd.kde.mk.
Lib chase will happen later.


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

14 files changed, 584 insertions, 0 deletions

diff --git a/graphics/poppler-gtk/Makefile b/graphics/poppler-gtk/Makefile
new file mode 100644
index 000000000..f9fe19076
--- /dev/null
+++ b/graphics/poppler-gtk/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	poppler-gtk
+# Date created:		2006-01-12
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/graphics/poppler-gtk/Makefile,v 1.20 2010/07/07 13:03:19 kwm Exp $
+#
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-gtk
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Gtk bindings to poppler
+
+MASTERDIR=	${.CURDIR}/../../graphics/poppler
+SLAVEPORT=	gtk
+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-gtk/pkg-plist b/graphics/poppler-gtk/pkg-plist
new file mode 100644
index 000000000..5e4d115c1
--- /dev/null
+++ b/graphics/poppler-gtk/pkg-plist
@@ -0,0 +1,50 @@
+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.16.typelib
+lib/libpoppler-glib.a
+lib/libpoppler-glib.la
+lib/libpoppler-glib.so
+lib/libpoppler-glib.so.6
+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-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.devhelp
+%%DOCSDIR%%/poppler/poppler.devhelp2
+%%DOCSDIR%%/poppler/right.png
+%%DOCSDIR%%/poppler/style.css
+%%DOCSDIR%%/poppler/up.png
+share/gir-1.0/Poppler-0.16.gir
+@dirrmtry %%DOCSDIR%%/poppler
+@dirrmtry %%DOCSDIR%%
+@dirrm include/poppler/glib
diff --git a/graphics/poppler-qt/Makefile b/graphics/poppler-qt/Makefile
new file mode 100644
index 000000000..c946b0bb2
--- /dev/null
+++ b/graphics/poppler-qt/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	poppler-qt
+# Date created:		2006-01-12
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/graphics/poppler-qt/Makefile,v 1.13 2010/07/07 13:03:19 kwm Exp $
+#
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-qt
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Qt bindings to poppler
+
+MASTERDIR=	${.CURDIR}/../../graphics/poppler
+SLAVEPORT=	qt
+PLIST=		${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/poppler-qt/pkg-plist b/graphics/poppler-qt/pkg-plist
new file mode 100644
index 000000000..945777bec
--- /dev/null
+++ b/graphics/poppler-qt/pkg-plist
@@ -0,0 +1,9 @@
+include/poppler/qt3/poppler-link-qt3.h
+include/poppler/qt3/poppler-page-transition.h
+include/poppler/qt3/poppler-qt.h
+lib/libpoppler-qt.a
+lib/libpoppler-qt.la
+lib/libpoppler-qt.so
+lib/libpoppler-qt.so.3
+libdata/pkgconfig/poppler-qt.pc
+@dirrm include/poppler/qt3
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
new file mode 100644
index 000000000..8abbd281b
--- /dev/null
+++ b/graphics/poppler/Makefile
@@ -0,0 +1,135 @@
+# New ports collection makefile for:	poppler
+# Date created:         03 March 2005
+# Whom:                 marcus@FreeBSD.org
+#
+# $FreeBSD$
+#   $MCom: ports/graphics/poppler/Makefile,v 1.66 2010/11/17 15:03:00 kwm Exp $
+#
+
+PORTNAME=	poppler
+PORTVERSION=	0.16.0
+PORTREVISION?=	0
+CATEGORIES=	graphics print
+MASTER_SITES=	http://poppler.freedesktop.org/
+
+MAINTAINER?=	gnome@FreeBSD.org
+COMMENT?=	A PDF rendering library
+
+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
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnometarget libxml2 ltverhack
+USE_AUTOTOOLS=	libtool
+MAKE_JOBS_UNSAFE=	yes
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--enable-zlib \
+		--enable-xpdf-headers \
+		--with-html-dir=${DOCSDIR}
+CPPFLAGS=-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ${PTHREAD_CFLAGS}
+LDFLAGS=-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+
+.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.12:${PORTSDIR}/graphics/poppler
+
+.if ${SLAVEPORT}=="gtk"
+CONFIGURE_ARGS+=--enable-poppler-glib
+USE_GNOME+=	gtk20
+BUILD_WRKSRC=	${WRKSRC}/glib
+INSTALL_WRKSRC=	${WRKSRC}/glib
+.else
+CONFIGURE_ARGS+=--disable-poppler-glib \
+		--disable-gdk \
+		--disable-gtk-test
+.endif
+
+.if ${SLAVEPORT}=="qt"
+CONFIGURE_ARGS+=--enable-poppler-qt
+USE_QT_VER+=	3
+BUILD_WRKSRC=	${WRKSRC}/qt
+INSTALL_WRKSRC=	${WRKSRC}/qt
+.else
+CONFIGURE_ARGS+=--disable-poppler-qt
+.endif
+
+.if ${SLAVEPORT}=="qt4"
+CONFIGURE_ARGS+=--enable-poppler-qt4
+USE_QT_VER+=	4
+QT_COMPONENTS=	gui corelib xml qtestlib moc_build
+# It requires poppler/splash to be built unless you disable splash backend
+# support to allow you use BUILD_WRKSRC here. It seems that splash backend
+# can read more PDF files than without, tested with demos's poppler_qt4viewer.
+#BUILD_WRKSRC=	${WRKSRC}/qt4
+INSTALL_WRKSRC=	${WRKSRC}/qt4
+.else
+CONFIGURE_ARGS+=--disable-poppler-qt4
+.endif
+
+.if ${SLAVEPORT}=="utils"
+CONFIGURE_ARGS+=--enable-utils
+CONFLICTS=	xpdf-[0-9]*
+BUILD_WRKSRC=	${WRKSRC}/utils
+INSTALL_WRKSRC=	${WRKSRC}/utils
+MAN1=		pdffonts.1 pdfimages.1 pdfinfo.1 \
+		pdftohtml.1  pdftops.1 pdftotext.1 pdftoppm.1
+.else
+CONFIGURE_ARGS+=--disable-utils
+.endif
+
+.else
+CONFIGURE_ARGS+=--disable-poppler-glib --disable-poppler-qt \
+		--disable-poppler-qt4 --disable-utils --disable-gdk \
+		--disable-gtk-test
+
+.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
+
+.if defined(SLAVEPORT) && ${SLAVEPORT}=="qt"
+	@${REINPLACE_CMD} -e 's|/usr/local/qt/include|${LOCALBASE}/include|; \
+		s|$$QTDIR|${QT_PREFIX}|; \
+		s|/usr/local/qt/lib|${LOCALBASE}/lib|' \
+		${WRKSRC}/configure
+.endif
+.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}=="gtk"
+	${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc ${PREFIX}/libdata/pkgconfig
+.elif ${SLAVEPORT}=="qt"
+	${INSTALL_DATA} ${WRKSRC}/poppler-qt.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..ef7621bed
--- /dev/null
+++ b/graphics/poppler/distinfo
@@ -0,0 +1,2 @@
+SHA256 (poppler-0.16.0.tar.gz) = e93e104abd710c310ebb98838f8147b198fbe0564cf8f5b273a75a1f7a01c5ac
+SIZE (poppler-0.16.0.tar.gz) = 1945847
diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in
new file mode 100644
index 000000000..4afb4b2aa
--- /dev/null
+++ b/graphics/poppler/files/patch-glib_Makefile.in
@@ -0,0 +1,47 @@
+--- glib/Makefile.in.orig	2010-08-14 16:50:48.000000000 +0200
++++ glib/Makefile.in	2010-08-14 16:50:48.000000000 +0200
+@@ -82,7 +82,6 @@
+ 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) $(am__DEPENDENCIES_1)
+@@ -105,8 +104,7 @@
+ @BUILD_WITH_GDK_TRUE@	test-poppler-glib.$(OBJEXT)
+ test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
+ @BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES =  \
+-@BUILD_WITH_GDK_TRUE@	$(top_builddir)/poppler/libpoppler.la \
+-@BUILD_WITH_GDK_TRUE@	libpoppler-glib.la $(am__DEPENDENCIES_1) \
++@BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1) \
+ @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1) \
+ @BUILD_WITH_GDK_TRUE@	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
+@@ -386,7 +384,7 @@
+ top_srcdir = @top_srcdir@
+ win32_libs = @win32_libs@
+ AM_LDFLAGS = @auto_import_flags@
+-SUBDIRS = . reference demo
++SUBDIRS = . reference
+ INCLUDES = \
+ 	-DG_LOG_DOMAIN=\"Poppler\"		\
+ 	-I$(top_srcdir)				\
+@@ -439,7 +437,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_glib_la_LIBADD = \
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler	\
+ 	$(top_builddir)/poppler/libpoppler-cairo.la	\
+ 	$(POPPLER_GLIB_LIBS)				\
+ 	$(GDK_LIBS)					\
+@@ -451,7 +449,7 @@
+ @BUILD_WITH_GDK_TRUE@       test-poppler-glib.cc
+ 
+ @BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \
+-@BUILD_WITH_GDK_TRUE@	$(top_builddir)/poppler/libpoppler.la	\
++@BUILD_WITH_GDK_TRUE@	-lpoppler				\
+ @BUILD_WITH_GDK_TRUE@	libpoppler-glib.la			\
+ @BUILD_WITH_GDK_TRUE@	$(POPPLER_GLIB_LIBS)			\
+ @BUILD_WITH_GDK_TRUE@	$(GDK_LIBS)				\
diff --git a/graphics/poppler/files/patch-poppler_Page.cc b/graphics/poppler/files/patch-poppler_Page.cc
new file mode 100644
index 000000000..1d0f63298
--- /dev/null
+++ b/graphics/poppler/files/patch-poppler_Page.cc
@@ -0,0 +1,11 @@
+--- poppler/Page.cc.orig	2008-07-09 17:53:56.000000000 +0200
++++ poppler/Page.cc	2008-07-09 17:54:49.000000000 +0200
+@@ -230,7 +230,7 @@
+ 
+ Page::Page(XRef *xrefA, int numA, Dict *pageDict, PageAttrs *attrsA, Form *form) {
+   Object tmp;
+-	
++  pageWidgets =	NULL;
+   ok = gTrue;
+   xref = xrefA;
+   num = numA;
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-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in
new file mode 100644
index 000000000..d872262ea
--- /dev/null
+++ b/graphics/poppler/files/patch-qt_Makefile.in
@@ -0,0 +1,39 @@
+--- qt/Makefile.in.orig	2008-03-27 08:17:35.000000000 -0400
++++ qt/Makefile.in	2008-03-27 08:18:20.000000000 -0400
+@@ -59,8 +59,7 @@
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libpoppler_qt_la_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++libpoppler_qt_la_DEPENDENCIES = 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
+ 	poppler-link.lo poppler-page.lo poppler-page-transition.lo
+@@ -71,7 +70,7 @@
+ PROGRAMS = $(noinst_PROGRAMS)
+ am_test_poppler_qt_OBJECTS = test-poppler-qt.$(OBJEXT)
+ test_poppler_qt_OBJECTS = $(am_test_poppler_qt_OBJECTS)
+-test_poppler_qt_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++test_poppler_qt_DEPENDENCIES = \
+ 	libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -273,7 +272,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_qt_la_LIBADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler -lqt-mt			\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+ 	$(FONTCONFIG_LIBS)
+@@ -283,7 +282,7 @@
+        test-poppler-qt.cpp
+ 
+ test_poppler_qt_LDADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler -lqt-mt			\
+ 	libpoppler-qt.la			\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_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..946065166
--- /dev/null
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -0,0 +1,73 @@
+--- utils/Makefile.in.orig	2011-01-05 13:06:04.000000000 +0100
++++ utils/Makefile.in	2011-01-05 13:06:26.000000000 +0100
+@@ -64,7 +64,7 @@ am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
+ pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
+ pdffonts_LDADD = $(LDADD)
+ am__DEPENDENCIES_1 =
+-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdffonts_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_$(V))
+ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+@@ -73,19 +73,19 @@ am_pdfimages_OBJECTS = pdfimages.$(OBJEX
+ 	$(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__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.cc parseargs.h
+ @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
+ @BUILD_ABIWORD_OUTPUT_TRUE@	$(am__objects_1)
+ pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS)
+-am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \
++am__DEPENDENCIES_2 =  \
+ 	$(am__DEPENDENCIES_1)
+ @BUILD_ABIWORD_OUTPUT_TRUE@pdftoabw_DEPENDENCIES =  \
+ @BUILD_ABIWORD_OUTPUT_TRUE@	$(am__DEPENDENCIES_2) \
+@@ -94,25 +94,25 @@ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEX
+ 	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
+ pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
+ pdftohtml_LDADD = $(LDADD)
+-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++pdftohtml_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1)
+ am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.cc parseargs.h
+ @BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \
+ @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)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+@@ -405,7 +405,7 @@ INCLUDES = \
+ 	$(ABIWORD_CFLAGS)
+ 
+ LDADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler				\
+ 	$(UTILS_LIBS)				\
+ 	$(FONTCONFIG_LIBS)
+ 
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..1c6ae80a1
--- /dev/null
+++ b/graphics/poppler/pkg-plist
@@ -0,0 +1,140 @@
+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/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/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/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.12
+%%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