Fix build paths in installed pkgconfig *.pc files (PR pkg/37479).

Add some missing dirrm's from PLIST.
Also install QtUiTools library and header files (kde4 at least uses these)
Bump PKGREVISION

2 files changed, 24 insertions, 4 deletions

diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index 71083608152..dcadabd94ab 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2007/09/25 10:03:54 hira Exp $
+# $NetBSD: Makefile,v 1.13 2007/12/06 11:17:11 markd Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-tools-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	QT GUI (WYSIWYG) builder and other tools
 
 DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base
@@ -31,13 +32,21 @@ do-install:
 		${MAKE_PROGRAM} install_assistant_headers
 	cd ${WRKSRC}/tools/designer/src/lib && env ${MAKE_ENV} \
 		${MAKE_PROGRAM} install_designer_headers
+	cd ${WRKSRC}/tools/designer/src/uitools && env ${MAKE_ENV} \
+		${MAKE_PROGRAM} install_quitools_headers
 	cd ${WRKSRC}/tools/qtestlib/src && env ${MAKE_ENV} \
 		${MAKE_PROGRAM} install_qtestlib_headers
 .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/QtTest.pc ${PREFIX}/lib/pkgconfig/
+	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/libQtUiTools.a \
+		${QTPREFIX}/lib/
+.for lib in QtUiTools QtTest
+	${SED} -e "s:${WRKSRC}:${QTPREFIX}:g" \
+		${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKOBJ}/${lib}.pc
+	${INSTALL_DATA} ${WRKOBJ}/${lib}.pc ${PREFIX}/lib/pkgconfig/
+.endfor
 	${INSTALL_LIB_DIR} ${QTPREFIX}/plugins/designer
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
 		${WRKSRC}/plugins/designer/libqt3supportwidgets.la \
diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST
index ef89ad52e3d..117c2744237 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.9 2007/10/13 12:02:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/12/06 11:17:11 markd Exp $
 lib/pkgconfig/QtTest.pc
+lib/pkgconfig/QtUiTools.pc
 qt4/bin/assistant
 qt4/bin/designer
 qt4/bin/linguist
@@ -120,10 +121,14 @@ qt4/include/QtTest/qtestkeyboard.h
 qt4/include/QtTest/qtestmouse.h
 qt4/include/QtTest/qtestspontaneevent.h
 qt4/include/QtTest/qtestsystem.h
+qt4/include/QtUiTools/QUiLoader
+qt4/include/QtUiTools/QtUiTools
+qt4/include/QtUiTools/quiloader.h
 qt4/lib/libQtAssistantClient.la
 qt4/lib/libQtDesigner.la
 qt4/lib/libQtDesignerComponents.la
 qt4/lib/libQtTest.la
+qt4/lib/libQtUiTools.a
 qt4/mkspecs/aix-g++-64/qmake.conf
 qt4/mkspecs/aix-g++-64/qplatformdefs.h
 qt4/mkspecs/aix-g++/qmake.conf
@@ -368,7 +373,12 @@ qt4/phrasebooks/swedish.qph
 qt4/plugins/designer/libqt3supportwidgets.la
 @dirrm qt4/plugins/designer
 @dirrm qt4/phrasebooks
+@dirrm qt4/mkspecs/win32-msvc2005
+@dirrm qt4/mkspecs/win32-msvc/features
+@dirrm qt4/mkspecs/win32-msvc.net
+@dirrm qt4/mkspecs/win32-msvc
 @dirrm qt4/mkspecs/win32-g++
+@dirrm qt4/mkspecs/win32-borland
 @dirrm qt4/mkspecs/unixware-g++
 @dirrm qt4/mkspecs/unixware-cc
 @dirrm qt4/mkspecs/tru64-g++
@@ -420,7 +430,7 @@ qt4/plugins/designer/libqt3supportwidgets.la
 @dirrm qt4/mkspecs/interix-g++
 @dirrm qt4/mkspecs/hurd-g++
 @dirrm qt4/mkspecs/hpuxi-acc-64
-@dirrm qt4/mkspecs/hpuxi-acc
+@dirrm qt4/mkspecs/hpuxi-acc-32
 @dirrm qt4/mkspecs/hpux-g++-64
 @dirrm qt4/mkspecs/hpux-g++
 @dirrm qt4/mkspecs/hpux-acc-o64
@@ -441,6 +451,7 @@ qt4/plugins/designer/libqt3supportwidgets.la
 @dirrm qt4/mkspecs/aix-g++-64
 @dirrm qt4/mkspecs/aix-g++
 @dirrm qt4/mkspecs
+@dirrm qt4/include/QtUiTools
 @dirrm qt4/include/QtTest
 @dirrm qt4/include/QtDesigner
 @dirrm qt4/include/QtAssistant