svn commit: r501174 - in head/emulators: qemu qemu-utils

[Alan Somers]

Author: asomers (src committer)
Date: Fri May 10 13:15:47 2019
New Revision: 501174
URL: https://svnweb.freebsd.org/changeset/ports/501174

Log:
  emulators/qemu-utils: Don't depend on GTK3 or cairo.
  
  r499318 switched qemu from GTK2 to GTK3, accidentally making GTK3 a
  dependency of qemu-utils. This commit fixes that, and also removes cairo as
  a dependency for qemu-utils.
  
  PR:		237738
  Reported by:	bsam
  Reviewed by:	bsam, bofh
  Approved by:	bofh (qemu maintainer)
  Differential Revision:	https://reviews.freebsd.org/D20202

Modified:
  head/emulators/qemu-utils/Makefile
  head/emulators/qemu/Makefile

Modified: head/emulators/qemu-utils/Makefile
==============================================================================
--- head/emulators/qemu-utils/Makefile	Fri May 10 13:03:28 2019	(r501173)
+++ head/emulators/qemu-utils/Makefile	Fri May 10 13:15:47 2019	(r501174)
@@ -6,14 +6,14 @@ MAINTAINER=	asomers at FreeBSD.org
 COMMENT=	QEMU userland utilities
 
 HAS_CONFIGURE=	yes
-USES=		cpe gmake pkgconfig perl5 python:2.7,build tar:xz
+USES=		cpe gmake pkgconfig perl5 python:build tar:xz
 USES+=		gettext-runtime
 USE_GNOME+=	glib20
 MAKE_ENV+=	BSD_MAKE="${MAKE}" PREFIX=${PREFIX}
 CONFLICTS_INSTALL=	qemu-[0-9]* qemu-devel-* qemu-sbruno-*
 
 OPTIONS_SLAVE=	DOCS
-OPTIONS_EXCLUDE=	SAMBA X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CURL \
+OPTIONS_EXCLUDE=	SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \
 		CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \
 		STATIC_LINK NCURSES VDE
 MASTERDIR=	${.CURDIR}/../qemu

Modified: head/emulators/qemu/Makefile
==============================================================================
--- head/emulators/qemu/Makefile	Fri May 10 13:03:28 2019	(r501173)
+++ head/emulators/qemu/Makefile	Fri May 10 13:15:47 2019	(r501174)
@@ -86,7 +86,9 @@ VDE_LIB_DEPENDS=	libvdeplug.so:net/vde2
 X11_CONFIGURE_ENABLE=	sdl
 X11_USE=	SDL=sdl2 XORG=x11,xext
 X11_USES=	sdl
+.if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} != "-utils"
 X86_TARGETS_USE_OFF=	GNOME=cairo,gdkpixbuf2
+.endif
 
 PORTDOCS?=	docs qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \
 	       	qemu-qmp-ref.html qemu-qmp-ref.txt