From 4abdf1065687d5c506dc33f17158e753033b7d6a Mon Sep 17 00:00:00 2001 From: adrian Date: Thu, 27 Jun 2013 22:22:05 +0000 Subject: 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. --- emulators/gxemul/Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'emulators') 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 .if ${PORT_OPTIONS:MX11} -- cgit