diff options
| author | wiz <wiz@pkgsrc.org> | 2014-08-19 10:31:14 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-08-19 10:31:14 +0000 |
| commit | db34f2860e2d840e0df5cc97844ff012847dc8e0 (patch) | |
| tree | 4d9ba6f1c670c159d55264e4afedb0b52407442c /x11 | |
| parent | 5f829afbd6505be87a59357e342bcab45603e90d (diff) | |
| download | pkgsrc-db34f2860e2d840e0df5cc97844ff012847dc8e0.tar.gz | |
When installing mkspecs using 'cp -R' specify what should happen
to symlinks by adding '-L'. (The default is undefined per POSIX.)
This way, SunOS and other opsys have the same PLIST and we don't have
to care that buildlink3 doesn't symlink symlinks.
Addresses
https://mail-index.netbsd.org/tech-pkg/2012/01/21/msg008411.html
Solution suggested by Niclas Rosenvik in private mail.
Bump PKGREVISION.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt4-tools/Makefile | 13 | ||||
| -rw-r--r-- | x11/qt4-tools/PLIST | 7 |
2 files changed, 6 insertions, 14 deletions
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile index e2405dd922d..cc28210ca7b 100644 --- a/x11/qt4-tools/Makefile +++ b/x11/qt4-tools/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.63 2014/02/12 23:18:55 tron Exp $ +# $NetBSD: Makefile,v 1.64 2014/08/19 10:31:14 wiz Exp $ .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-tools-${QTVERSION} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= QT GUI (WYSIWYG) builder and other tools DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base @@ -28,13 +28,6 @@ INSTALLATION_DIRS+= ${QTPREFIX}/mkspecs INSTALLATION_DIRS+= ${QTPREFIX}/tools/qdoc3 INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} -PLIST_VARS+= notSunOS SunOS -.if ${OPSYS} == "SunOS" -PLIST.SunOS= yes -.else -PLIST.notSunOS= yes -.endif - post-configure: ln -sf ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc ln -sf ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic @@ -79,7 +72,7 @@ do-install: .endfor ${INSTALL_DATA} ${WRKSRC}/tools/linguist/phrasebooks/*.qph \ ${DESTDIR}${QTPREFIX}/phrasebooks/ - cp -R ${WRKSRC}/mkspecs ${DESTDIR}${QTPREFIX} + cp -LR ${WRKSRC}/mkspecs ${DESTDIR}${QTPREFIX} .include "../../converters/libiconv/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST index e401db7c210..42e7416bd40 100644 --- a/x11/qt4-tools/PLIST +++ b/x11/qt4-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.34 2014/07/22 17:01:52 wiz Exp $ +@comment $NetBSD: PLIST,v 1.35 2014/08/19 10:31:14 wiz Exp $ lib/pkgconfig/QtCLucene.pc lib/pkgconfig/QtDesigner.pc lib/pkgconfig/QtDesignerComponents.pc @@ -227,9 +227,8 @@ qt4/mkspecs/cygwin-g++/qmake.conf qt4/mkspecs/cygwin-g++/qplatformdefs.h qt4/mkspecs/darwin-g++/qmake.conf qt4/mkspecs/darwin-g++/qplatformdefs.h -${PLIST.notSunOS}qt4/mkspecs/default -${PLIST.SunOS}qt4/mkspecs/default/qmake.conf -${PLIST.SunOS}qt4/mkspecs/default/qplatformdefs.h +qt4/mkspecs/default/qmake.conf +qt4/mkspecs/default/qplatformdefs.h qt4/mkspecs/features/build_pass.prf qt4/mkspecs/features/dbusadaptors.prf qt4/mkspecs/features/dbusinterfaces.prf |