diff options
| author | adam <adam> | 2011-01-12 07:18:00 +0000 |
|---|---|---|
| committer | adam <adam> | 2011-01-12 07:18:00 +0000 |
| commit | 0ea85daa9701e563f01a41c9722bcaa00e47b70e (patch) | |
| tree | 163da45be12924c9755f226332cc9053c88a6e5e /x11/qt4-tools | |
| parent | 6e27695831622c6e384d1c0e2af4a5d9c0c97dc4 (diff) | |
| download | pkgsrc-0ea85daa9701e563f01a41c9722bcaa00e47b70e.tar.gz | |
Install correctly on Mac OS X
Diffstat (limited to 'x11/qt4-tools')
| -rw-r--r-- | x11/qt4-tools/Makefile | 28 | ||||
| -rw-r--r-- | x11/qt4-tools/PLIST | 5 |
2 files changed, 23 insertions, 10 deletions
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile index 7f656148983..f7446f771a9 100644 --- a/x11/qt4-tools/Makefile +++ b/x11/qt4-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2010/11/15 22:59:11 abs Exp $ +# $NetBSD: Makefile,v 1.38 2011/01/12 07:18:00 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -31,17 +31,29 @@ INSTALLATION_DIRS+= ${QTPREFIX}/tools/qdoc3 INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} post-configure: - ln -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc - ln -s ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic - ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc + ln -sf ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc + ln -sf ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic + ln -sf ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc + +QTPROG_BIN= lconvert lrelease lupdate pixeltool qdoc3 qmake qt3to4 +QTPROG_BIN+= qttracereplay xmlpatterns xmlpatternsvalidator +QTPROG_LT= qcollectiongenerator qhelpconverter qhelpgenerator +.if ${OPSYS} == "Darwin" +QTPROG_BIN+= QMLViewer macdeployqt +QTPROG_LT+= Assistant Designer Linguist +.else +QTPROG_BIN+= qmlviewer qtconfig +QTPROG_LT+= assistant designer linguist +.endif do-install: -.for prog in lconvert lrelease lupdate pixeltool qdoc3 qmake qmlviewer qt3to4 qtconfig qttracereplay xmlpatterns xmlpatternsvalidator - ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/ +.for prog in ${QTPROG_BIN} + ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \ + ${DESTDIR}${QTPREFIX}/bin/${prog:tl} .endfor -.for prog in assistant designer linguist qcollectiongenerator qhelpconverter qhelpgenerator +.for prog in ${QTPROG_LT} ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \ - ${DESTDIR}${QTPREFIX}/bin + ${DESTDIR}${QTPREFIX}/bin/${prog:tl} .endfor cd ${WRKSRC}/tools/assistant/lib && env ${MAKE_ENV} ${INSTALL_ENV} \ ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST index 76e46010794..bbfa87f550a 100644 --- a/x11/qt4-tools/PLIST +++ b/x11/qt4-tools/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2010/11/15 13:05:47 adam Exp $ +@comment $NetBSD: PLIST,v 1.24 2011/01/12 07:18:00 adam Exp $ lib/pkgconfig/QtCLucene.pc lib/pkgconfig/QtDesigner.pc lib/pkgconfig/QtDesignerComponents.pc @@ -10,6 +10,7 @@ qt4/bin/lconvert qt4/bin/linguist qt4/bin/lrelease qt4/bin/lupdate +${PLIST.mac}qt4/bin/macdeployqt qt4/bin/pixeltool qt4/bin/qcollectiongenerator qt4/bin/qdoc3 @@ -18,7 +19,7 @@ qt4/bin/qhelpgenerator qt4/bin/qmake qt4/bin/qmlviewer qt4/bin/qt3to4 -qt4/bin/qtconfig +${PLIST.unix}qt4/bin/qtconfig qt4/bin/qttracereplay qt4/bin/xmlpatterns qt4/bin/xmlpatternsvalidator |