[pkgsrc/trunk]: pkgsrc/x11/qt4-libs Fix build paths in installed pkgconfig *....

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/72ff009626cb
branches:  trunk
changeset: 536211:72ff009626cb
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Dec 06 11:09:35 2007 +0000

description:
Fix build paths in installed pkgconfig *.pc files (PR pkg/37479) and
add missing dirrm line from PLIST (PR pkg/37412). Bump PKGREVISION

diffstat:

 x11/qt4-libs/Makefile |  8 +++++---
 x11/qt4-libs/PLIST    |  3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 58ade8f4f7c0 -r 72ff009626cb x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile     Thu Dec 06 10:30:53 2007 +0000
+++ b/x11/qt4-libs/Makefile     Thu Dec 06 11:09:35 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2007/11/22 18:51:24 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2007/12/06 11:09:35 markd Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
-PKGREVISION=   1
+PKGREVISION=   2
 
 PKGNAME=       qt4-libs-${QTVERSION}
 COMMENT=       C++ X GUI toolkit
@@ -38,7 +38,9 @@
 .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/
+       ${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
        ${INSTALL_LIB_DIR} ${QTPREFIX}/plugins/accessible
diff -r 58ade8f4f7c0 -r 72ff009626cb x11/qt4-libs/PLIST
--- a/x11/qt4-libs/PLIST        Thu Dec 06 10:30:53 2007 +0000
+++ b/x11/qt4-libs/PLIST        Thu Dec 06 11:09:35 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/09/02 14:48:57 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/12/06 11:09:35 markd Exp $
 lib/pkgconfig/Qt3Support.pc
 lib/pkgconfig/QtCore.pc
 lib/pkgconfig/QtGui.pc
@@ -33,6 +33,7 @@
 @dirrm qt4/include/QtXml
 @dirrm qt4/include/QtSvg
 @dirrm qt4/include/QtSql
+@dirrm qt4/include/QtScript
 @dirrm qt4/include/QtOpenGL
 @dirrm qt4/include/QtNetwork
 @dirrm qt4/include/QtGui