summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2004-02-26 05:17:15 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2004-02-26 05:17:15 +0000
commit502ef7ef42a3d5c36bcb3fbbc3997d2c3e529ddd (patch)
tree36db3daabf1483b767d38bb846a0f95f90540eb9 /emulators
parent- add SIZE (diff)
- add CONFLICTS
Notes
Notes: svn path=/head/; revision=102159
Diffstat (limited to 'emulators')
-rw-r--r--emulators/vice/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 2b7a821f1ee3..9003d0b19430 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -29,8 +29,10 @@ USE_GCC= 3.2
.if defined(VICE_WITH_GNOME)
USE_GNOME= gnomelibs
CONFIGURE_ARGS= --enable-gnomeui
+CONFLICTS?= vice-1.*
.else
CONFIGURE_ARGS= --with-xaw3d
+CONFLICTS?= vice-gnome-1.*
.endif
INFO= vice