diff options
| author | tron <tron@pkgsrc.org> | 2000-04-24 14:14:12 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2000-04-24 14:14:12 +0000 |
| commit | fe2ab63720ce79cfbbf4b46dfdb38216682e3d37 (patch) | |
| tree | 4789f4f4c5224fc16569e07771de70d9cd367964 | |
| parent | 19871dbe443642c3bd696b906a9baf70d2465a5e (diff) | |
| download | pkgsrc-fe2ab63720ce79cfbbf4b46dfdb38216682e3d37.tar.gz | |
Add conflict between "kdetoys" and "kworldwatch" package as suggested
by Michael Wolfson in PR pkg/9961.
| -rw-r--r-- | games/kdetoys/Makefile | 4 | ||||
| -rw-r--r-- | x11/kworldwatch/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/games/kdetoys/Makefile b/games/kdetoys/Makefile index dc0b53ba3b5..c1399904ccb 100644 --- a/games/kdetoys/Makefile +++ b/games/kdetoys/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/04/12 22:35:18 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.4 2000/04/24 14:14:12 tron Exp $ DISTNAME= kdetoys-1.1.2 CATEGORIES= games kde @@ -11,6 +11,8 @@ HOMEPAGE= http://www.kde.org/ DEPENDS+= kdebase-1.1.2:../../x11/kdebase +CONFLICTS= kworldwatch-* + USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/x11/kworldwatch/Makefile b/x11/kworldwatch/Makefile index 369c42a71f6..45c3f7c6c37 100644 --- a/x11/kworldwatch/Makefile +++ b/x11/kworldwatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/04/13 01:05:45 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.6 2000/04/24 14:14:13 tron Exp $ # DISTNAME= kworldwatch-0.6 @@ -11,6 +11,8 @@ MAINTAINER= hubertf@netbsd.org DEPENDS+= gettext-0.10.*:../../devel/gettext DEPENDS+= kde-1.1.2:../../x11/kde +CONFLICTS+= kdetoys-* + USE_X11BASE= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+=--datadir=${X11BASE}/share/kde \ |