summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/qt4-tools/Makefile13
-rw-r--r--x11/qt4-tools/PLIST6
2 files changed, 14 insertions, 5 deletions
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index 5a691477304..90ab0a32fb8 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.23 2008/10/26 14:02:33 adam Exp $
+# $NetBSD: Makefile,v 1.24 2009/07/27 19:57:51 drochner Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
+PKGREVISION= 1
+
PKGNAME= qt4-tools-${QTVERSION}
COMMENT= QT GUI (WYSIWYG) builder and other tools
@@ -12,14 +14,14 @@ DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib
CONFIGURE_ARGS+= -DQT_NO_DBUS
-BUILD_TARGET= sub-tools
+BUILD_TARGET= sub-tools sub-tools-qdoc3
BUILD_QT4= yes
UNLIMIT_RESOURCES= datasize
INSTALLATION_DIRS= ${QTPREFIX}/bin ${QTPREFIX}/lib lib/pkgconfig \
${QTPREFIX}/plugins/designer ${QTPREFIX}/phrasebooks \
- ${QTPREFIX}/mkspecs
+ ${QTPREFIX}/mkspecs ${QTPREFIX}/tools/qdoc3
INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
post-configure:
@@ -31,10 +33,13 @@ do-install:
.for prog in assistant_adp lrelease lupdate pixeltool qmake qt3to4
${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/
.endfor
-.for prog in assistant designer linguist qtconfig
+.for prog in assistant designer linguist qtconfig qhelpconverter \
+ qhelpgenerator qcollectiongenerator
${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \
${DESTDIR}${QTPREFIX}/bin
.endfor
+ ${INSTALL_PROGRAM} ${WRKSRC}/tools/qdoc3/qdoc3 \
+ ${DESTDIR}${QTPREFIX}/tools/qdoc3/
cd ${WRKSRC}/tools/assistant/lib && env ${MAKE_ENV} ${INSTALL_ENV} \
${MAKE_PROGRAM} install_flat_headers install_targ_headers
cd ${WRKSRC}/tools/assistant/compat/lib && env ${MAKE_ENV} ${INSTALL_ENV} \
diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST
index 6f543160bda..529eac3048a 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2009/07/07 16:36:05 drochner Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/07/27 19:57:51 drochner Exp $
lib/pkgconfig/QtAssistantClient.pc
lib/pkgconfig/QtCLucene.pc
lib/pkgconfig/QtDesigner.pc
@@ -12,6 +12,9 @@ qt4/bin/linguist
qt4/bin/lrelease
qt4/bin/lupdate
qt4/bin/pixeltool
+qt4/bin/qcollectiongenerator
+qt4/bin/qhelpconverter
+qt4/bin/qhelpgenerator
qt4/bin/qmake
qt4/bin/qt3to4
qt4/bin/qtconfig
@@ -479,3 +482,4 @@ qt4/phrasebooks/russian.qph
qt4/phrasebooks/spanish.qph
qt4/phrasebooks/swedish.qph
qt4/plugins/designer/libqt3supportwidgets.la
+qt4/tools/qdoc3/qdoc3