diff options
| author | drochner <drochner@pkgsrc.org> | 2007-09-03 20:27:20 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2007-09-03 20:27:20 +0000 |
| commit | 2310b72cee6252f2f6ffc98fb09754aa7db1235a (patch) | |
| tree | d707397fe395a17b6ffa88bc00b8fcd95a58a0c4 /x11 | |
| parent | bc2f6aca1a4ed97bd569db43dc0e05253efc9e00 (diff) | |
| download | pkgsrc-2310b72cee6252f2f6ffc98fb09754aa7db1235a.tar.gz | |
qtscript was added to the qt4-libs pkg for some reason. Remove it here
to avoid a CONFLICT. Ride on recent update.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt4-tools/Makefile | 5 | ||||
| -rw-r--r-- | x11/qt4-tools/PLIST | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile index a26c92ccebf..3ad22fb1db3 100644 --- a/x11/qt4-tools/Makefile +++ b/x11/qt4-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2007/07/28 07:37:52 adam Exp $ +# $NetBSD: Makefile,v 1.10 2007/09/03 20:27:20 drochner Exp $ .include "../../x11/qt4-libs/Makefile.common" @@ -33,11 +33,10 @@ do-install: ${MAKE_PROGRAM} install_designer_headers cd ${WRKSRC}/tools/qtestlib/src && env ${MAKE_ENV} \ ${MAKE_PROGRAM} install_qtestlib_headers -.for lib in QtAssistantClient QtDesigner QtDesignerComponents QtScript QtTest +.for lib in QtAssistantClient QtDesigner QtDesignerComponents QtTest ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \ ${QTPREFIX}/lib/ .endfor - ${INSTALL_DATA} ${WRKSRC}/lib/pkgconfig/QtScript.pc ${PREFIX}/lib/pkgconfig/ ${INSTALL_DATA} ${WRKSRC}/lib/pkgconfig/QtTest.pc ${PREFIX}/lib/pkgconfig/ ${INSTALL_LIB_DIR} ${QTPREFIX}/plugins/designer ${LIBTOOL} --mode=install ${INSTALL_LIB} \ diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST index f4733fccce1..cb8de8d2d24 100644 --- a/x11/qt4-tools/PLIST +++ b/x11/qt4-tools/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2007/09/03 09:35:19 drochner Exp $ -lib/pkgconfig/QtScript.pc +@comment $NetBSD: PLIST,v 1.8 2007/09/03 20:27:20 drochner Exp $ lib/pkgconfig/QtTest.pc qt4/bin/assistant qt4/bin/designer @@ -124,7 +123,6 @@ qt4/include/QtTest/qtestsystem.h qt4/lib/libQtAssistantClient.la qt4/lib/libQtDesigner.la qt4/lib/libQtDesignerComponents.la -qt4/lib/libQtScript.la qt4/lib/libQtTest.la qt4/mkspecs/aix-g++-64/qmake.conf qt4/mkspecs/aix-g++-64/qplatformdefs.h |