- Update to 0.5.0 (dev version)

- poppler-qt is now marked BROKEN because configure is busted on qt stuff
- poppler now CONFLICTS with *-xpdf-[0-9]* and xpdf-[0-9]* because poppler
  installs xpdf stuff


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

4 files changed, 33 insertions, 16 deletions

diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index 0e578cd21..d661f77d2 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -3,12 +3,11 @@
 # Whom:                 marcus@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/poppler/Makefile,v 1.16 2006/01/12 21:04:48 ahze Exp $
+#   $MCom: ports/graphics/poppler/Makefile,v 1.17 2006/01/13 00:26:29 ahze Exp $
 #
 
 PORTNAME=	poppler
-PORTVERSION=	0.4.4
-PORTREVISION?=	1
+PORTVERSION=	0.5.0
 CATEGORIES=	graphics print
 MASTER_SITES=	http://poppler.freedesktop.org/
 
@@ -17,12 +16,15 @@ COMMENT?=	A PDF rendering library
 
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
 
+CONFLICTS=	*-xpdf-[0-9]* xpdf-[0-9]*
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-zlib
+CONFIGURE_ARGS=	--enable-zlib \
+		--enable-xpdf-headers \
+		--with-html-dir=${DOCSDIR}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 
@@ -46,13 +48,16 @@ INSTALL_WRKSRC=	${WRKSRC}/qt
 .else
 CONFIGURE_ARGS+=--disable-poppler-glib --disable-poppler-qt \
 		--disable-poppler-qt4
+MAN1=	pdffonts.1 pdfimages.1 pdfinfo.1 \
+	pdftohtml.1  pdftops.1 pdftotext.1
 .endif
 
 post-patch:
 .if defined(SLAVEPORT) && ${SLAVEPORT}=="qt"
-	@${REINPLACE_CMD} -e 's|/usr/local/qt/include|${X11BASE}/include|; \
-		s|/usr/local/qt/lib|${X11BASE}/lib|' \
-		${WRKSRC}/configure
+#	@${REINPLACE_CMD} -e 's|/usr/local/qt/include|${X11BASE}/include|; \
+#		s|/usr/local/qt/lib|${X11BASE}/lib|' \
+#		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|$$QTDIR|${X11BASE}|' ${WRKSRC}/configure
 .endif
 
 post-install:
diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo
index daff28212..2085a5486 100644
--- a/graphics/poppler/distinfo
+++ b/graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-MD5 (poppler-0.4.4.tar.gz) = e081bca749a3373b2d95e696b7dddb9b
-SHA256 (poppler-0.4.4.tar.gz) = 31ba8968c8811d31da61a6dbc5797c31624ca7f9936c6ca1691b41a0cf71ce60
-SIZE (poppler-0.4.4.tar.gz) = 783571
+MD5 (poppler-0.5.0.tar.gz) = c84c1be19f43e4a84872ff08234c1960
+SHA256 (poppler-0.5.0.tar.gz) = 554fad3767c23c96ad886fe0220073133016d64f416273c26aea43ea80d4563b
+SIZE (poppler-0.5.0.tar.gz) = 935312
diff --git a/graphics/poppler/files/patch-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in
index fa1e20c8b..29d9a5fa2 100644
--- a/graphics/poppler/files/patch-qt_Makefile.in
+++ b/graphics/poppler/files/patch-qt_Makefile.in
@@ -1,13 +1,14 @@
---- qt/Makefile.in.orig	Thu Jan 12 15:17:02 2006
-+++ qt/Makefile.in	Thu Jan 12 15:19:48 2006
-@@ -61,15 +61,13 @@
+--- qt/Makefile.in.orig	Thu Jan 12 21:37:56 2006
++++ qt/Makefile.in	Thu Jan 12 21:38:47 2006
+@@ -63,16 +63,14 @@
  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_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-page.lo
+ am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
+ 	poppler-page.lo poppler-page-transition.lo
  libpoppler_qt_la_OBJECTS = $(am_libpoppler_qt_la_OBJECTS)
  PROGRAMS = $(noinst_PROGRAMS)
  am_test_poppler_qt_OBJECTS = test-poppler-qt.$(OBJEXT)
@@ -18,7 +19,7 @@
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -253,7 +251,7 @@
+@@ -273,7 +271,7 @@
  	poppler-private.h
  
  libpoppler_qt_la_LIBADD = \
@@ -27,7 +28,7 @@
  	$(POPPLER_QT_LIBS)			\
  	$(FREETYPE_LIBS)
  
-@@ -261,7 +259,7 @@
+@@ -281,7 +279,7 @@
         test-poppler-qt.cpp
  
  test_poppler_qt_LDADD = \
diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist
index af48e8abf..31f22a660 100644
--- a/graphics/poppler/pkg-plist
+++ b/graphics/poppler/pkg-plist
@@ -1,3 +1,9 @@
+bin/pdffonts
+bin/pdfimages
+bin/pdfinfo
+bin/pdftohtml
+bin/pdftops
+bin/pdftotext
 include/poppler/Annot.h
 include/poppler/Array.h
 include/poppler/BaseFile.h
@@ -38,6 +44,8 @@ include/poppler/PSOutputDev.h
 include/poppler/PSTokenizer.h
 include/poppler/Page.h
 include/poppler/Parser.h
+include/poppler/ProfileData.h
+include/poppler/SecurityHandler.h
 include/poppler/SplashOutputDev.h
 include/poppler/Stream-CCITT.h
 include/poppler/Stream.h
@@ -47,11 +55,14 @@ 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