Fri Sep 11 10:09:13 2009 UTC ()
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


(drochner)
diff -r1.46 -r1.47 pkgsrc/print/poppler/distinfo
diff -r1.20 -r1.21 pkgsrc/print/poppler-qt/Makefile
diff -r1.5 -r1.6 pkgsrc/print/poppler-qt/PLIST
diff -r0 -r1.1 pkgsrc/print/poppler/patches/patch-ao
cvs diff -r1.46 -r1.47 pkgsrc/print/poppler/distinfo (expand / switch to unified diff)

--- pkgsrc/print/poppler/distinfo 2009/09/09 19:57:05 1.46
+++ pkgsrc/print/poppler/distinfo 2009/09/11 10:09:13 1.47
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.46 2009/09/09 19:57:05 drochner Exp $ 1$NetBSD: distinfo,v 1.47 2009/09/11 10:09:13 drochner Exp $
2 2
3SHA1 (poppler-0.12.0.tar.gz) = 6165cfc46340644e8750ab8a37f3a3d634144106 3SHA1 (poppler-0.12.0.tar.gz) = 6165cfc46340644e8750ab8a37f3a3d634144106
4RMD160 (poppler-0.12.0.tar.gz) = c90a6a437fb7b5e5c9c9cdaf72782be16cd8ae07 4RMD160 (poppler-0.12.0.tar.gz) = c90a6a437fb7b5e5c9c9cdaf72782be16cd8ae07
5Size (poppler-0.12.0.tar.gz) = 1595424 bytes 5Size (poppler-0.12.0.tar.gz) = 1595424 bytes
6SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615 6SHA1 (patch-aa) = 43c63c16d3a845e394a8eb0c3a321944fcf17615
7SHA1 (patch-ab) = 6bde603d2934099631e057f022ab61b6ff965022 7SHA1 (patch-ab) = 6bde603d2934099631e057f022ab61b6ff965022
8SHA1 (patch-ag) = 89d4ca8d5325b703c953317f422501873d659ac6 8SHA1 (patch-ag) = 89d4ca8d5325b703c953317f422501873d659ac6
9SHA1 (patch-ai) = 52376e12baaba63629156055d5254c29f6e89824 9SHA1 (patch-ai) = 52376e12baaba63629156055d5254c29f6e89824
 10SHA1 (patch-ao) = 747870dcdc8a09f191a0518f42a4dc0c011aa85a
cvs diff -r1.20 -r1.21 pkgsrc/print/poppler-qt/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/print/poppler-qt/Attic/Makefile 2009/09/09 19:57:06 1.20
+++ pkgsrc/print/poppler-qt/Attic/Makefile 2009/09/11 10:09:13 1.21
@@ -1,50 +1,34 @@ @@ -1,50 +1,34 @@
1# $NetBSD: Makefile,v 1.20 2009/09/09 19:57:06 drochner Exp $ 1# $NetBSD: Makefile,v 1.21 2009/09/11 10:09:13 drochner Exp $
2# 2#
3 3
4.include "../../print/poppler/Makefile.common" 4.include "../../print/poppler/Makefile.common"
5 5
 6PKGREVISION= 1
 7
