Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Nov 2025 20:47:22 +0000
From:      Joe Marcus Clarke <marcus@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Cc:        Sergey A. Osokin <osa@FreeBSD.org>
Subject:   git: 0dc0a4b63472 - main - net/wireshark: Fix packaging
Message-ID:  <691f7e5a.2e74d.2748c4d6@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by marcus:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0dc0a4b63472f4b232cdd1fc454d43f289ae839b

commit 0dc0a4b63472f4b232cdd1fc454d43f289ae839b
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2025-11-20 20:45:55 +0000
Commit:     Joe Marcus Clarke <marcus@FreeBSD.org>
CommitDate: 2025-11-20 20:47:16 +0000

    net/wireshark: Fix packaging
    
    Grrr, my OPTIONS had changed and I was no longer installing dev bits.
    Correct the plist with the header changes and sort/update the base
    LIB_DEPENDS.
    
    PR:             291114
---
 net/wireshark/Makefile  | 12 +++++++-----
 net/wireshark/pkg-plist |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 60bc533c8ee5..55e18e3ac44d 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	wireshark
 DISTVERSION=	4.6.1
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://1.na.dl.wireshark.org/src/ \
 		https://1.eu.dl.wireshark.org/src/ \
@@ -17,16 +18,17 @@ WWW=		https://www.wireshark.org/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
+LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
+		libcares.so:dns/c-ares \
 		libgcrypt.so:security/libgcrypt \
 		liblz4.so:archivers/liblz4 \
 		libnghttp2.so:www/libnghttp2 \
 		libnghttp3.so:www/libnghttp3 \
-		libbrotlidec.so:archivers/brotli \
+		libpcre2-8.so:devel/pcre2 \
 		libsnappy.so:archivers/snappy \
-		libcares.so:dns/c-ares \
-		libzstd.so:archivers/zstd \
-		libspeexdsp.so:audio/speexdsp
+		libspeexdsp.so:audio/speexdsp \
+		libxxhash.so:devel/xxhash \
+		libzstd.so:archivers/zstd
 
 FLAVORS=	default nox11
 FLAVOR?=	${FLAVORS:[1]}
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index d182193e4ec1..04b5349c8a4b 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -17,10 +17,12 @@ bin/sharkd
 bin/text2pcap
 bin/tshark
 %%GUI%%bin/wireshark
-%%DEVELOPMENT%%include/wireshark/bits.h
+%%DEVELOPMENT%%include/wireshark/c128/bits.h
+%%DEVELOPMENT%%include/wireshark/c128/endian.h
+%%DEVELOPMENT%%include/wireshark/c128/integer.h
+%%DEVELOPMENT%%include/wireshark/c128/types.h
 %%DEVELOPMENT%%include/wireshark/cfile.h
 %%DEVELOPMENT%%include/wireshark/cli_main.h
-%%DEVELOPMENT%%include/wireshark/endian.h
 %%DEVELOPMENT%%include/wireshark/epan/addr_resolv.h
 %%DEVELOPMENT%%include/wireshark/epan/address.h
 %%DEVELOPMENT%%include/wireshark/epan/address_types.h
@@ -575,9 +577,7 @@ bin/tshark
 %%DEVELOPMENT%%include/wireshark/epan/wscbor.h
 %%DEVELOPMENT%%include/wireshark/epan/wscbor_enc.h
 %%DEVELOPMENT%%include/wireshark/file.h
-%%DEVELOPMENT%%include/wireshark/integer.h
 %%DEVELOPMENT%%include/wireshark/jtckdint.h
-%%DEVELOPMENT%%include/wireshark/types.h
 %%DEVELOPMENT%%include/wireshark/wireshark.h
 %%DEVELOPMENT%%include/wireshark/wiretap/file_wrappers.h
 %%DEVELOPMENT%%include/wireshark/wiretap/introspection.h


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?691f7e5a.2e74d.2748c4d6>