diff options
| author | tron <tron@pkgsrc.org> | 1998-07-14 22:56:40 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 1998-07-14 22:56:40 +0000 |
| commit | b51b76e2be329e938f9814ba34d691319d38324b (patch) | |
| tree | 9449a23a1752c1f75fe2ec7e3c3b67bede68e731 /x11 | |
| parent | 7bae408426e27fc87b3a07a4c4d1790c15ebbe4a (diff) | |
| download | pkgsrc-b51b76e2be329e938f9814ba34d691319d38324b.tar.gz | |
Add "${CONFLICTS}".
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kde/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdebase/Makefile | 4 | ||||
| -rw-r--r-- | x11/kdelibs/Makefile | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/x11/kde/Makefile b/x11/kde/Makefile index 38e1d7fcfb2..b7b0a8581b6 100644 --- a/x11/kde/Makefile +++ b/x11/kde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 1998/07/14 22:12:30 tron Exp $ +# $NetBSD: Makefile,v 1.13 1998/07/14 22:57:39 tron Exp $ # FreeBSD Id: Makefile,v 1.2 1997/11/27 00:47:46 se Exp # @@ -14,6 +14,8 @@ DEPENDS+= kdegames-1.0:../../games/kdegames DEPENDS+= kdenetwork-1.0:../../net/kdenetwork DEPENDS+= kdegraphics-1.0:../../graphics/kdegraphics +CONFLICTS= kde-2.1b kde-3.1b kde-4.1b + EXTRACT_ONLY= # empty NO_CHECKSUM= yes NO_PATCH= yes diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile index 14d0ffc3ff3..4c27960636f 100644 --- a/x11/kdebase/Makefile +++ b/x11/kdebase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 1998/07/14 20:28:23 tron Exp $ +# $NetBSD: Makefile,v 1.17 1998/07/14 22:57:56 tron Exp $ # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp # @@ -15,6 +15,8 @@ DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= qt-1.33:../../x11/qt DEPENDS+= kdelibs-1.0:../../x11/kdelibs +CONFLICTS= kdebase-2.1b kdebase-3.1b kdebase-4.1b + USE_X11= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= "--x-inc=${PREFIX}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \ diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile index 83617719c2a..01d31779c36 100644 --- a/x11/kdelibs/Makefile +++ b/x11/kdelibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 1998/07/13 20:33:48 tron Exp $ +# $NetBSD: Makefile,v 1.14 1998/07/14 22:58:13 tron Exp $ # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp # @@ -13,6 +13,8 @@ DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= qt-1.33:../../x11/qt DEPENDS+= giflib-3.0:../../graphics/giflib +CONFLICTS= kdelibs-2.1b kdelibs-3.1b kdelibs-4.1b + USE_X11= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= "--prefix=${PREFIX}" \ |