diff options
| author | jlam <jlam@pkgsrc.org> | 2001-07-15 20:18:19 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-07-15 20:18:19 +0000 |
| commit | b2d04514c570e8415038b3cc387ba22a8204ecfa (patch) | |
| tree | 3c908e2bb0f0b9294b599cb50e097a1cb76416ad | |
| parent | 0d9212998f43b69b2d6b65858d5b9e62ff2a9084 (diff) | |
| download | pkgsrc-b2d04514c570e8415038b3cc387ba22a8204ecfa.tar.gz | |
Change dependency on qt2-designer to allow recent versions of
qt2-designer-kde, but if required to build the dependency, default to
building qt2-designer.
| -rw-r--r-- | x11/kdebase2/Makefile | 4 | ||||
| -rw-r--r-- | x11/qt2/Makefile | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 6e55151da90..3b7dffa2533 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2001/07/14 05:13:42 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2001/07/15 20:18:19 jlam Exp $ DISTNAME= kdebase-2.1 CATEGORIES= x11 kde @@ -8,7 +8,7 @@ COMMENT= Base modules for the KDE 2 integrated X11 desktop DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README BUILD_DEPENDS+= automake-1.4:../../devel/automake -BUILD_DEPENDS+= qt2-designer>=2.2.4:../../x11/qt2-designer +BUILD_DEPENDS+= {qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}:../../x11/qt2-designer USE_BUILDLINK_ONLY= yes diff --git a/x11/qt2/Makefile b/x11/qt2/Makefile index ee1caf1a9aa..af83e7faebe 100644 --- a/x11/qt2/Makefile +++ b/x11/qt2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2001/02/17 17:06:41 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2001/07/15 20:18:20 jlam Exp $ # -DISTNAME= qt2-${QTVERSION} +DISTNAME= qt2-${QTVERSION}nb1 CATEGORIES= x11 MASTER_SITES= # empty DISTFILES= # empty @@ -11,7 +11,7 @@ COMMENT= "meta-package" for the QT GUI C++ toolkit .include "Makefile.common" DEPENDS+= qt2-libs-${QTVERSION}:../../x11/qt2-libs -DEPENDS+= qt2-designer-${QTVERSION}:../../x11/qt2-designer +DEPENDS+= {qt2-designer-${QTVERSION}nb1,qt2-designer-kde-${QTVERSION}nb1}:../../x11/qt2-designer DEPENDS+= qt2-docs-${QTVERSION}:../../x11/qt2-docs DEPENDS+= qt2-examples-${QTVERSION}:../../x11/qt2-examples |