emulators/qemu: Unhook default flavor

emulators/qemu/Makefile

@@ -24,32 +24,25 @@ LIB_DEPENDS+=	libfdt.so:sysutils/dtc \
 		libinotify.so:devel/libinotify \
 		libslirp.so:net/libslirp
 .endif
-.if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent)
-LIB_DEPENDS+=	libepoxy.so:graphics/libepoxy
-.endif
-.if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools && ${FLAVOR:U} != default)
+.if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools)
 PKGMESSAGE=	${.CURDIR}/pkg-message.guest-agent
 .endif
 
-FLAVORS=			default nox11 tools guestagent
+FLAVORS=			nox11 tools guestagent
 FLAVOR?=			${FLAVORS:[1]}
-default_CONFLICTS_INSTALL=	qemu-devel qemu-nox11 qemu-tools qemu-utils \
-				qemu6* qemu7*
 nox11_PKGNAMESUFFIX=		-nox11
-nox11_CONFLICTS_INSTALL=	qemu qemu-devel qemu6* qemu7* qemu-guest-agent
+nox11_CONFLICTS_INSTALL=	qemu qemu-guest-agent
 nox11_COMMENT=			(without X11)
 tools_PKGNAMESUFFIX=		-tools
 tools_COMMENT=			(tools only)
-tools_CONFLICTS_INSTALL=	qemu qemu-devel qemu-nox11 qemu-utils qemu6* \
-				qemu70* qemu-guest-agent
+tools_CONFLICTS_INSTALL=	qemu qemu-nox11 qemu-guest-agent
 tools_DESCR=			${.CURDIR}/pkg-descr-tools
 tools_PLIST=			${.CURDIR}/pkg-plist-tools
 guestagent_PKGNAMESUFFIX=		-guest-agent
 guestagent_COMMENT=			(guest agent)
 guestagent_DESCR=		${.CURDIR}/pkg-descr-ga
 guestagent_PLIST=		${.CURDIR}/pkg-plist-ga
-guestagent_CONFLICTS_INSTALL=	qemu qemu-devel qemu-nox11 qemu-tools qemu-utils qemu6* \
-				qemu7* qemu-guest-agent
+guestagent_CONFLICTS_INSTALL=	qemu qemu-nox11 qemu-tools qemu-utils
 
 USES=		cpe gmake gnome ninja perl5 pkgconfig python:build shebangfix tar:xz
 SHEBANG_FILES=	scripts/xml-preprocess.py
@@ -58,9 +51,6 @@ USE_PERL5=	build
 .if ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent
 USES+=		iconv:wchar_t
 .endif
-.if (${FLAVOR:U} != nox11 && ${FLAVOR:U} != tools && ${FLAVOR:U} != guestagent)
-USE_GNOME+=	cairo
-.endif
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--cc=${CC} \
@@ -129,20 +119,17 @@ PORTDOCS=	.buildinfo _static/* about/* dbus-dbusindex.html devel/* docs \
 		searchindex.js specs/* system/* tools/* user/*
 
 OPTIONS_DEFINE=			CAPSTONE CDROM_DMA CURL DEBUG DOCS GNUTLS \
-				ISCSI JPEG OPENGL PNG SAMBA SASL STATIC_LINK \
-				STRIP USBREDIR VDE X11 X86_TARGETS
+				ISCSI JPEG PNG SAMBA SASL STATIC_LINK \
+				STRIP USBREDIR VDE X86_TARGETS
 OPTIONS_DEFAULT=		CDROM_DMA CURL GNUTLS JPEG NCURSES_DEFAULT \
-				OPENGL PNG SASL VDE X11
+				PNG SASL VDE
 OPTIONS_SINGLE=			NCURSES
 OPTIONS_SINGLE_NCURSES=		NCURSES_BASE NCURSES_DEFAULT NCURSES_PORT
-.if ${FLAVOR:U} == nox11
-OPTIONS_EXCLUDE:=		OPENGL X11
-.endif
 .if ${FLAVOR:U} == tools || ${FLAVOR:U} == guestagent
 OPTIONS_EXCLUDE:=		CAPSTONE CDROM_DMA CURL DEBUG GNUTLS ISCSI \
 				JPEG NCURSES NCURSES_BASE NCURSES_DEFAULT \
-				NCURSES_PORT OPENGL PNG SAMBA SASL STATIC_LINK \
-				USBREDIR VDE X11 X86_TARGETS
+				NCURSES_PORT PNG SAMBA SASL STATIC_LINK \
+				USBREDIR VDE X86_TARGETS
 .endif
 OPTIONS_SUB=			yes
 CAPSTONE_DESC=			Disassembly framework support
@@ -179,17 +166,12 @@ JPEG_CONFIGURE_OFF=		--disable-vnc-jpeg
 NCURSES_BASE_USES=		ncurses:base
 NCURSES_DEFAULT_USES=		ncurses
 NCURSES_PORT_USES=		ncurses:port
-OPENGL_USES=			gl
-OPENGL_USE=			GL=gbm,gl
-OPENGL_CONFIGURE_OFF=		--disable-opengl
 PNG_LIB_DEPENDS=		libpng.so:graphics/png
 PNG_CONFIGURE_OFF=		--disable-png
 SAMBA_USES=			samba:run # smbd
 SAMBA_CONFIGURE_ON=		--smbd=${LOCALBASE}/sbin/smbd
 SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_OFF=		--disable-vnc-sasl
-STATIC_LINK_PREVENTS=		X11
-STATIC_LINK_PREVENTS_MSG=	X11 ui cannot be built static
 STATIC_LINK_CONFIGURE_ON=	--static
 STRIP_CONFIGURE_OFF=		--disable-strip
 USBREDIR_BUILD_DEPENDS=		usbredir>=0.6:net/usbredir
@@ -197,12 +179,7 @@ USBREDIR_RUN_DEPENDS=		usbredir>=0.6:net/usbredir
 USBREDIR_CONFIGURE_OFF=		--disable-usb-redir
 VDE_LIB_DEPENDS=		libvdeplug.so:net/vde2
 VDE_CONFIGURE_OFF=		--disable-vde
-X11_USES=			sdl
-X11_USE=			GNOME=gdkpixbuf \
-				SDL=sdl2 \
-				XORG=x11,xext
-X11_CONFIGURE_ENABLE=		sdl
-.if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) && \
+.if (empty(FLAVOR) || ${FLAVOR:U} == nox11) && \
 	(${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent")
 X86_TARGETS_LIB_DEPENDS_OFF=	libdw.so:devel/elfutils
 X86_TARGETS_USES_OFF=		xorg
@@ -220,7 +197,7 @@ PLIST_SUB+=	NO_I386=""
 .endif
 .endif
 
-.if (empty(FLAVOR) || ${FLAVOR:U} == default || ${FLAVOR:U} == nox11) && \
+.if (empty(FLAVOR) || ${FLAVOR:U} == nox11) && \
 	(${FLAVOR:U} != tools || ${PKGNAMESUFFIX} != "-guest-agent")
 .if ${ARCH} == "amd64"
 MAKE_ARGS+=	ARCH=x86_64

emulators/qemu/pkg-plist

@@ -5,7 +5,6 @@ bin/qemu-edid
 %%BSDUSER%%bin/qemu-i386
 bin/qemu-img
 bin/qemu-io
-%%X11%%bin/qemu-keymap
 bin/qemu-nbd
 bin/qemu-storage-daemon
 %%BSDUSER%%%%NO_X86_TARGETS%%bin/qemu-riscv64