Update to 0.5.1.

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

9 files changed, 38 insertions, 110 deletions

diff --git a/graphics/poppler-gtk/Makefile b/graphics/poppler-gtk/Makefile
index 2baa4b942..423d47ba2 100644
--- a/graphics/poppler-gtk/Makefile
+++ b/graphics/poppler-gtk/Makefile
@@ -3,9 +3,9 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/graphics/poppler-gtk/Makefile,v 1.1 2006/01/12 21:04:49 ahze Exp $
+#    $MCom: ports/graphics/poppler-gtk/Makefile,v 1.2 2006/02/24 18:50:35 marcus Exp $
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-gtk
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -15,4 +15,8 @@ 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
index 9f0f2f0a7..980f63013 100644
--- a/graphics/poppler-gtk/pkg-plist
+++ b/graphics/poppler-gtk/pkg-plist
@@ -1,4 +1,5 @@
 include/poppler/glib/poppler-action.h
+include/poppler/glib/poppler-attachment.h
 include/poppler/glib/poppler-document.h
 include/poppler/glib/poppler-enums.h
 include/poppler/glib/poppler-page.h
@@ -6,7 +7,7 @@ include/poppler/glib/poppler.h
 lib/libpoppler-glib.a
 lib/libpoppler-glib.la
 lib/libpoppler-glib.so
-lib/libpoppler-glib.so.0
+lib/libpoppler-glib.so.1
 libdata/pkgconfig/poppler-glib.pc
 %%DOCSDIR%%/poppler/ch01.html
 %%DOCSDIR%%/poppler/home.png
diff --git a/graphics/poppler-qt/Makefile b/graphics/poppler-qt/Makefile
index 54b377db9..d5f87e063 100644
--- a/graphics/poppler-qt/Makefile
+++ b/graphics/poppler-qt/Makefile
@@ -3,9 +3,9 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/graphics/poppler-qt/Makefile,v 1.3 2006/02/01 21:48:19 ahze Exp $
+#    $MCom: ports/graphics/poppler-qt/Makefile,v 1.4 2006/02/24 18:50:35 marcus Exp $
 
-PORTREVISION=	2
+PORTREVISION=	0
 PKGNAMESUFFIX=	-qt
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/poppler-qt/pkg-plist b/graphics/poppler-qt/pkg-plist
index dd8e31de7..f3a1f05a5 100644
--- a/graphics/poppler-qt/pkg-plist
+++ b/graphics/poppler-qt/pkg-plist
@@ -2,5 +2,5 @@ include/poppler/poppler-qt.h
 lib/libpoppler-qt.a
 lib/libpoppler-qt.la
 lib/libpoppler-qt.so
-lib/libpoppler-qt.so.0
+lib/libpoppler-qt.so.1
 libdata/pkgconfig/poppler-qt.pc
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index f9811685a..c9939fcd0 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 marcus@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/poppler/Makefile,v 1.20 2006/02/24 18:50:35 marcus Exp $
+#   $MCom: ports/graphics/poppler/Makefile,v 1.21 2006/02/25 09:58:48 marcus Exp $
 #
 
 PORTNAME=	poppler
-PORTVERSION=	0.5.0
-PORTREVISION?=	2
+PORTVERSION=	0.5.1
+PORTREVISION?=	0
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
 
@@ -32,7 +32,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
 .include <bsd.port.pre.mk>
 
 .if defined(SLAVEPORT)
-LIB_DEPENDS+=	poppler.0:${PORTSDIR}/graphics/poppler
+LIB_DEPENDS+=	poppler.1:${PORTSDIR}/graphics/poppler
 .if ${SLAVEPORT}=="gtk"
 CONFIGURE_ARGS+=--enable-poppler-glib
 USE_GNOME+=	gtk20
@@ -50,7 +50,7 @@ INSTALL_WRKSRC=	${WRKSRC}/qt
 CONFIGURE_ARGS+=--disable-poppler-glib --disable-poppler-qt \
 		--disable-poppler-qt4
 MAN1=	pdffonts.1 pdfimages.1 pdfinfo.1 \
