From nobody Sat Dec 11 23:47:25 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B61AE18E17B8; Sat, 11 Dec 2021 23:47:25 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JBPZj3N2tz3jXr; Sat, 11 Dec 2021 23:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 45F0A1713A; Sat, 11 Dec 2021 23:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BBNlP7a086143; Sat, 11 Dec 2021 23:47:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BBNlPeV086142; Sat, 11 Dec 2021 23:47:25 GMT (envelope-from git) Date: Sat, 11 Dec 2021 23:47:25 GMT Message-Id: <202112112347.1BBNlPeV086142@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 8d18eafa625f - main - emulators/qemu: Add nox11 FLAVOR List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d18eafa625f7909693b8a166d8dac21acf61852 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639266445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vYDOQDVKAUWYz4wVzbl0GDo/do9xvMazG56PqDIxC88=; b=DnuE4WFaRn3UO6leQbhBO1xcP+5CUM+6lAH1TZiDGjt0URFGjOkjXxJLeevTufPx8QsJvl vjkqMA56gJjl6K/10bQjUGqxoC9DwjiQ48ZyhiAkK73pfamQxqkit5hAkk8oiIjrVLPTti HmIrpAcqq/CyHcVqk9bcs7+Zg6dAltDedS/W6E+P0EQ6TxWvdSBJg8yiopnnkE0Fxf0Z2K TK39au4gSf47x749ZTElziLU4SVHyWZam2/o9D7IEg+a07EdA4MAUO4/0jq77cbEY2LFLl Jegmp4vg2SZYvCtDKGscV38U7/UVX12W7sqn9lEcayJDf1pusXsUFlmSdeG+Dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639266445; a=rsa-sha256; cv=none; b=bhepPXGXqbCH8PjrYXal+sJvOrbQsbQycdOBTMyKvbjGVcywnrKnqalIECqduZBkW6CNGh xw0j5qVivalZEHwqvZ95jp3GF5Tz5vBO3yxjGVlIpBdI/rmaG+gsRzRkK0eOqezVBaVGkf BQkKx1aCLlaw9ndUV5GW2sbmAFYyHNE9qS+nU7DK/eEJW7W/T3GAlqsV0DtF08q278m9Zf Gi9hfxzRA2qUl2ITvuqxnf6iZwxG5YZtwCXqOE1Mkb2gFSOaJjYjcLfBkIRfsEmU3utuVI 6dxy3qzcNyOBE/gATCVINs28G31Lclrk5rdb+AlYprdUHssPTJgY9Tpd3NrJEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d18eafa625f7909693b8a166d8dac21acf61852 commit 8d18eafa625f7909693b8a166d8dac21acf61852 Author: Muhammad Moinur Rahman AuthorDate: 2021-12-11 23:45:39 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2021-12-11 23:47:07 +0000 emulators/qemu: Add nox11 FLAVOR - Fix build with DOCS unset [1] PR: 250733 [1] Reported by: xxjack12xx@gmail.com [1] --- emulators/qemu/Makefile | 18 +++++++++++++----- emulators/qemu/pkg-plist | 22 +++++++++++----------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index fa573051e78a..ba3fcef9bdec 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -2,7 +2,7 @@ PORTNAME= qemu PORTVERSION= 6.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ DIST_SUBDIR= qemu/${PORTVERSION} @@ -12,9 +12,7 @@ COMMENT?= QEMU CPU Emulator LICENSE= GPLv2 -BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${PY_FLAVOR}\ - ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \ - bash:shells/bash +BUILD_DEPENDS= bash:shells/bash LIB_DEPENDS?= libepoxy.so:graphics/libepoxy \ libfdt.so:sysutils/dtc \ libfontconfig.so:x11-fonts/fontconfig \ @@ -23,6 +21,12 @@ LIB_DEPENDS?= libepoxy.so:graphics/libepoxy \ libpcre2-8.so:devel/pcre2 \ libzstd.so:archivers/zstd +FLAVORS= default nox11 +default_CONFLICTS_INSTALL= qemu5* qemu42 qemu-devel +nox11_PKGNAMESUFFIX= -nox11 +nox11_CONFLICTS_INSTALL= qemu5* qemu42 qemu-devel +nox11_COMMENT= (without X11) + .if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent") ONLY_FOR_ARCHS= amd64 powerpc powerpc64 powerpc64 powerpc64le USES= bison compiler:c11 cpe gmake gnome iconv:wchar_t ninja perl5 \ @@ -40,6 +44,9 @@ OPTIONS_SINGLE_NCURSES= NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT OPTIONS_DEFINE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL VDE \ CDROM_DMA USBREDIR X86_TARGETS STATIC_LINK DOCS ISCSI CAPSTONE DEBUG OPTIONS_DEFAULT=X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL NCURSES_DEFAULT VDE +.if ${FLAVOR:U} == nox11 +OPTIONS_EXCLUDE:= GTK3 X11 +.endif OPTIONS_SUB= yes CAPSTONE_DESC= Disassembly framework support CDROM_DMA_DESC= IDE CDROM DMA @@ -62,8 +69,9 @@ CAPSTONE_LIB_DEPENDS= libcapstone.so:devel/capstone4 CURL_CONFIGURE_OFF= --disable-curl CURL_LIB_DEPENDS= libcurl.so:ftp/curl DEBUG_CONFIGURE_ON= --enable-debug +DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} DOCS_CONFIGURE_ENABLE= docs -DOCS_USES= makeinfo GNUTLS_CONFIGURE_OFF= --disable-gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GTK3_CONFIGURE_OFF= --disable-gtk --disable-vte diff --git a/emulators/qemu/pkg-plist b/emulators/qemu/pkg-plist index 91a3cfabc794..d1492cc97c8a 100644 --- a/emulators/qemu/pkg-plist +++ b/emulators/qemu/pkg-plist @@ -39,17 +39,17 @@ bin/qemu-system-x86_64 %%NO_X86_TARGETS%%bin/qemu-system-xtensaeb bin/qemu-x86_64 include/qemu-plugin.h -man/man1/qemu.1.gz -man/man1/qemu-img.1.gz -man/man7/qemu-block-drivers.7.gz -man/man7/qemu-cpu-models.7.gz -man/man8/qemu-ga.8.gz -man/man7/qemu-ga-ref.7.gz -man/man8/qemu-nbd.8.gz -man/man8/qemu-pr-helper.8.gz -man/man7/qemu-qmp-ref.7.gz -man/man1/qemu-storage-daemon.1.gz -man/man7/qemu-storage-daemon-qmp-ref.7.gz +%%PORTDOCS%%man/man1/qemu.1.gz +%%PORTDOCS%%man/man1/qemu-img.1.gz +%%PORTDOCS%%man/man7/qemu-block-drivers.7.gz +%%PORTDOCS%%man/man7/qemu-cpu-models.7.gz +%%PORTDOCS%%man/man8/qemu-ga.8.gz +%%PORTDOCS%%man/man7/qemu-ga-ref.7.gz +%%PORTDOCS%%man/man8/qemu-nbd.8.gz +%%PORTDOCS%%man/man8/qemu-pr-helper.8.gz +%%PORTDOCS%%man/man7/qemu-qmp-ref.7.gz +%%PORTDOCS%%man/man1/qemu-storage-daemon.1.gz +%%PORTDOCS%%man/man7/qemu-storage-daemon-qmp-ref.7.gz @sample etc/qemu-ifup.sample @sample etc/qemu-ifdown.sample %%DATADIR%%/QEMU,tcx.bin