Add KDE support into the QT2 designer.

Note to Hubert: I wouldn't bother recompiling just yet unless you really
want to start creating KDE apps in the up and coming kdevelop 1.4

7 files changed, 71 insertions, 13 deletions

diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile
index dacf8e70dc7..e11869bb305 100644
--- a/x11/qt2-designer/Makefile
+++ b/x11/qt2-designer/Makefile
@@ -1,18 +1,24 @@
-# $NetBSD: Makefile,v 1.7 2001/02/17 17:06:41 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/03/28 09:27:50 skrll Exp $
 #
 
 .include "../qt2-libs/Makefile.common"
 
-PKGNAME=	qt2-designer-${QTVERSION}
+PKGNAME=		qt2-designer-${QTVERSION}
 
-COMMENT=	Visual (WYSIWYG) QT GUI builder
+COMMENT=		Visual (WYSIWYG) QT GUI builder
 
-DEPENDS+=	qt2-libs-${QTVERSION}:../../x11/qt2-libs
+DEPENDS+=		qt2-libs-${QTVERSION}:../../x11/qt2-libs
+DEPENDS+=		kdelibs-2.1:../../x11/kdelibs2
 
-ALL_TARGET=	sub-tools
+ALL_TARGET=		sub-tools
 
-CONFIGURE_ENV+=	QTDIR=${QTPREFIX}
-MAKE_ENV+=	QTDIR=${QTPREFIX}
+EVAL_PREFIX+=           KDEBASEDIR=kdelibs
+
+CONFIGURE_ARGS+=	-kde
+CONFIGURE_ENV+=		QTDIR="${QTPREFIX}" \
+			KDEDIR="${KDEBASEDIR}"
+MAKE_ENV+=		QTDIR=${QTPREFIX} \
+			KDEDIR="${KDEBASEDIR}"
 
 do-install:
 	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index fe3db85d3e5..34f92386ba0 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2001/03/27 03:20:28 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.9 2001/03/28 09:27:51 skrll Exp $
 #
 
 DISTNAME=		qt-x11-${QTVERSION}
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=	-static -sm -no-thread \
 			-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	-gif	# qt2 does not write compressed GIFs
 
-CONFIGURE_SCRIPT=	${ECHO} yes | ./configure
+CONFIGURE_ARGS+=	< ${FILESDIR}/license-acceptance
 
 QTPREFIX=		${PREFIX}/qt2
 
diff --git a/x11/qt2-libs/files/license-acceptance b/x11/qt2-libs/files/license-acceptance
new file mode 100644
index 00000000000..7cfab5b05d6
--- /dev/null
+++ b/x11/qt2-libs/files/license-acceptance
@@ -0,0 +1 @@
+yes
diff --git a/x11/qt2-libs/files/patch-sum b/x11/qt2-libs/files/patch-sum
index efb71afc37e..85e34081392 100644
--- a/x11/qt2-libs/files/patch-sum
+++ b/x11/qt2-libs/files/patch-sum
@@ -1,11 +1,13 @@
-$NetBSD: patch-sum,v 1.9 2001/03/23 18:09:34 drochner Exp $
+$NetBSD: patch-sum,v 1.10 2001/03/28 09:27:51 skrll Exp $
 
 SHA1 (patch-aa) = dc1e3bfee83a8f6b19a4ce78eaec709ac562ad51
 SHA1 (patch-ab) = 0b8657fc5b28e4ffb58584988758fdc4a9900a34
 SHA1 (patch-ac) = a85cb26d5cdcaa9ef61021d105d56a3a78cf5389
-SHA1 (patch-ad) = 416b001554e93cc8fa7c91f4876abc7e4aad392c
+SHA1 (patch-ad) = 26482d22e1d016ef514a43a69a5d58b19f03193c
 SHA1 (patch-ae) = 47c46c62ef8114aa707430145ee42c6658e557a9
 SHA1 (patch-af) = ea8b1c3f7a099a5492301281476ea831134ad97b
 SHA1 (patch-ag) = 410c4c67a0a0651c2dbe15372a2112da471a0d62
 SHA1 (patch-ah) = ae572066db03cfdf5a3f33c702405d3a55dd3bfd
 SHA1 (patch-ai) = 20a61cefe445fdc8cac90da9800d0836ac57caf8