-	pdftohtml.1  pdftops.1 pdftotext.1
+	pdftohtml.1  pdftops.1 pdftotext.1 pdftoppm.1
 .endif
 
 post-patch:
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index 2085a5486..ba7316258 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.5.0.tar.gz) = c84c1be19f43e4a84872ff08234c1960
-SHA256 (poppler-0.5.0.tar.gz) = 554fad3767c23c96ad886fe0220073133016d64f416273c26aea43ea80d4563b
-SIZE (poppler-0.5.0.tar.gz) = 935312
+MD5 (poppler-0.5.1.tar.gz) = a136cd731892f4570933034ba97c8704
+SHA256 (poppler-0.5.1.tar.gz) = 2ee3f06d64dd703a2411428169fe21c17f6358950bb797d52ca8eebd1dcf1abe
+SIZE (poppler-0.5.1.tar.gz) = 954930
diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in
index 1c4dddb07..111a8521c 100644
--- a/graphics/poppler/files/patch-glib_Makefile.in
+++ b/graphics/poppler/files/patch-glib_Makefile.in
@@ -1,33 +1,32 @@
---- glib/Makefile.in.orig	Thu Jan 12 15:17:02 2006
-+++ glib/Makefile.in	Thu Jan 12 15:18:40 2006
-@@ -63,7 +63,7 @@
+--- glib/Makefile.in.orig	Wed Mar  8 20:40:26 2006
++++ glib/Makefile.in	Wed Mar  8 20:42:17 2006
+@@ -65,7 +65,6 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
  libpoppler_glib_la_DEPENDENCIES =  \
--	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
- am__objects_1 = poppler-enums.lo
- am_libpoppler_glib_la_OBJECTS = $(am__objects_1) poppler-action.lo \
-@@ -73,7 +73,7 @@
+-	$(top_builddir)/poppler/libpoppler.la \
+ 	$(top_builddir)/poppler/libpoppler-cairo.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_2)
+@@ -78,7 +77,7 @@ PROGRAMS = $(noinst_PROGRAMS)
  am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
  test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
  test_poppler_glib_DEPENDENCIES =  \
 -	$(top_builddir)/poppler/libpoppler.la libpoppler-glib.la \
-+	libpoppler-glib.la \
++	$(top_builddir)/poppler/libpoppler-cairo.la libpoppler-glib.la \
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_2)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -277,7 +277,7 @@
+@@ -306,7 +305,7 @@ libpoppler_glib_la_SOURCES = \
  	poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
--	$(top_builddir)/poppler/libpoppler.la	\
-+	-lpoppler				\
- 	$(POPPLER_GLIB_LIBS)			\
- 	$(FREETYPE_LIBS)			\
- 	$(cairo_libs)
-@@ -286,7 +286,7 @@
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler					\
+ 	$(top_builddir)/poppler/libpoppler-cairo.la	\
+ 	$(POPPLER_GLIB_LIBS)				\
+ 	$(FREETYPE_LIBS)				\
+@@ -317,7 +316,7 @@ test_poppler_glib_SOURCES = \
         test-poppler-glib.c
  
  test_poppler_glib_LDADD = \