6PKGNAME= poppler-qt-${POPPLER_VERS} 8PKGNAME= poppler-qt-${POPPLER_VERS}
7 9
8COMMENT= PDF rendering library (QT wrapper) 10COMMENT= PDF rendering library (QT wrapper)
9MAINTAINER= reed@reedmedia.net 11MAINTAINER= reed@reedmedia.net
10 12
11GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
12CONFIGURE_ARGS+= --disable-cairo-output 14CONFIGURE_ARGS+= --disable-cairo-output
13CONFIGURE_ARGS+= --disable-splash-output 15CONFIGURE_ARGS+= --disable-splash-output
14CONFIGURE_ARGS+= --enable-poppler-qt 16CONFIGURE_ARGS+= --enable-poppler-qt
15CONFIGURE_ARGS+= --disable-gtk-test 17CONFIGURE_ARGS+= --disable-gtk-test
16CONFIGURE_ARGS+= --disable-utils 18CONFIGURE_ARGS+= --disable-utils
17CONFIGURE_ARGS+= --disable-cms 19CONFIGURE_ARGS+= --disable-cms
18 20
19PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-qt.pc.in 21PKGCONFIG_OVERRIDE+= ${WRKSRC}/poppler-qt.pc.in
20 22
21INCS=-I. -I.. -I../poppler `pkg-config poppler --cflags` -I${QTDIR}/include 23BUILD_DIRS= qt
22 
23INSTALLATION_DIRS+= lib include/poppler lib/pkgconfig 24INSTALLATION_DIRS+= lib include/poppler lib/pkgconfig
24 25
25do-build: 26post-install:
26 (cd ${WRKSRC}/qt; \ 27 ${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc \
27 ${LIBTOOL} --tag=CXX --mode=compile ${CXX} ${CXXFLAGS} ${INCS} -c -o poppler-document.lo poppler-document.cc; \ 28 ${DESTDIR}${PREFIX}/lib/pkgconfig
28 ${LIBTOOL} --tag=CXX --mode=compile ${CXX} ${CXXFLAGS} ${INCS} -c -o poppler-page.lo poppler-page.cc; \ 
29 ${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 ) 
30 ${SED} -e s:@VERSION@:${POPPLER_VERS}: \ 
31 -e s:@prefix@:${PREFIX}: \ 
32 -e 's:@exec_prefix@:$${prefix}:' \ 
33 -e 's:@libdir@:$${exec_prefix}/lib:' \ 
34 -e 's:@includedir@:$${prefix}/include:' \ 
35 ${WRKSRC}/poppler-qt.pc.in > ${WRKSRC}/poppler-qt.pc 
36 
37do-install: 
38 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/qt/libpoppler-qt.la ${DESTDIR}${PREFIX}/lib 
39 ${INSTALL_DATA} ${WRKSRC}/qt/poppler-qt.h ${DESTDIR}${PREFIX}/include/poppler 
40 ${INSTALL_DATA} ${WRKSRC}/qt/poppler-page-transition.h \ 
41 ${DESTDIR}${PREFIX}/include/poppler 
42 ${INSTALL_DATA} ${WRKSRC}/qt/poppler-link-qt3.h \ 
43 ${DESTDIR}${PREFIX}/include/poppler 
44 ${INSTALL_DATA} ${WRKSRC}/poppler-qt.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 
45 29
46BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS} 30BUILDLINK_API_DEPENDS.poppler+= poppler>=${POPPLER_VERS}
47.include "../../print/poppler/buildlink3.mk" 31.include "../../print/poppler/buildlink3.mk"
48.include "../../x11/qt3-libs/buildlink3.mk" 32.include "../../x11/qt3-libs/buildlink3.mk"
49.include "../../mk/pthread.buildlink3.mk" 33.include "../../mk/pthread.buildlink3.mk"
50.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/print/poppler-qt/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/print/poppler-qt/Attic/PLIST 2009/06/14 18:11:58 1.5
+++ pkgsrc/print/poppler-qt/Attic/PLIST 2009/09/11 10:09:13 1.6
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:11:58 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.6 2009/09/11 10:09:13 drochner Exp $
2include/poppler/poppler-link-qt3.h 2include/poppler/qt3/poppler-link-qt3.h
3include/poppler/poppler-page-transition.h 3include/poppler/qt3/poppler-page-transition.h
4include/poppler/poppler-qt.h 4include/poppler/qt3/poppler-qt.h
5lib/libpoppler-qt.la 5lib/libpoppler-qt.la
6lib/pkgconfig/poppler-qt.pc 6lib/pkgconfig/poppler-qt.pc
File Added: pkgsrc/print/poppler/patches/Attic/patch-ao
$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)