CVS commit: pkgsrc/net/wireshark

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Sat May  3 17:26:03 UTC 2025

Modified Files:
        pkgsrc/net/wireshark: Makefile PLIST options.mk

Log Message:
wireshark: Add doc option

Install man pages and documentation, disabled by default to be consistent with
previous state.

XXX: We need "../../lang/ruby/rubyversion.mk" for specifying ruby-asciidoctor
XXX: but at the same time it performs unrelated PLIST substitution that should
XXX: not be done here. A PRINT_PLIST_AWK undo such substitution but maybe it
XXX: would be nice to be able to refers to RUBY_PKGPREFIX without bringing Ruby
XXX: related PLIST vars substitution.


To generate a diff of this commit:
cvs rdiff -u -r1.332 -r1.333 pkgsrc/net/wireshark/Makefile
cvs rdiff -u -r1.98 -r1.99 pkgsrc/net/wireshark/PLIST
cvs rdiff -u -r1.37 -r1.38 pkgsrc/net/wireshark/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/wireshark/Makefile
diff -u pkgsrc/net/wireshark/Makefile:1.332 pkgsrc/net/wireshark/Makefile:1.333
--- pkgsrc/net/wireshark/Makefile:1.332 Thu Apr 24 14:15:30 2025
+++ pkgsrc/net/wireshark/Makefile       Sat May  3 17:26:03 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.332 2025/04/24 14:15:30 wiz Exp $
+# $NetBSD: Makefile,v 1.333 2025/05/03 17:26:03 leot Exp $
 
 DISTNAME=      wireshark-4.4.6
 PKGREVISION=   3
@@ -18,7 +18,6 @@ DEPENDS+=     lemon-[0-9]*:../../devel/lemon
 CMAKE_CONFIGURE_ARGS+=         -DCMAKE_BUILD_TYPE=Release
 CMAKE_CONFIGURE_ARGS+=         -DENABLE_APPLICATION_BUNDLE=OFF
 CMAKE_CONFIGURE_ARGS+=         -DVCSVERSION_OVERRIDE=${PKGVERSION_NOREV}
-CMAKE_CONFIGURE_ARGS+=         -DCMAKE_DISABLE_FIND_PACKAGE_Asciidoctor=TRUE
 
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake perl pkg-config bison lex

Index: pkgsrc/net/wireshark/PLIST
diff -u pkgsrc/net/wireshark/PLIST:1.98 pkgsrc/net/wireshark/PLIST:1.99
--- pkgsrc/net/wireshark/PLIST:1.98     Thu Apr 17 04:50:59 2025
+++ pkgsrc/net/wireshark/PLIST  Sat May  3 17:26:03 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.98 2025/04/17 04:50:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.99 2025/05/03 17:26:03 leot Exp $
 bin/capinfos
 bin/captype
 bin/dumpcap
@@ -49,10 +49,55 @@ lib/wireshark/plugins/4.4/epan/wimax.so
 lib/wireshark/plugins/4.4/epan/wimaxasncp.so
 lib/wireshark/plugins/4.4/epan/wimaxmacphy.so
 lib/wireshark/plugins/4.4/wiretap/usbdump.so
+${PLIST.doc}man/man1/androiddump.1
+${PLIST.doc}man/man1/capinfos.1
+${PLIST.doc}man/man1/captype.1
+${PLIST.doc}man/man1/ciscodump.1
+${PLIST.doc}man/man1/dumpcap.1
+${PLIST.doc}man/man1/editcap.1
+${PLIST.doc}man/man1/etwdump.1
+${PLIST.doc}man/man1/falcodump.1
+${PLIST.doc}man/man1/mergecap.1
+${PLIST.doc}man/man1/mmdbresolve.1
+${PLIST.doc}man/man1/randpkt.1
+${PLIST.doc}man/man1/randpktdump.1
+${PLIST.doc}man/man1/rawshark.1
+${PLIST.doc}man/man1/reordercap.1
+${PLIST.doc}man/man1/sshdump.1
+${PLIST.doc}man/man1/text2pcap.1
+${PLIST.doc}man/man1/tshark.1
+${PLIST.doc}man/man1/udpdump.1
+${PLIST.doc}man/man1/wifidump.1
+${PLIST.doc}man/man1/wireshark.1
+${PLIST.doc}man/man4/extcap.4
+${PLIST.doc}man/man4/wireshark-filter.4
 ${PLIST.icons}share/applications/org.wireshark.Wireshark.desktop
 share/doc/wireshark/COPYING
 share/doc/wireshark/README.xml-output