diff --git a/graphics/poppler/files/patch-poppler_GlobalParams.cc b/graphics/poppler/files/patch-poppler_GlobalParams.cc
deleted file mode 100644
index efade0562..000000000
--- a/graphics/poppler/files/patch-poppler_GlobalParams.cc
+++ /dev/null
@@ -1,76 +0,0 @@
---- poppler/GlobalParams.cc.orig	Sat Feb 25 04:48:29 2006
-+++ poppler/GlobalParams.cc	Sat Feb 25 04:55:02 2006
-@@ -1266,7 +1266,7 @@ FcPattern *buildFcPattern(GfxFont *font)
- 
- DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
-   DisplayFontParam *dfp;
--  FcPattern *p=0,*m=0;
-+  FcPattern *p=0;
- 
-   GooString *fontName = font->getName();
-   if (!fontName) return NULL;
-@@ -1278,38 +1278,43 @@ DisplayFontParam *GlobalParams::getDispl
-     FcChar8* s;
-     char * ext;
-     FcResult res;
-+    FcFontSet *set;
-+    int i;
-     p = buildFcPattern(font);
- 
-     if (!p)
-       goto fin;
-     FcConfigSubstitute(FCcfg, p, FcMatchPattern);
-     FcDefaultSubstitute(p);
--    m = FcFontMatch(FCcfg,p,&res);
--    if (!m)
--      goto fin; 
--    res = FcPatternGetString(m, FC_FILE, 0, &s);
--    if (res != FcResultMatch || !s)
--      goto fin; 
--    ext = strrchr((char*)s,'.');
--    if (!ext)
-+    set = FcFontSort(FCcfg, p, FcFalse, NULL, &res);
-+    if (!set)
-       goto fin;
--    if (!strncasecmp(ext,".ttf",4))
-+    for (i = 0; i < set->nfont; ++i)
-     {
--      dfp = new DisplayFontParam(fontName->copy(), displayFontTT);  
--      dfp->tt.fileName = new GooString((char*)s);
-+	res = FcPatternGetString(set->fonts[i], FC_FILE, 0, &s);
-+	if (res != FcResultMatch || !s)
-+	    continue;
-+	ext = strrchr((char*)s,'.');
-+	if (!ext)
-+	    continue;
-+	if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext, ".ttc", 4))
-+	{
-+	    dfp = new DisplayFontParam(fontName->copy(), displayFontTT);
-+	    dfp->tt.fileName = new GooString((char*)s);
-+	}
-+	else if (!strncasecmp(ext,".pfa",4) || !strncasecmp(ext,".pfb",4))
-+	{
-+	    dfp = new DisplayFontParam(fontName->copy(), displayFontT1);
-+	    dfp->t1.fileName = new GooString((char*)s);
-+	}
-+	else
-+	    continue;
-+	displayFonts->add(dfp->name,dfp);
-+	break;
-     }
--    else if (!strncasecmp(ext,".pfa",4) || !strncasecmp(ext,".pfb",4)) 
--    {
--      dfp = new DisplayFontParam(fontName->copy(), displayFontT1);  
--      dfp->t1.fileName = new GooString((char*)s);
--    }
--    else
--      goto fin;
--    displayFonts->add(dfp->name,dfp);
-+    FcFontSetDestroy(set);
-   }
- fin:
--  if (m)
--    FcPatternDestroy(m);
-   if (p)
-     FcPatternDestroy(p);
- 
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index c9ec33e00..dde9794b6 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -2,6 +2,7 @@ bin/pdffonts
 bin/pdfimages
 bin/pdfinfo
 bin/pdftohtml
+bin/pdftoppm
 bin/pdftops
 bin/pdftotext
 include/poppler/Annot.h
@@ -10,8 +11,6 @@ include/poppler/BaseFile.h
 include/poppler/BuiltinFont.h
 include/poppler/BuiltinFontTables.h
 include/poppler/CMap.h
-include/poppler/CairoFontEngine.h
-include/poppler/CairoOutputDev.h
 include/poppler/Catalog.h
 include/poppler/CharCodeToUnicode.h
 include/poppler/CharTypes.h
@@ -51,6 +50,7 @@ include/poppler/Stream-CCITT.h
 include/poppler/Stream.h
 include/poppler/TextOutputDev.h
 include/poppler/UTF8.h
+include/poppler/UGooString.h
 include/poppler/UnicodeMap.h
 include/poppler/UnicodeMapTables.h
 include/poppler/UnicodeTypeTable.h
@@ -93,7 +93,7 @@ include/poppler/splash/SplashXPathScanner.h
 lib/libpoppler.a
 lib/libpoppler.la
 lib/libpoppler.so
-lib/libpoppler.so.0
+lib/libpoppler.so.1
 libdata/pkgconfig/poppler-cairo.pc
 libdata/pkgconfig/poppler-splash.pc
 libdata/pkgconfig/poppler.pc