git: cfeac1c24090 - main - MOVED: Use the nox11 flavor for tshark and friends
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 04 Mar 2023 13:33:29 UTC
The branch main has been updated by marcus:
URL: https://cgit.FreeBSD.org/ports/commit/?id=cfeac1c240904956e60d7faefead1c1bcb33eefd
commit cfeac1c240904956e60d7faefead1c1bcb33eefd
Author: Joe Marcus Clarke <marcus@FreeBSD.org>
AuthorDate: 2023-03-04 13:31:38 +0000
Commit: Joe Marcus Clarke <marcus@FreeBSD.org>
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