+${PLIST.doc}share/doc/wireshark/androiddump.html
+${PLIST.doc}share/doc/wireshark/capinfos.html
+${PLIST.doc}share/doc/wireshark/captype.html
+${PLIST.doc}share/doc/wireshark/ciscodump.html
+${PLIST.doc}share/doc/wireshark/dumpcap.html
+${PLIST.doc}share/doc/wireshark/editcap.html
+${PLIST.doc}share/doc/wireshark/etwdump.html
+${PLIST.doc}share/doc/wireshark/extcap.html
+${PLIST.doc}share/doc/wireshark/falcodump.html
+${PLIST.doc}share/doc/wireshark/mergecap.html
+${PLIST.doc}share/doc/wireshark/mmdbresolve.html
 share/doc/wireshark/pdml2html.xsl
+${PLIST.doc}share/doc/wireshark/randpkt.html
+${PLIST.doc}share/doc/wireshark/randpktdump.html
+${PLIST.doc}share/doc/wireshark/rawshark.html
+${PLIST.doc}share/doc/wireshark/release-notes.html
+${PLIST.doc}share/doc/wireshark/reordercap.html
+${PLIST.doc}share/doc/wireshark/sshdump.html
+${PLIST.doc}share/doc/wireshark/text2pcap.html
+${PLIST.doc}share/doc/wireshark/tshark.html
+${PLIST.doc}share/doc/wireshark/udpdump.html
+${PLIST.doc}share/doc/wireshark/wifidump.html
+${PLIST.doc}share/doc/wireshark/wireshark-filter.html
+${PLIST.doc}share/doc/wireshark/wireshark.html
 share/doc/wireshark/ws.css
 ${PLIST.icons}share/icons/hicolor/128x128/apps/org.wireshark.Wireshark.png
 ${PLIST.icons}share/icons/hicolor/128x128/mimetypes/application-vnd.tcpdump.pcap.png

Index: pkgsrc/net/wireshark/options.mk
diff -u pkgsrc/net/wireshark/options.mk:1.37 pkgsrc/net/wireshark/options.mk:1.38
--- pkgsrc/net/wireshark/options.mk:1.37        Sat May  3 16:52:35 2025
+++ pkgsrc/net/wireshark/options.mk     Sat May  3 17:26:03 2025
@@ -1,14 +1,27 @@
-# $NetBSD: options.mk,v 1.37 2025/05/03 16:52:35 leot Exp $
+# $NetBSD: options.mk,v 1.38 2025/05/03 17:26:03 leot Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.wireshark
-PKG_SUPPORTED_OPTIONS=         http2 http3 ilbc lua spandsp
+PKG_SUPPORTED_OPTIONS=         doc http2 http3 ilbc lua spandsp
 PKG_OPTIONS_OPTIONAL_GROUPS=   gui
 PKG_OPTIONS_GROUP.gui=         qt5 qt6
 PKG_SUGGESTED_OPTIONS=         http2 http3 lua qt6
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   icons ilbc qt spandsp
+PLIST_VARS+=   doc icons ilbc qt spandsp
+
+.if !empty(PKG_OPTIONS:Mdoc)
+.  include "../../lang/ruby/rubyversion.mk"
+# XXX: Undo inopportune RUBY_DLEXT PLIST var replacement
+PRINT_PLIST_AWK+=      /\$${RUBY_DLEXT}$$/ { gsub(/\$${RUBY_DLEXT}$$/, "${RUBY_DLEXT}") }
+PLIST.doc=              yes
+PRINT_PLIST_AWK+=      /^man\// { $$0 = "$${PLIST.doc}" $$0 }
+PRINT_PLIST_AWK+=      /^share\/doc\/.*\.html$$/ { $$0 = "$${PLIST.doc}" $$0 }
+TOOL_DEPENDS+=          libxslt-[0-9]*:../../textproc/libxslt
+TOOL_DEPENDS+=          ${RUBY_PKGPREFIX}-asciidoctor>=1.5:../../textproc/ruby-asciidoctor
+.else
+CMAKE_CONFIGURE_ARGS+=  -DCMAKE_DISABLE_FIND_PACKAGE_Asciidoctor=TRUE
+.endif
 
 .if !empty(PKG_OPTIONS:Mhttp2)
 .  include "../../www/nghttp2/buildlink3.mk"