Make qt2-designer and qt2-designer-kde conflict with each other and

install identical filenames.  qt2-designer-kde is now a superset of the
functionality in qt2-designer.  Bump the version numbers of both packages
to 2.3.1nb1.  On suggestion by Nick Hudson (skrll@netbsd.org).

5 files changed, 25 insertions, 12 deletions

diff --git a/x11/qt2-designer-kde/Makefile b/x11/qt2-designer-kde/Makefile
index 1233e64e178..ab7c494534d 100644
--- a/x11/qt2-designer-kde/Makefile
+++ b/x11/qt2-designer-kde/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2001/07/15 10:53:45 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/07/15 20:16:49 jlam Exp $
 #
 
 .include "../qt2-libs/Makefile.common"
 
-PKGNAME=		qt2-designer-kde-${QTVERSION}
+PKGNAME=		qt2-designer-kde-${QTVERSION}nb1
+COMMENT=		Visual (WYSIWYG) QT GUI builder with KDE widget support
 
-COMMENT=		Visual (WYSIWYG) QT GUI builder
+CONFLICTS+=		qt2-designer-[0-9]*
 
 USE_BUILDLINK_ONLY=		yes
-BUILDLINK_DEPENDS.qt2-designer=	qt2-designer-${QTVERSION}
 BUILDLINK_DEPENDS.qt2-libs=	qt2-libs-${QTVERSION}
 
 ALL_TARGET=		sub-tools
@@ -20,9 +20,11 @@ MAKE_ENV+=		QTDIR=${QTPREFIX} \
 			KDEDIR="${BUILDLINK_DIR}"
 
 do-install:
-	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin/designer-kde
+	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib
+	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin
+	${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin
 
 .include "../../x11/kdelibs2/buildlink.mk"
-.include "../../x11/qt2-designer/buildlink.mk"
 .include "../../x11/qt2-libs/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
+
diff --git a/x11/qt2-designer-kde/pkg/DESCR b/x11/qt2-designer-kde/pkg/DESCR
index 662341cbb2e..165568563a6 100644
--- a/x11/qt2-designer-kde/pkg/DESCR
+++ b/x11/qt2-designer-kde/pkg/DESCR
@@ -3,3 +3,5 @@ offering a WYSIWYG (What You See Is What You Get) drag and drop interface
 for UI creation and maintenance. Qt Designer employs a vendor neutral,
 XML-format for persistent storage, which simplifies the tasks involved
 with the creation and layout of dialogs.
+
+This packages includes support for KDE widgets.
diff --git a/x11/qt2-designer-kde/pkg/PLIST b/x11/qt2-designer-kde/pkg/PLIST
index a4d8418f7f8..9fc9d1a0f92 100644
--- a/x11/qt2-designer-kde/pkg/PLIST
+++ b/x11/qt2-designer-kde/pkg/PLIST
@@ -1,2 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/05/14 17:09:27 drochner Exp $
-qt2/bin/designer-kde
+@comment $NetBSD: PLIST,v 1.2 2001/07/15 20:16:49 jlam Exp $
+qt2/bin/designer
+qt2/bin/uic
+qt2/lib/libqutil.a
+qt2/lib/libqutil.la
+qt2/lib/libqutil.so
+qt2/lib/libqutil.so.1
+qt2/lib/libqutil.so.1.0
diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile
index 0375b7af0dc..18429ff18a0 100644
--- a/x11/qt2-designer/Makefile
+++ b/x11/qt2-designer/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2001/06/26 17:45:55 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/07/15 20:16:47 jlam Exp $
 #
 
 .include "../qt2-libs/Makefile.common"
 
-PKGNAME=		qt2-designer-${QTVERSION}
+PKGNAME=		qt2-designer-${QTVERSION}nb1
 COMMENT=		Visual (WYSIWYG) QT GUI builder
 
+CONFLICTS+=		qt2-designer-kde-[0-9]*
+
 USE_BUILDLINK_ONLY=		yes
 BUILDLINK_DEPENDS.qt2-libs=	qt2-libs-${QTVERSION}
 
diff --git a/x11/qt2-designer/buildlink.mk b/x11/qt2-designer/buildlink.mk
index 0c9a2904880..d53f16ee102 100644
--- a/x11/qt2-designer/buildlink.mk
+++ b/x11/qt2-designer/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:33 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/15 20:16:48 jlam Exp $
 #
 # This Makefile fragment is included by packages that use qt2-designer.
 #
@@ -17,7 +17,8 @@ QT2_DESIGNER_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.qt2-designer?=	qt2-designer>=2.2.4
+BUILDLINK_DEPENDS.qt2-designer?= \
+		{qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}
 DEPENDS+=	${BUILDLINK_DEPENDS.qt2-designer}:../../x11/qt2-designer
 
 BUILDLINK_PREFIX.qt2-designer=	${X11PREFIX}