From nobody Sat Mar 4 13:33:29 2023 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 4PTQlY3DNqz3w2Wq; Sat, 4 Mar 2023 13:33:29 +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 4PTQlY2f7fz4MVv; Sat, 4 Mar 2023 13:33:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677936809; 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=Nr9sJldorXagtmVIGX4OGxqzNhCiTxqCLSwlkVJGV/k=; b=UqEBi/Ndy+GWvmu89dIvCK+bjC5qjOL9b9fPx2eEl9Tg1hHlDF9be0UR5N0YUAMSDGPSLV AcQ7TE7NI8R6rbo2zRmA/p1fhGSRmXhAsh/XsEpkZVTGYyNn60lue38iUWxlCz58OUTwg2 cj1lhKE0CgGAMi34kA7wlXHZ/H5jcq6nR/2Hae4XfxHqyjkgeULFjE48SyIOSSdgoW7vRB jOCuv16BTZjaawquOChQqaR54M3aBKU1ijb31x6uwAm/ZiBCyj5em4dOM4pAKim/9/vGaT OIQdfaikNxWyC3wFxV+fygF01bQPaDjN8/pNpuPJBZXWvSChiCV8JOIjCdDPpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677936809; 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=Nr9sJldorXagtmVIGX4OGxqzNhCiTxqCLSwlkVJGV/k=; b=cpIwd81NB4zV/7U4q5NxWWGtMVejrSu7Fe5j8bZQs2AsbcVgtKlWT+vGgr6v/UD0WzuVcp FEEdMcMvcD0SWToheudlXz3K6iPAc1KKFCxD193YmjMhwDJzYu09WqMJ+Vxf7/TXyZ26GL IKHthlTEb0kKSBt8qpMo0PZcWaFjnnzFAovGEseoFqdBZzLewg+uYmeZrb2/79fhrfC8QQ xmZ3TWqSFheRMdEZKB3BiAE+gPLQwCtomCUmxOJ8+IMDeigIMZlod0n4JcmsLpphLwKNOv nLVqBQU+1FBcLEg/N1T0CDFqsM8XHphLtOYPidID3xQe9kQnWaJto2j5fBYl+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677936809; a=rsa-sha256; cv=none; b=dPLRVRHphK5RIjmh1vpOcDaL/4iQDJvjUrUSeW+s8aVJBPKjqkoLiMhyMh6OL1PxCgd40N BxnZnFEfv4cXk4DMOVGye2bzIbLromiVPGFsrHdapXd4p+iwcUGKqxXhqna1JppkkQ4DDT 11DuoX7GITCTD5grPsiDfknUd9mMhce2AnKUoeaUyRCqGgEejUqIyTSsfIIbhEOdsEQCy/ DQtJYa6Bo1u0VX26kx3mXva/7Y0pkN0EajQfJ3KuswXrXtulHLFyLnIUhbL2jux2ZdkBL9 mhUvayPLQSSNSEejHkCIcpaHTQDgL9x7y8mgaQGMslmecb7GflxYabcnpZUDpA== 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 4PTQlY1g0QzhZh; Sat, 4 Mar 2023 13:33:29 +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 324DXT1P005203; Sat, 4 Mar 2023 13:33:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 324DXTNo005202; Sat, 4 Mar 2023 13:33:29 GMT (envelope-from git) Date: Sat, 4 Mar 2023 13:33:29 GMT Message-Id: <202303041333.324DXTNo005202@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joe Marcus Clarke Subject: git: cfeac1c24090 - main - MOVED: Use the nox11 flavor for tshark and friends 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: marcus X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cfeac1c240904956e60d7faefead1c1bcb33eefd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=cfeac1c240904956e60d7faefead1c1bcb33eefd commit cfeac1c240904956e60d7faefead1c1bcb33eefd Author: Joe Marcus Clarke AuthorDate: 2023-03-04 13:31:38 +0000 Commit: Joe Marcus Clarke CommitDate: 2023-03-04 13:31:38 +0000 MOVED: Use the nox11 flavor for tshark and friends This includes net/py-pyshark, net/termshark, and the samba ports for testing. Reported by: mat --- MOVED | 4 ++-- net/py-pyshark/Makefile | 4 ++-- net/samba413/Makefile | 2 +- net/samba416/Makefile | 2 +- net/termshark/Makefile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MOVED b/MOVED index 06553cac91a7..a1d09dfd3cbb 100644 --- a/MOVED +++ b/MOVED @@ -17773,6 +17773,6 @@ www/mediawiki137||2023-02-28|Has expired: End of life upstream, users are recomm games/veloren|games/veloren-weekly|2023-03-02|Using releases is currently discouraged upstream accessibility/atk|accessibility/at-spi2-core|2023-03-02|Integrated into other package accessibility/at-spi2-atk|accessibility/at-spi2-core|2023-03-02|Integrated into other package -net/tshark|net/wireshark|2023-03-03|Tshark is now the nox11 flavor of wireshark -net/tshark-lite|net/wireshark|2023-03-03|Tshark is now the nox11 flavor of wireshark +net/tshark|net/wireshark@nox11|2023-03-03|Tshark is now the nox11 flavor of wireshark +net/tshark-lite|net/wireshark@nox11|2023-03-03|Tshark is now the nox11 flavor of wireshark net/wireshark-lite|net/wireshark|2023-03-03|The lite port of wireshark can be controlled with OPTIONS diff --git a/net/py-pyshark/Makefile b/net/py-pyshark/Makefile index a7c576cc6fa4..bd06e4ee8a98 100644 --- a/net/py-pyshark/Makefile +++ b/net/py-pyshark/Makefile @@ -1,6 +1,6 @@ PORTNAME= pyshark PORTVERSION= 0.5.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +15,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=0:devel/py-appdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}py>=0:devel/py-py@${PY_FLAVOR} \ - tshark:net/wireshark + tshark:net/wireshark@nox11 TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} diff --git a/net/samba413/Makefile b/net/samba413/Makefile index db01c734e9bc..32c8adffe4b7 100644 --- a/net/samba413/Makefile +++ b/net/samba413/Makefile @@ -259,7 +259,7 @@ TEST_ENV+= PYTHON="${PYTHON_CMD}" \ PYTHONDONTWRITEBYTECODE=1 TEST_DEPENDS+= bash:shells/bash \ - tshark:net/wireshark + tshark:net/wireshark@nox11 # External Python modules TEST_BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} TEST_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} diff --git a/net/samba416/Makefile b/net/samba416/Makefile index 7f164b68c26d..454f4c83ae7e 100644 --- a/net/samba416/Makefile +++ b/net/samba416/Makefile @@ -279,7 +279,7 @@ TEST_ENV= PYTHON="${PYTHON_CMD}" \ PYTHONDONTWRITEBYTECODE=1 TEST_DEPENDS= bash:shells/bash \ - tshark:net/wireshark + tshark:net/wireshark@nox11 # External Python modules TEST_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} TEST_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR} diff --git a/net/termshark/Makefile b/net/termshark/Makefile index 2366db044f04..4645df9b0f65 100644 --- a/net/termshark/Makefile +++ b/net/termshark/Makefile @@ -15,7 +15,7 @@ USES= go:modules OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= -X11_RUN_DEPENDS_OFF= tshark>0:net/wireshark +X11_RUN_DEPENDS_OFF= tshark>0:net/wireshark@nox11 X11_RUN_DEPENDS= wireshark>0:net/wireshark GO_MODULE= github.com/gcla/termshark/v2