+SHA1 (patch-aj) = ad8dd5a1ca058ef2d3ee0950b5f1b6f1bed023c5
+SHA1 (patch-ak) = a926a35bd0458f7baecb26ec9ecf03acb36488fb
diff --git a/x11/qt2-libs/patches/patch-ad b/x11/qt2-libs/patches/patch-ad
index 5606b618001..d5ebcb45688 100644
--- a/x11/qt2-libs/patches/patch-ad
+++ b/x11/qt2-libs/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/10/19 07:41:15 skrll Exp $
+$NetBSD: patch-ad,v 1.2 2001/03/28 09:27:51 skrll Exp $
 
---- configure.orig	Tue Oct 17 12:27:35 2000
+--- configure.orig	Mon Mar  5 18:12:49 2001
 +++ configure
 @@ -17,25 +17,6 @@
      HELP=yes
diff --git a/x11/qt2-libs/patches/patch-aj b/x11/qt2-libs/patches/patch-aj
new file mode 100644
index 00000000000..4b255c398b2
--- /dev/null
+++ b/x11/qt2-libs/patches/patch-aj
@@ -0,0 +1,24 @@
+$NetBSD: patch-aj,v 1.1 2001/03/28 09:27:51 skrll Exp $
+
+--- tools/designer/uic/Makefile-kde.in.orig	Mon Mar  5 18:12:53 2001
++++ tools/designer/uic/Makefile-kde.in
+@@ -6,15 +6,15 @@
+ CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DUIC -DHAVE_KDE
+ CC	=	$(SYSCONF_CC) $(QT_C_MT)
+ CFLAGS	=	$(SYSCONF_CFLAGS) -DUIC -DHAVE_KDE
+-INCPATH =	-I../shared -I../util -I../../../src/3rdparty/zlib -I$(KDEDIR)/include
+-LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
+-LIBS	=	$(SUBLIBS) -lqutil -L../lib -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
++INCPATH =	-I../shared -I../util -I$(KDEDIR)/include
++LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL)
++LIBS	=	$(SUBLIBS) ../util/libqutil.la -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
+ MOC	=	$(SYSCONF_MOC)
+ UIC	=	$(SYSCONF_UIC)
+ 
+ ####### Target
+ 
+-DESTDIR = $(QTDIR)/bin/
++DESTDIR = 
+ VER_MAJ = 1
+ VER_MIN = 0
+ VER_PATCH = 0
diff --git a/x11/qt2-libs/patches/patch-ak b/x11/qt2-libs/patches/patch-ak
new file mode 100644
index 00000000000..3270f9b8e3c
--- /dev/null
+++ b/x11/qt2-libs/patches/patch-ak
@@ -0,0 +1,25 @@
+$NetBSD: patch-ak,v 1.1 2001/03/28 09:27:51 skrll Exp $
+
+--- tools/designer/designer/Makefile-kde.in.orig	Mon Mar  5 18:12:52 2001
++++ tools/designer/designer/Makefile-kde.in
+@@ -6,15 +6,15 @@
+ CXXFLAGS=	$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DDESIGNER -DHAVE_KDE
+ CC	=	$(SYSCONF_CC) $(QT_C_MT)
+ CFLAGS	=	$(SYSCONF_CFLAGS) -DDESIGNER -DHAVE_KDE
+-INCPATH =	-I../shared -I../util -I../../../src/3rdparty/zlib -I$(KDEDIR)/include
+-LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
+-LIBS	=	$(SUBLIBS) -lqutil -L$(QTDIR)/lib -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
++INCPATH =	-I../shared -I../util -I$(KDEDIR)/include
++LFLAGS	=	$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL)
++LIBS	=	$(SUBLIBS) ../util/libqutil.la -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
+ MOC	=	$(SYSCONF_MOC)
+-UIC	=	$(SYSCONF_UIC)
++UIC	=	../uic/uic
+ 
+ ####### Target
+ 
+-DESTDIR = $(QTDIR)/bin/
++DESTDIR = 
+ VER_MAJ = 1
+ VER_MIN = 0
+ VER_PATCH = 0