diff options
| author | jlam <jlam> | 2001-07-15 20:16:47 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-07-15 20:16:47 +0000 |
| commit | 5a35229295442da9180319c97bd29a152db23581 (patch) | |
| tree | 71380f6e7312f5fb12d6b1f82a582ca1f3e67762 /x11/qt2-designer | |
| parent | e48cc60034107b93cee20f1a1f89978f4c867168 (diff) | |
| download | pkgsrc-5a35229295442da9180319c97bd29a152db23581.tar.gz | |
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).
Diffstat (limited to 'x11/qt2-designer')
| -rw-r--r-- | x11/qt2-designer/Makefile | 6 | ||||
| -rw-r--r-- | x11/qt2-designer/buildlink.mk | 5 |
2 files changed, 7 insertions, 4 deletions
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} |