diff options
| author | wiz <wiz> | 2005-02-04 13:58:32 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2005-02-04 13:58:32 +0000 |
| commit | 9fa1fe643ee3bdb9645e86a1042a45ce920aabe5 (patch) | |
| tree | bd0c46eaff88414a21f42e50988039d2e6982fe7 | |
| parent | 5dcbd147559ee79a34f5f065c7ac59dd2564c9c6 (diff) | |
| download | pkgsrc-9fa1fe643ee3bdb9645e86a1042a45ce920aabe5.tar.gz | |
pwm and ion conflict with each other -- both install bin/pwm and its man page.
Noted by Leonard Schmidt on tech-pkg.
| -rw-r--r-- | wm/ion/Makefile | 4 | ||||
| -rw-r--r-- | wm/pwm/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/wm/ion/Makefile b/wm/ion/Makefile index b469a8425be..570251ca4c2 100644 --- a/wm/ion/Makefile +++ b/wm/ion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2004/10/15 12:06:05 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/02/04 13:58:32 wiz Exp $ # DISTNAME= ion-2-20040729 @@ -13,6 +13,8 @@ COMMENT= Keyboard friendly tiling window manager PKG_INSTALLATION_TYPES= overwrite pkgviews +CONFLICTS+= pwm-[0-9]* + USE_BUILDLINK3= YES USE_PKGINSTALL= YES USE_X11= YES diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile index 6ff4d4d3e26..77c666a0740 100644 --- a/wm/pwm/Makefile +++ b/wm/pwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/24 15:18:32 grant Exp $ +# $NetBSD: Makefile,v 1.14 2005/02/04 13:58:32 wiz Exp $ # DISTNAME= pwm-20030617 @@ -12,6 +12,8 @@ COMMENT= Window manager that frames multiple client windows in a single frame PKG_INSTALLATION_TYPES= overwrite pkgviews +CONFLICTS+= ion-[0-9]* + USE_BUILDLINK3= YES USE_PKGINSTALL= YES USE_X11= YES |