summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2002-06-17 09:28:59 +0000
committerwiz <wiz>2002-06-17 09:28:59 +0000
commit6861e934cf3663ea567746ae963d445d42827645 (patch)
treeae9137252b92a1b374fc372074ccbbb70192bedf
parentab8490fbe198ed3f8ead4d61a85323b4b69bfb61 (diff)
downloadpkgsrc-6861e934cf3663ea567746ae963d445d42827645.tar.gz
Add CONFLICTS with fvwm>=1 for rather old fvwm packages.
-rw-r--r--wm/fvwm1/Makefile4
-rw-r--r--wm/fvwm2/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile
index 008183d673a..9fc458d6110 100644
--- a/wm/fvwm1/Makefile
+++ b/wm/fvwm1/Makefile
@@ -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
diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index 20c3157415f..f3b86ebaa02 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/06/17 08:12:36 martti Exp $
+# $NetBSD: Makefile,v 1.19 2002/06/17 09:29:00 wiz Exp $
# FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
#
@@ -16,7 +16,7 @@ COMMENT= Newer version of X11 Virtual window manager
DEPENDS+= xpmroot-2.*:../../x11/xpmroot
-CONFLICTS= fvwm1-*
+CONFLICTS= fvwm1-* fvwm>=1
EXTRACT_ONLY= ${DISTNAME}.tar.gz
FVWM_VER= 2.4.8