svn commit: r507920 - in head/net: tshark-lite wireshark wireshark-lite

[Joe Marcus Clarke]

Author: marcus
Date: Fri Aug  2 23:19:07 2019
New Revision: 507920
URL: https://svnweb.freebsd.org/changeset/ports/507920

Log:
  Unconditionally install dumpcap.
  
  This is required to actually be able to capture packets with tshark.
  
  PR:		239601

Modified:
  head/net/tshark-lite/Makefile
  head/net/wireshark-lite/Makefile
  head/net/wireshark/Makefile
  head/net/wireshark/pkg-plist

Modified: head/net/tshark-lite/Makefile
==============================================================================
--- head/net/tshark-lite/Makefile	Fri Aug  2 22:47:06 2019	(r507919)
+++ head/net/tshark-lite/Makefile	Fri Aug  2 23:19:07 2019	(r507920)
@@ -1,7 +1,7 @@
 # Created by: Bill Fumerola <billf at mu.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 
 LITE=		yes
 

Modified: head/net/wireshark-lite/Makefile
==============================================================================
--- head/net/wireshark-lite/Makefile	Fri Aug  2 22:47:06 2019	(r507919)
+++ head/net/wireshark-lite/Makefile	Fri Aug  2 23:19:07 2019	(r507920)
@@ -1,6 +1,8 @@
 # Created by: Bill Fumerola <billf at mu.org>
 # $FreeBSD$
 
+PORTREVISION=	1
+
 LITE=		yes
 
 CONFLICTS_INSTALL?=	wireshark-[0-9]* tshark-[0-9]* tshark-lite-[0-9]*

Modified: head/net/wireshark/Makefile
==============================================================================
--- head/net/wireshark/Makefile	Fri Aug  2 22:47:06 2019	(r507919)
+++ head/net/wireshark/Makefile	Fri Aug  2 23:19:07 2019	(r507920)
@@ -43,7 +43,7 @@ LIB_DEPENDS+=	libgpg-error.so:security/libgpg-error \
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \
-    reordercap captype randpktdump udpdump sharkd dumpcap
+    reordercap captype randpktdump udpdump sharkd
 .if defined(LITE)
 PKGNAMESUFFIX=		-lite
 PLIST_SUB+=		${x:tu}="@comment $x not installed" \

Modified: head/net/wireshark/pkg-plist
==============================================================================
--- head/net/wireshark/pkg-plist	Fri Aug  2 22:47:06 2019	(r507919)
+++ head/net/wireshark/pkg-plist	Fri Aug  2 23:19:07 2019	(r507920)
@@ -2,7 +2,7 @@
 %%CAPTYPE%%
 @group network
 @mode 2555
-%%DUMPCAP%%
+bin/dumpcap
 @mode
 @group
 %%EDITCAP%%
@@ -649,7 +649,7 @@ libdata/pkgconfig/wireshark.pc
 %%CAPTYPE_MAN%%man/man1/captype.1.gz
 %%CISCODUMP_MAN%%man/man1/ciscodump.1.gz
 %%DFTEST_MAN%%man/man1/dftest.1.gz
-%%DUMPCAP_MAN%%man/man1/dumpcap.1.gz
+man/man1/dumpcap.1.gz
 %%EDITCAP_MAN%%man/man1/editcap.1.gz
 %%MERGECAP_MAN%%man/man1/mergecap.1.gz
 %%MAXMIND%%man/man1/mmdbresolve.1.gz