summaryrefslogtreecommitdiff
path: root/wm/fvwm1
diff options
context:
space:
mode:
authormartti <martti@pkgsrc.org>2002-06-17 08:12:35 +0000
committermartti <martti@pkgsrc.org>2002-06-17 08:12:35 +0000
commit071431a967d430d02dfa319d5dc5f9548c0ba80d (patch)
tree07ddd31bf86d0f378c5a3305fa3b598feddc22e3 /wm/fvwm1
parentc78487926926530a162fb01f070e9180a28090fc (diff)
downloadpkgsrc-071431a967d430d02dfa319d5dc5f9548c0ba80d.tar.gz
This conflicts with fvwm2
Diffstat (limited to 'wm/fvwm1')
-rw-r--r--wm/fvwm1/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile
index 520ae890ae8..008183d673a 100644
--- a/wm/fvwm1/Makefile
+++ b/wm/fvwm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/10/14 13:47:17 tron Exp $
+# $NetBSD: Makefile,v 1.7 2002/06/17 08:12:36 martti Exp $
# FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
#
@@ -13,7 +13,7 @@ COMMENT= Virtual window manager for X
DEPENDS= xpmroot-2.*:../../x11/xpmroot
-CONFLICTS= fvwm-1.*
+CONFLICTS= fvwm2-*
NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL