aboutsummaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorAdrian Chadd <adrian@FreeBSD.org>2013-06-27 22:22:05 +0000
committerAdrian Chadd <adrian@FreeBSD.org>2013-06-27 22:22:05 +0000
commitb9794cf1e7c46936616198f96f98ae9fd7251807 (patch)
tree598d9b6100a8e1f18472a7087b688a7dd53b517c /emulators
parentc8b530b7e9bd0b7bb4a1713300682712a5886174 (diff)
Building gxemul conflicts with svgalib, so mark it as a conflict.
svgalib installs a 'vga.h' file in /usr/local/include, which conflicts with the vga.h in gxemul. Until that gets resolved, mark it as a conflict.
Notes
Notes: svn path=/head/; revision=321910
Diffstat (limited to 'emulators')
-rw-r--r--emulators/gxemul/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index 6698e1c86e71..a5f7cd96182a 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -21,6 +21,10 @@ MAN1= gxemul.1
PORTDOCS= *
PLIST_FILES= bin/gxemul
+# svgalib installs vga.h, which conflicts with gxemul when building with
+# a virtual VGA adaptor.
+CONFLICTS= svgalib-[0-9]*
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MX11}