diff options
| author | drochner <drochner> | 2009-09-11 10:09:13 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2009-09-11 10:09:13 +0000 |
| commit | 76b9798fd9dc480fb49a3124ab10d1d424970f41 (patch) | |
| tree | a6e8356e46e2c58f22aa83665454c24916f7b16a /print/poppler-qt | |
| parent | 31ae5ee7fde254c24593b739d8b90322bca7fd06 (diff) | |
| download | pkgsrc-76b9798fd9dc480fb49a3124ab10d1d424970f41.tar.gz | |
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
Diffstat (limited to 'print/poppler-qt')
| -rw-r--r-- | print/poppler-qt/Makefile | 30 | ||||
| -rw-r--r-- | print/poppler-qt/PLIST | 8 |
2 files changed, 11 insertions, 27 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 |