From owner-svn-ports-all@freebsd.org Fri May 10 13:15:48 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 914E715A2BB5; Fri, 10 May 2019 13:15:48 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 36AC070B73; Fri, 10 May 2019 13:15:48 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0BB914CE7; Fri, 10 May 2019 13:15:48 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4ADFl1t076859; Fri, 10 May 2019 13:15:47 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4ADFlnN076858; Fri, 10 May 2019 13:15:47 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201905101315.x4ADFlnN076858@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Fri, 10 May 2019 13:15:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501174 - in head/emulators: qemu qemu-utils X-SVN-Group: ports-head X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in head/emulators: qemu qemu-utils X-SVN-Commit-Revision: 501174 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 36AC070B73 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.995,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 May 2019 13:15:48 -0000 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@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