Various changes to help with KDE3.

      o Enable thread support using pth-syscall and nathanw_sa. The
	later has problems which are being worked on.

      o Restructure the build of certain plugins so that qt3-libs
	comes with jpeg and mng support.

      o Introduce a BUILDLINK_DEPENDS_METHOD.qt3-tools variable that
	when set to build means we don't get a full dependency on
	qt3-tools.

3 files changed, 20 insertions, 16 deletions

diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index 6b8a4544857..d114ebcb011 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,30 +1,32 @@
-# $NetBSD: Makefile,v 1.3 2002/03/19 17:54:37 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2002/05/29 19:09:56 skrll Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-tools-${QTVERSION}
+PKGREVISION=		1
 COMMENT=		QT GUI (WYSIWYG) builder and other tools
 
 CONFIGURE_ARGS+=	-I${BUILDLINK_QTDIR}/include \
 			-L${BUILDLINK_QTDIR}/lib
 
+MAKE_ENV+=              LIBQT="-lqt-mt"
+
 USE_BUILDLINK_ONLY=		yes
 BUILDLINK_DEPENDS.qt3-libs=	qt3-libs-${QTVERSION}
 
+USE_PTHREAD=	native pth-syscall
+
 UNLIMIT_RESOURCES=	datasize
 
 ALL_TARGET=		sub-tools
 
 do-install:
-	${MKDIR} ${QTPREFIX}/plugins/imageformats
-	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqjpeg.la ${QTPREFIX}/plugins/imageformats
-	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqmng.la ${QTPREFIX}/plugins/imageformats
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic ${QTPREFIX}/bin
 	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqui.la ${QTPREFIX}/lib
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/designer ${QTPREFIX}/bin
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/lib/libeditor.la ${QTPREFIX}/lib
-	${MKDIR} ${QTPREFIX}/plugins/designer
+	${INSTALL_DATA_DIR} ${QTPREFIX}/plugins/designer
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/plugins/designer/libwizards.la ${QTPREFIX}/plugins/designer
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/plugins/designer/libcppeditor.la ${QTPREFIX}/plugins/designer
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/plugins/designer/libdlgplugin.la ${QTPREFIX}/plugins/designer
@@ -34,6 +36,7 @@ do-install:
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/qm2ts ${QTPREFIX}/bin
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/qtconfig ${QTPREFIX}/bin
 
+.include "../../mk/pthread.buildlink.mk"
 .include "../../x11/qt3-libs/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt3-tools/PLIST b/x11/qt3-tools/PLIST
index 7e29401155b..5aff3555dbe 100644
--- a/x11/qt3-tools/PLIST
+++ b/x11/qt3-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/07 08:09:16 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/05/29 19:09:56 skrll Exp $
 qt3/bin/assistant
 qt3/bin/designer
 qt3/bin/linguist
@@ -15,6 +15,9 @@ qt3/lib/libqui.la
 qt3/lib/libqui.so
 qt3/lib/libqui.so.1
 qt3/lib/libqui.so.1.0
+qt3/plugins/designer/libcppeditor.a
+qt3/plugins/designer/libcppeditor.la
+qt3/plugins/designer/libcppeditor.so
 qt3/plugins/designer/libdlgplugin.a
 qt3/plugins/designer/libdlgplugin.la
 qt3/plugins/designer/libdlgplugin.so
@@ -24,12 +27,4 @@ qt3/plugins/designer/librcplugin.so
 qt3/plugins/designer/libwizards.a
 qt3/plugins/designer/libwizards.la
 qt3/plugins/designer/libwizards.so
-qt3/plugins/imageformats/libqjpeg.a
-qt3/plugins/imageformats/libqjpeg.la
-qt3/plugins/imageformats/libqjpeg.so
-qt3/plugins/imageformats/libqmng.a
-qt3/plugins/imageformats/libqmng.la
-qt3/plugins/imageformats/libqmng.so
-@dirrm qt3/plugins/imageformats
 @dirrm qt3/plugins/designer
-@dirrm qt3/plugins
diff --git a/x11/qt3-tools/buildlink.mk b/x11/qt3-tools/buildlink.mk
index 82aacb25496..eb14d32ae60 100644
--- a/x11/qt3-tools/buildlink.mk
+++ b/x11/qt3-tools/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/03/19 17:54:37 drochner Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/05/29 19:09:56 skrll Exp $
 #
 # This Makefile fragment is included by packages that use qt3-tools.
 #
@@ -17,8 +17,14 @@ QT3_TOOLS_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.0.2
+BUILDLINK_DEPENDS.qt3-tools?= qt3-tools>=3.0.4
+BUILDLINK_DEPENDS_METHOD.qt3-tools?= full
+
+.if ${BUILDLINK_DEPENDS_METHOD.qt3-tools} == build
+BUILD_DEPENDS+=	${BUILDLINK_DEPENDS.qt3-tools}:../../x11/qt3-tools
+.else
 DEPENDS+=	${BUILDLINK_DEPENDS.qt3-tools}:../../x11/qt3-tools
+.endif
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.qt3-tools=qt3-tools
 BUILDLINK_PREFIX.qt3-tools=	${X11PREFIX}