- update to 0.5.4 (partial update from Brad <brad at comstyle.com>)

- adjust link order so it can build while installed
w/input, testing and okay bernd@

print/poppler/Makefile

@@ -1,17 +1,17 @@
-# $OpenBSD: Makefile,v 1.8 2007/02/11 00:56:57 steven Exp $
+# $OpenBSD: Makefile,v 1.9 2007/03/23 17:49:03 kurt Exp $
 
 COMMENT-main=	"PDF rendering library"
 COMMENT-qt=	"qt interface to PDF rendering library"
 
-V=		0.5.3
+V=		0.5.4
 DISTNAME=	poppler-$V
 CATEGORIES=	print
-PKGNAME-main=	poppler-$Vp1
-FULLPKGNAME-qt=	poppler-qt-$Vp1
+PKGNAME-main=	poppler-$V
+FULLPKGNAME-qt=	poppler-qt-$V
 
-SHARED_LIBS +=	poppler              1.0      # .1.0
-SHARED_LIBS +=	poppler-glib         1.0      # .1.0
-SHARED_LIBS +=	poppler-qt           0.0      # .1.0
+SHARED_LIBS +=	poppler              2.0      # .1.0
+SHARED_LIBS +=	poppler-glib         2.0      # .1.0
+SHARED_LIBS +=	poppler-qt           2.0      # .1.0
 
 HOMEPAGE=	http://poppler.freedesktop.org/
 
@@ -41,7 +41,8 @@ MAKE_FLAGS=	POPPLER_QT_CXXFLAGS='-pthread -I${MODQT_INCDIR}' \
 MODULES+=	x11/qt3
 .endif
 
-WANTLIB=	freetype fontconfig jpeg z 
+WANTLIB=	ICE SM X11 Xext Xrender cairo freetype fontconfig \
+		glitz m png z
 
 LIB_DEPENDS-qt=	${MODQT_LIB_DEPENDS} poppler::print/poppler
 
@@ -49,10 +50,8 @@ MODULES+=	devel/gettext
 
 LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \
 		gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2 
-WANTLIB-main=	${WANTLIB} ICE SM Xrender png X11 m Xext glitz \
-		gmodule-2.0 cairo \
-		pango-1.0 pangocairo-1.0 pangoft2-1.0 \
-		gobject-2.0 glib-2.0
+WANTLIB-main=	${WANTLIB} glib-2.0 gmodule-2.0 gobject-2.0 \
+		pango-1.0 pangocairo-1.0 pangoft2-1.0
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS= --enable-xpdf-headers \
@@ -61,8 +60,7 @@ CONFIGURE_ARGS= --enable-xpdf-headers \
 		--disable-utils \
 		--enable-zlib
 
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
+CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include"
 
 FAKE_FLAGS=	${MAKE_FLAGS} DESTDIR=${WRKINST}
 

print/poppler/distinfo

@@ -1,4 +1,5 @@
-MD5 (poppler-0.5.3.tar.gz) = d06207536555f5711e7bc61711c1b8a0
-RMD160 (poppler-0.5.3.tar.gz) = 3456de23955fc4001842c76d32deba308bd7f968
-SHA1 (poppler-0.5.3.tar.gz) = e197f5cf56f0676b5ca313577dd6456a393c46ec
-SIZE (poppler-0.5.3.tar.gz) = 1049900
+MD5 (poppler-0.5.4.tar.gz) = 053fdfd70533ecce1a06353fa945f061
+RMD160 (poppler-0.5.4.tar.gz) = f28c89b03388757067505df3c60a1d878626b0dd
+SHA1 (poppler-0.5.4.tar.gz) = edf4e4ff17ef86a7f60f097949ad7db53fa2c3b1
+SHA256 (poppler-0.5.4.tar.gz) = ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
+SIZE (poppler-0.5.4.tar.gz) = 1062401

print/poppler/patches/patch-glib_Makefile_in

@@ -0,0 +1,15 @@
+$OpenBSD: patch-glib_Makefile_in,v 1.1 2007/03/23 17:49:03 kurt Exp $
+--- glib/Makefile.in.orig	Thu Sep 21 20:54:20 2006
++++ glib/Makefile.in	Thu Mar 22 16:10:24 2007
+@@ -322,9 +322,10 @@ libpoppler_glib_la_LDFLAGS = -version-in
+ test_poppler_glib_SOURCES = \
+        test-poppler-glib.c
+ 
++# fix linking with installed poppler pkg
+ test_poppler_glib_LDADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
+ 	libpoppler-glib.la			\
++	$(top_builddir)/poppler/libpoppler.la	\
+ 	$(POPPLER_GLIB_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+ 	$(cairo_libs)

print/poppler/patches/patch-goo_Makefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-goo_Makefile_in,v 1.2 2006/10/29 11:03:26 espie Exp $
---- goo/Makefile.in.orig	Wed May 31 06:57:29 2006
-+++ goo/Makefile.in	Sat Oct 28 21:18:33 2006
-@@ -333,25 +333,25 @@ distclean-compile:
+$OpenBSD: patch-goo_Makefile_in,v 1.3 2007/03/23 17:49:03 kurt Exp $
+--- goo/Makefile.in.orig	Thu Sep 21 20:54:22 2006
++++ goo/Makefile.in	Fri Feb 23 18:04:05 2007
+@@ -334,25 +334,25 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmempp.Plo@am__quote@
  
  .c.o:

print/poppler/patches/patch-qt_Makefile_in

@@ -0,0 +1,15 @@
+$OpenBSD: patch-qt_Makefile_in,v 1.1 2007/03/23 17:49:03 kurt Exp $
+--- qt/Makefile.in.orig	Thu Sep 21 20:54:24 2006
++++ qt/Makefile.in	Thu Mar 22 16:09:00 2007
+@@ -289,9 +289,10 @@ libpoppler_qt_la_LDFLAGS = -version-info
+ test_poppler_qt_SOURCES = \
+        test-poppler-qt.cpp
+ 
++# fix linking with installed poppler pkg
+ test_poppler_qt_LDADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
+ 	libpoppler-qt.la			\
++	$(top_builddir)/poppler/libpoppler.la	\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)
+ 

print/poppler/patches/patch-test_Makefile_in

@@ -0,0 +1,15 @@
+$OpenBSD: patch-test_Makefile_in,v 1.1 2007/03/23 17:49:03 kurt Exp $
+--- test/Makefile.in.orig	Thu Sep 21 20:54:27 2006
++++ test/Makefile.in	Thu Mar 22 16:09:15 2007
+@@ -278,9 +278,10 @@ gtk_splash_test_LDADD = \
+ gtk_cairo_test_SOURCES = \
+        gtk-cairo-test.cc
+ 
++# fix linking with installed poppler pkg
+ gtk_cairo_test_LDADD = \
+-	$(top_builddir)/poppler/libpoppler.la		\
+ 	$(top_builddir)/glib/libpoppler-glib.la		\
++	$(top_builddir)/poppler/libpoppler.la		\
+ 	$(CAIRO_LIBS)					\
+ 	$(GTK_TEST_LIBS)
+ 

print/poppler/pkg/PLIST-qt

@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST-qt,v 1.2 2006/12/16 06:41:27 pvalchev Exp $
+@comment $OpenBSD: PLIST-qt,v 1.3 2007/03/23 17:49:03 kurt Exp $
 %%SHARED%%
+include/poppler/poppler-link-qt3.h
 include/poppler/poppler-page-transition.h
 include/poppler/poppler-qt.h
 lib/libpoppler-qt.a