diff options
| author | markd <markd> | 2007-12-06 11:09:35 +0000 |
|---|---|---|
| committer | markd <markd> | 2007-12-06 11:09:35 +0000 |
| commit | c3e1eabe273bcb62719f5154c77445cd8a34c5cf (patch) | |
| tree | 80d7d1bc0557d64f6dee34907feb365a7b7a3b2a /x11 | |
| parent | f9e910e7d2ae6dd54738d5c5da01b515f0e5452b (diff) | |
| download | pkgsrc-c3e1eabe273bcb62719f5154c77445cd8a34c5cf.tar.gz | |
Fix build paths in installed pkgconfig *.pc files (PR pkg/37479) and
add missing dirrm line from PLIST (PR pkg/37412). Bump PKGREVISION
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt4-libs/Makefile | 8 | ||||
| -rw-r--r-- | x11/qt4-libs/PLIST | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 217188f9348..d526e2eba25 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -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 @@ do-install: .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 --git a/x11/qt4-libs/PLIST b/x11/qt4-libs/PLIST index 81ab49eab15..7bf85ece075 100644 --- a/x11/qt4-libs/PLIST +++ b/x11/qt4-libs/PLIST @@ -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 @@ qt4/plugins/imageformats/libqmng.la @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 |