diff options
| author | cy <cy@FreeBSD.org> | 2011-04-19 09:48:58 +0800 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2011-04-19 09:48:58 +0800 |
| commit | 3a209bb3d3c3989fb8edb648cf7e1f5fe85b9213 (patch) | |
| tree | cffc79d3e83b24ef63cf74db7154095b4b867902 /x11-wm | |
| parent | e8ad5c172ae3a33a9d2781db38e5786aef20937d (diff) | |
| download | freebsd-ports-gnome-3a209bb3d3c3989fb8edb648cf7e1f5fe85b9213.tar.gz freebsd-ports-gnome-3a209bb3d3c3989fb8edb648cf7e1f5fe85b9213.tar.zst freebsd-ports-gnome-3a209bb3d3c3989fb8edb648cf7e1f5fe85b9213.zip | |
Fix up CONFLICTS.
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/fvwm2-devel/Makefile | 2 | ||||
| -rw-r--r-- | x11-wm/fvwm2/Makefile | 2 | ||||
| -rw-r--r-- | x11-wm/fvwm24/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile index b67f14fc2fc6..7c13806949f5 100644 --- a/x11-wm/fvwm2-devel/Makefile +++ b/x11-wm/fvwm2-devel/Makefile @@ -19,7 +19,7 @@ COMMENT= Popular virtual window manager for X RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 # Other ports this port cannot coexist with -CONFLICTS?= fvwm-1.* fvwm-2.4.* +CONFLICTS?= fvwm-1.* fvwm-2.[456].* NO_LATEST_LINK= yes GNU_CONFIGURE= yes diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index 8e42d96d4a5f..91e32b6ffc04 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -19,7 +19,7 @@ COMMENT= Popular virtual window manager for X RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4 # Other ports this port cannot coexist with -CONFLICTS?= fvwm-1.* fvwm-2.4.* +CONFLICTS?= fvwm-1.* fvwm-2.[457].* NO_LATEST_LINK= yes GNU_CONFIGURE= yes diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile index 822af2017276..6bc0fcdc900f 100644 --- a/x11-wm/fvwm24/Makefile +++ b/x11-wm/fvwm24/Makefile @@ -27,7 +27,7 @@ LIB_DEPENDS+= stroke.0:${PORTSDIR}/devel/libstroke .endif # Other ports this port cannot coexist with -CONFLICTS?= fvwm-1.* fvwm-2.5.* +CONFLICTS?= fvwm-1.* fvwm-2.[567].* # Other ports reference this port's Makefile .if defined(PKGNAMESUFFIX) LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} |