Update to 0.7.3

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

8 files changed, 385 insertions, 0 deletions

diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
new file mode 100644
index 000000000..0e778d996
--- /dev/null
+++ b/graphics/poppler/Makefile
@@ -0,0 +1,108 @@
+# New ports collection makefile for:	poppler
+# Date created:         03 March 2005
+# Whom:                 marcus@FreeBSD.org
+#
+# $FreeBSD$
+#   $MCom: ports-stable/graphics/poppler/Makefile,v 1.4 2007/11/30 04:35:05 marcus Exp $
+#
+
+PORTNAME=	poppler
+PORTVERSION=	0.7.3
+PORTREVISION?=	0
+CATEGORIES=	graphics print
+MASTER_SITES=	http://poppler.freedesktop.org/
+
+MAINTAINER?=	gnome@FreeBSD.org
+COMMENT?=	A PDF rendering library
+
+RUN_DEPENDS=	poppler-data>0:${PORTSDIR}/graphics/poppler-data
+
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnometarget libxml2 ltverhack
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--enable-zlib \
+		--enable-xpdf-headers \
+		--with-html-dir=${DOCSDIR}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+
+.if !defined(SLAVEPORT)
+OPTIONS=	CAIRO "Enable cairo output backend" on
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined(SLAVEPORT)
+LIB_DEPENDS+=	poppler.3:${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
+.endif
+
+.if ${SLAVEPORT}=="qt"
+CONFIGURE_ARGS+=--enable-poppler-qt
+USE_QT_VER+=	3
+BUILD_WRKSRC=	${WRKSRC}/qt
+INSTALL_WRKSRC=	${WRKSRC}/qt
+.include "${PORTSDIR}/Mk/bsd.kde.mk"
+.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
+#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
+
+.if defined(WITHOUT_CAIRO)
+CONFIGURE_ARGS+=	--disable-cairo-output
+.else
+LIB_DEPENDS+=		cairo.2:${PORTSDIR}/graphics/cairo
+.endif
+.endif
+
+post-patch:
+.if defined(SLAVEPORT) && ${SLAVEPORT}=="qt"
+	@${REINPLACE_CMD} -e 's|/usr/local/qt/include|${LOCALBASE}/include|; \
+		s|/usr/local/qt/lib|${LOCALBASE}/lib|' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|$$QTDIR|${QT_PREFIX}|' ${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.post.mk>
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
new file mode 100644
index 000000000..399173dce
--- /dev/null
+++ b/graphics/poppler/distinfo
@@ -0,0 +1,3 @@
+MD5 (poppler-0.7.3.tar.gz) = 40bd86f53fe0bdf06c96c7b011b78349
+SHA256 (poppler-0.7.3.tar.gz) = d1470b23dd5716bb2d9ec89847016cd53c9cb685710df9729a4a1244b71078f2
+SIZE (poppler-0.7.3.tar.gz) = 1443147
diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in
new file mode 100644
index 000000000..94d7703cd
--- /dev/null
+++ b/graphics/poppler/files/patch-glib_Makefile.in
@@ -0,0 +1,45 @@
+--- glib/Makefile.in.orig	2008-03-24 09:03:54.000000000 -0400
++++ glib/Makefile.in	2008-03-24 09:04:38.000000000 -0400
+@@ -66,7 +66,6 @@
+ @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(am__DEPENDENCIES_1)
+ libpoppler_glib_la_DEPENDENCIES =  \
+-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+ am__objects_1 = poppler-enums.lo
+@@ -80,7 +79,6 @@
+ @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) \
+@@ -295,7 +293,7 @@
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(top_builddir)/poppler/libpoppler-cairo.la	\
+ @BUILD_CAIRO_OUTPUT_TRUE@	$(CAIRO_LIBS)
+ 
+-SUBDIRS = . reference demo
++SUBDIRS = . reference
+ INCLUDES = \
+ 	-DG_LOG_DOMAIN=\"Poppler\"		\
+ 	-I$(top_srcdir)				\
+@@ -336,7 +334,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_glib_la_LIBADD = \
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler					\
+ 	$(POPPLER_GLIB_LIBS)				\
+ 	$(GDK_LIBS)					\
+ 	$(FREETYPE_LIBS)				\
+@@ -348,7 +346,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-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-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in
new file mode 100644
index 000000000..4ad2d0c3d
--- /dev/null
+++ b/graphics/poppler/files/patch-qt_Makefile.in
@@ -0,0 +1,40 @@
+--- qt/Makefile.in.orig	Wed Jun 20 07:19:52 2007
++++ qt/Makefile.in	Wed Jun 20 07:30:01 2007
+@@ -63,8 +63,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
+@@ -72,8 +71,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 \
+-	libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++test_poppler_qt_DEPENDENCIES = 	libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -286,7 +284,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_qt_la_LIBADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler -lqt-mt			\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+ 	$(FONTCONFIG_LIBS)
+@@ -296,7 +294,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..ffc289c45
--- /dev/null
+++ b/graphics/poppler/files/patch-utils_Makefile.in
@@ -0,0 +1,69 @@
+--- utils/Makefile.in.orig	Wed Jun 20 07:19:52 2007
++++ utils/Makefile.in	Wed Jun 20 07:29:29 2007
+@@ -62,49 +62,41 @@
+ pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
+ pdffonts_LDADD = $(LDADD)
+ am__DEPENDENCIES_1 =
+-pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1)
++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 \
+-	$(am__DEPENDENCIES_1)
++pdfimages_DEPENDENCIES =	$(am__DEPENDENCIES_1)
+ am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) $(am__objects_1)
+ pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
+ pdfinfo_LDADD = $(LDADD)
+-pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1)
++pdfinfo_DEPENDENCIES =	$(am__DEPENDENCIES_1)
+ am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.c parseargs.h
+ @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \
+ @BUILD_ABIWORD_OUTPUT_TRUE@	$(am__objects_1)
+ pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS)
+ pdftoabw_LDADD = $(LDADD)
+-pdftoabw_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1)
++pdftoabw_DEPENDENCIES =	$(am__DEPENDENCIES_1)
+ am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \
+ 	HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1)
+ pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
+ pdftohtml_LDADD = $(LDADD)
+-pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1)
++pdftohtml_DEPENDENCIES = 	$(am__DEPENDENCIES_1)
+ am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.c 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 \
+-	$(am__DEPENDENCIES_1)
++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 \
+-	$(am__DEPENDENCIES_1)
++pdftops_DEPENDENCIES = 	$(am__DEPENDENCIES_1)
+ am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) $(am__objects_1)
+ pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
+ pdftotext_LDADD = $(LDADD)
+-pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+-	$(am__DEPENDENCIES_1)
++pdftotext_DEPENDENCIES = 	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -318,7 +310,7 @@
+ 	$(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..fc990dc74
--- /dev/null
+++ b/graphics/poppler/pkg-plist
@@ -0,0 +1,103 @@
+include/poppler/Annot.h
+include/poppler/Array.h
+include/poppler/BaseFile.h
+include/poppler/BuiltinFont.h
+include/poppler/BuiltinFontTables.h
+include/poppler/CMap.h
+include/poppler/Catalog.h
+include/poppler/CharCodeToUnicode.h
+include/poppler/CharTypes.h
+include/poppler/CompactFontTables.h
+include/poppler/Decrypt.h
+include/poppler/Dict.h
+include/poppler/Error.h
+include/poppler/ErrorCodes.h
+include/poppler/FontEncodingTables.h
+include/poppler/FontInfo.h
+include/poppler/Form.h
+include/poppler/Function.cc
+include/poppler/Function.h
+include/poppler/Gfx.h
+include/poppler/GfxFont.h
+include/poppler/GfxState.h
+include/poppler/GlobalParams.h
+include/poppler/JArithmeticDecoder.h
+include/poppler/JBIG2Stream.h
+include/poppler/JPXStream.h
+include/poppler/Lexer.h
+include/poppler/Link.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/PDFDocEncoding.h
+include/poppler/PSOutputDev.h
+include/poppler/PSTokenizer.h
+include/poppler/Page.h
+include/poppler/PageTransition.h
+include/poppler/Parser.h
+include/poppler/PreScanOutputDev.h
+include/poppler/ProfileData.h
+include/poppler/SecurityHandler.h
+include/poppler/Sound.h
+include/poppler/SplashOutputDev.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/goo/FixedPoint.h
+include/poppler/goo/GooHash.h
+include/poppler/goo/GooList.h
+include/poppler/goo/GooMutex.h
+include/poppler/goo/GooString.h
+include/poppler/goo/GooTimer.h
+include/poppler/goo/GooVector.h
+include/poppler/goo/gfile.h
+include/poppler/goo/gmem.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.a
+lib/libpoppler.la
+lib/libpoppler.so
+lib/libpoppler.so.3
+libdata/pkgconfig/poppler-cairo.pc
+libdata/pkgconfig/poppler-splash.pc
+libdata/pkgconfig/poppler.pc
+@dirrm include/poppler/splash
+@dirrm include/poppler/goo
+@dirrm include/poppler