diff options
author | joerg <joerg> | 2007-09-02 14:48:57 +0000 |
---|---|---|
committer | joerg <joerg> | 2007-09-02 14:48:57 +0000 |
commit | 6ef7fcdad1cc5bb3fb6bbe9e1e11f36619df36a8 (patch) | |
tree | bcc28c841318a8eb3c231f88e49183553ce9ed65 /x11 | |
parent | 5d6ed0f8755dad6413e7c394abd6ea1c287f2139 (diff) | |
download | pkgsrc-6ef7fcdad1cc5bb3fb6bbe9e1e11f36619df36a8.tar.gz |
Install QtScript library as needed by qt4-tools. Remove some
never added directories from the PLIST. Bump revision.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/qt4-libs/Makefile | 7 | ||||
-rw-r--r-- | x11/qt4-libs/PLIST | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 9b0b1293de4..171badaf359 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2007/07/28 07:37:51 adam Exp $ +# $NetBSD: Makefile,v 1.11 2007/09/02 14:48:57 joerg Exp $ .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-libs-${QTVERSION} COMMENT= C++ X GUI toolkit +PKGREVISION= 1 BUILD_TARGET= sub-src INSTALL_TARGET= install_flat_headers install_targ_headers @@ -22,13 +23,13 @@ do-install: .endfor ${INSTALL_SCRIPT} ${WRKSRC}/bin/uic3 ${QTPREFIX}/bin/ ${INSTALL_DATA_DIR} ${QTPREFIX}/include -.for incl in corelib gui network opengl qt3support sql svg xml +.for incl in corelib gui network opengl qt3support sql svg xml script cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} \ ${MAKE_PROGRAM} ${INSTALL_TARGET} .endfor cd ${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST ${INSTALL_LIB_DIR} ${QTPREFIX}/lib -.for lib in Qt3Support QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml +.for lib in Qt3Support QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \ ${QTPREFIX}/lib/ ${INSTALL_DATA} ${WRKSRC}/lib/pkgconfig/${lib}.pc ${PREFIX}/lib/pkgconfig/ diff --git a/x11/qt4-libs/PLIST b/x11/qt4-libs/PLIST index 33f7d2c1ec5..81ab49eab15 100644 --- a/x11/qt4-libs/PLIST +++ b/x11/qt4-libs/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.3 2006/05/31 19:18:07 adam Exp $ +@comment $NetBSD: PLIST,v 1.4 2007/09/02 14:48:57 joerg Exp $ lib/pkgconfig/Qt3Support.pc lib/pkgconfig/QtCore.pc lib/pkgconfig/QtGui.pc lib/pkgconfig/QtNetwork.pc lib/pkgconfig/QtOpenGL.pc +lib/pkgconfig/QtScript.pc lib/pkgconfig/QtSql.pc lib/pkgconfig/QtSvg.pc lib/pkgconfig/QtXml.pc @@ -16,6 +17,7 @@ qt4/lib/libQtCore.la qt4/lib/libQtGui.la qt4/lib/libQtNetwork.la qt4/lib/libQtOpenGL.la +qt4/lib/libQtScript.la qt4/lib/libQtSql.la qt4/lib/libQtSvg.la qt4/lib/libQtXml.la @@ -34,10 +36,8 @@ qt4/plugins/imageformats/libqmng.la @dirrm qt4/include/QtOpenGL @dirrm qt4/include/QtNetwork @dirrm qt4/include/QtGui -@dirrm qt4/include/QtCore/arch @dirrm qt4/include/QtCore @dirrm qt4/include/Qt3Support -@dirrm qt4/include/Qt/arch @dirrm qt4/include/Qt @dirrm qt4/include @dirrm qt4/bin |