[pkgsrc/trunk]: pkgsrc/x11/qt4-tools qtscript was added to the qt4-libs pkg f...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4e06a9c446f2
branches:  trunk
changeset: 532896:4e06a9c446f2
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon Sep 03 20:27:20 2007 +0000

description:
qtscript was added to the qt4-libs pkg for some reason. Remove it here
to avoid a CONFLICT. Ride on recent update.

diffstat:

 x11/qt4-tools/Makefile |  5 ++---
 x11/qt4-tools/PLIST    |  4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r 6c193ef9a30e -r 4e06a9c446f2 x11/qt4-tools/Makefile
--- a/x11/qt4-tools/Makefile    Mon Sep 03 19:51:40 2007 +0000
+++ b/x11/qt4-tools/Makefile    Mon Sep 03 20:27:20 2007 +0000
@@ -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 @@
                ${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 -r 6c193ef9a30e -r 4e06a9c446f2 x11/qt4-tools/PLIST
--- a/x11/qt4-tools/PLIST       Mon Sep 03 19:51:40 2007 +0000
+++ b/x11/qt4-tools/PLIST       Mon Sep 03 20:27:20 2007 +0000
@@ -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/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