Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/wm/fvwm1/Attic/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/wm/fvwm1/Attic/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- pkgsrc/wm/fvwm1/Attic/Makefile	2002/06/17 08:12:36	1.7
+++ pkgsrc/wm/fvwm1/Attic/Makefile	2002/06/17 09:28:59	1.8
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/06/17 08:12:36 martti Exp $
+# $NetBSD: Makefile,v 1.8 2002/06/17 09:28:59 wiz 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=	fvwm2-*
+CONFLICTS=	fvwm2-* fvwm>=1
 
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL