Build, install and use a shared libqassistantclient.

This is primarily needed by PyQt.

6 files changed, 41 insertions, 5 deletions

diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index a7761e7f576..e66cddf2eea 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2003/03/18 08:36:25 skrll Exp $
+$NetBSD: distinfo,v 1.14 2003/07/22 17:17:19 drochner Exp $
 
 SHA1 (qt-x11-free-3.1.2.tar.bz2) = eddcf56d34c4ee98fd2b48be6b6aa32b66f302a5
 Size (qt-x11-free-3.1.2.tar.bz2) = 13358932 bytes
@@ -9,3 +9,5 @@ SHA1 (patch-ad) = 5f3d133051a9894aa45df1b1a6e1d0b6d964c49c
 SHA1 (patch-ag) = 4b1d279a7ff1793eac7ca0c98df61f43a762d50a
 SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
 SHA1 (patch-bb) = 5196eb7c63f33fc36fe3569273d6c7061aeb9dbb
+SHA1 (patch-bc) = 1dcf6b9583461525400bd62b625f8cf7f5b41a5f
+SHA1 (patch-bd) = 06ac1c48f91887d8414df8f69dc79e023da0f6f1
diff --git a/x11/qt3-libs/patches/patch-bc b/x11/qt3-libs/patches/patch-bc
new file mode 100644
index 00000000000..dec24b6d81f
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-bc
@@ -0,0 +1,13 @@
+$NetBSD: patch-bc,v 1.1 2003/07/22 17:17:20 drochner Exp $
+
+--- tools/assistant/lib/lib.pro.orig	2003-07-16 12:27:26.000000000 +0200
++++ tools/assistant/lib/lib.pro	2003-07-16 12:27:47.000000000 +0200
+@@ -5,7 +5,7 @@
+ SOURCES		= qassistantclient.cpp
+ HEADERS         += $$QT_SOURCE_TREE/include/qassistantclient.h
+ 
+-CONFIG += staticlib
++#CONFIG += staticlib
+ CONFIG	-= dll
+ 
+ DEFINES		+= QT_INTERNAL_NETWORK
diff --git a/x11/qt3-libs/patches/patch-bd b/x11/qt3-libs/patches/patch-bd
new file mode 100644
index 00000000000..adb5df4620c
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-bd
@@ -0,0 +1,13 @@
+$NetBSD: patch-bd,v 1.1 2003/07/22 17:17:20 drochner Exp $
+
+--- tools/designer/designer/designer.pro.orig	2003-07-16 13:13:29.000000000 +0200
++++ tools/designer/designer/designer.pro	2003-07-16 13:14:48.000000000 +0200
+@@ -416,7 +416,7 @@
+ 
+ INCLUDEPATH	+= ../shared ../uilib
+ win32:LIBS	+= $$QT_BUILD_TREE/lib/qui.lib $$QT_BUILD_TREE/lib/qassistantclient.lib
+-unix:LIBS		+= -L$$QT_BUILD_TREE/lib -lqui $$QT_BUILD_TREE/lib/libqassistantclient.a
++unix:LIBS		+= -L$$QT_BUILD_TREE/lib -lqui -lqassistantclient
+ 
+ TRANSLATIONS	= designer_de.ts designer_fr.ts
+ 
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index 17d7f5a593a..38fb4da5247 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2003/05/02 11:57:31 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/07/22 17:17:21 drochner Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
 
 PKGNAME=		qt3-tools-${QTVERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 COMMENT=		QT GUI (WYSIWYG) builder and other tools
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
@@ -19,6 +19,8 @@ do-install:
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic ${QTPREFIX}/bin
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/lib/libqui.la ${QTPREFIX}/lib
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/lib/libeditor.la ${QTPREFIX}/lib
+	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqassistantclient.la \
+		${QTPREFIX}/lib
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/bin/designer ${QTPREFIX}/bin
 	${INSTALL_DATA_DIR} ${QTPREFIX}/plugins/designer
 	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/plugins/designer/libwizards.la ${QTPREFIX}/plugins/designer
diff --git a/x11/qt3-tools/PLIST b/x11/qt3-tools/PLIST
index bd494c032ca..a78e0977672 100644
--- a/x11/qt3-tools/PLIST
+++ b/x11/qt3-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/03/18 08:36:26 skrll Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/07/22 17:17:21 drochner Exp $
 qt3/bin/assistant
 qt3/bin/designer
 qt3/bin/linguist
@@ -6,6 +6,11 @@ qt3/bin/qm2ts
 qt3/bin/qmake
 qt3/bin/qtconfig
 qt3/bin/uic
+qt3/lib/libqassistantclient.a
+qt3/lib/libqassistantclient.la
+qt3/lib/libqassistantclient.so
+qt3/lib/libqassistantclient.so.1
+qt3/lib/libqassistantclient.so.1.0
 qt3/lib/libeditor.a
 qt3/lib/libeditor.la
 qt3/lib/libeditor.so
diff --git a/x11/qt3-tools/buildlink2.mk b/x11/qt3-tools/buildlink2.mk
index c6304587ccc..5dd156a66ad 100644
--- a/x11/qt3-tools/buildlink2.mk
+++ b/x11/qt3-tools/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2003/05/02 11:57:31 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2003/07/22 17:17:22 drochner Exp $
 
 .if !defined(QT3_TOOLS_BUILDLINK2_MK)
 QT3_TOOLS_BUILDLINK2_MK=	# defined
@@ -11,6 +11,7 @@ EVAL_PREFIX+=			BUILDLINK_PREFIX.qt3-tools=qt3-tools
 BUILDLINK_PREFIX.qt3-tools=	${X11PREFIX}
 BUILDLINK_FILES.qt3-tools+=	qt3/lib/libeditor.*
 BUILDLINK_FILES.qt3-tools+=	qt3/lib/libqui.*
+BUILDLINK_FILES.qt3-tools+=	qt3/lib/libqassistantclient.*
 
 .include "../../x11/qt3-libs/buildlink2.mk"