throw away the custom build rules in the poppler-qt pkg Makefile

(which got slightly out of sync) and use the original Makefile,
fixes an unresolved autoconf variable in the .pc file reported
by Hasso Tepper
bump PKGREVISION

4 files changed, 35 insertions, 28 deletions

diff --git a/print/poppler-qt/Makefile b/print/poppler-qt/Makefile
index 5015c0d26d3..bfe58f4ca77 100644
--- a/print/poppler-qt/Makefile
+++ b/print/poppler-qt/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2009/09/09 19:57:06 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2009/09/11 10:09:13 drochner Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
+PKGREVISION=		1
+
 PKGNAME=		poppler-qt-${POPPLER_VERS}
 
 COMMENT=		PDF rendering library (QT wrapper)
@@ -18,30 +20,12 @@ CONFIGURE_ARGS+=	--disable-cms
 
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/poppler-qt.pc.in
 
-INCS=-I. -I.. -I../poppler `pkg-config poppler --cflags` -I${QTDIR}/include
-
+BUILD_DIRS=		qt
 INSTALLATION_DIRS+=	lib include/poppler lib/pkgconfig
 
-do-build:
-	(cd ${WRKSRC}/qt; \
-	${LIBTOOL} --tag=CXX --mode=compile ${CXX} ${CXXFLAGS} ${INCS} -c -o poppler-document.lo poppler-document.cc; \
-	${LIBTOOL} --tag=CXX --mode=compile ${CXX} ${CXXFLAGS} ${INCS} -c -o poppler-page.lo poppler-page.cc; \
-	${LIBTOOL} --tag=CXX --mode=link ${CXX} ${LDFLAGS} `pkg-config poppler --libs` -L${QTDIR}/lib ${COMPILER_RPATH_FLAG}${QTDIR}/lib -o libpoppler-qt.la -rpath ${PREFIX}/lib poppler-document.lo poppler-page.lo -lqt-mt )
-	${SED} -e s:@VERSION@:${POPPLER_VERS}: \
-		-e s:@prefix@:${PREFIX}: \
-		-e 's:@exec_prefix@:$${prefix}:' \
-		-e 's:@libdir@:$${exec_prefix}/lib:' \
-		-e 's:@includedir@:$${prefix}/include:' \
-	${WRKSRC}/poppler-qt.pc.in > ${WRKSRC}/poppler-qt.pc
-
-do-install:
-	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/qt/libpoppler-qt.la ${DESTDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/qt/poppler-qt.h ${DESTDIR}${PREFIX}/include/poppler
-	${INSTALL_DATA} ${WRKSRC}/qt/poppler-page-transition.h \
-		${DESTDIR}${PREFIX}/include/poppler
-	${INSTALL_DATA} ${WRKSRC}/qt/poppler-link-qt3.h \
-		${DESTDIR}${PREFIX}/include/poppler
-	${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc \
+		${DESTDIR}${PREFIX}/lib/pkgconfig
 
 BUILDLINK_API_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}
 .include "../../print/poppler/buildlink3.mk"
diff --git a/print/poppler-qt/PLIST b/print/poppler-qt/PLIST
index 9b350cedaca..673b4d733cf 100644
--- a/print/poppler-qt/PLIST
+++ b/print/poppler-qt/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:11:58 joerg Exp $
-include/poppler/poppler-link-qt3.h
-include/poppler/poppler-page-transition.h
-include/poppler/poppler-qt.h
+@comment $NetBSD: PLIST,v 1.6 2009/09/11 10:09:13 drochner Exp $
+include/poppler/qt3/poppler-link-qt3.h
+include/poppler/qt3/poppler-page-transition.h
+include/poppler/qt3/poppler-qt.h
 lib/libpoppler-qt.la
 lib/pkgconfig/poppler-qt.pc
diff --git a/print/poppler/distinfo b/print/poppler/distinfo
index bb7165a6c40..bd31cdcae03 100644
--- a/print/poppler/distinfo
+++ b/print/poppler/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2009/09/09 19:57:05 drochner Exp $
+$NetBSD: distinfo,v 1.47 2009/09/11 10:09:13 drochner Exp $
 
 SHA1 (poppler-0.12.0.tar.gz) = 6165cfc46340644e8750ab8a37f3a3d634144106
 RMD160 (poppler-0.12.0.tar.gz) = c90a6a437fb7b5e5c9c9cdaf72782be16cd8ae07
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615
 SHA1 (patch-ab) = 6bde603d2934099631e057f022ab61b6ff965022
 SHA1 (patch-ag) = 89d4ca8d5325b703c953317f422501873d659ac6
 SHA1 (patch-ai) = 52376e12baaba63629156055d5254c29f6e89824
+SHA1 (patch-ao) = 747870dcdc8a09f191a0518f42a4dc0c011aa85a
diff --git a/print/poppler/patches/patch-ao b/print/poppler/patches/patch-ao
new file mode 100644
index 00000000000..bef996fb06f
--- /dev/null
+++ b/print/poppler/patches/patch-ao
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1 2009/09/11 10:09:13 drochner Exp $
+
+--- qt/Makefile.in.orig	2009-09-11 09:20:03.000000000 +0200
++++ qt/Makefile.in
+@@ -63,7 +63,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libpoppler_qt_la_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
++libpoppler_qt_la_DEPENDENCIES = $(prefix)/lib/libpoppler.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
+@@ -308,7 +308,7 @@ libpoppler_qt_la_SOURCES = \
+ 	poppler-private.h
+ 
+ libpoppler_qt_la_LIBADD = \
+-	$(top_builddir)/poppler/libpoppler.la	\
++	$(prefix)/lib/libpoppler.la	\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+ 	$(FONTCONFIG_LIBS)