Index: head/net/wireshark/files/patch-configure =================================================================== --- head/net/wireshark/files/patch-configure (revision 401778) +++ head/net/wireshark/files/patch-configure (nonexistent) @@ -1,20 +0,0 @@ ---- configure.orig 2015-05-12 20:26:44 UTC -+++ configure -@@ -35189,7 +35189,7 @@ $as_echo "yes" >&6; } - # searches the specified directory. - # - CPPFLAGS="$CPPFLAGS -I$krb5_dir/include" -- ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'` -+ ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'` - # MIT Kerberos moved krb5.h to krb5/krb5.h starting with release 1.5 - ac_mit_version_olddir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'` - ac_mit_version_newdir=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'` -@@ -35249,7 +35249,7 @@ fi - - if test -x "$KRB5_CONFIG" - then -- KRB5_FLAGS=`"$KRB5_CONFIG" --cflags` -+ KRB5_FLAGS=`"$KRB5_CONFIG" --cflags | sed -e 's/@INCLUDE_des@//g'` - KRB5_LIBS=`"$KRB5_CONFIG" --libs` - CPPFLAGS="$CPPFLAGS $KRB5_FLAGS" - # Property changes on: head/net/wireshark/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/wireshark/files/pkg-message =================================================================== --- head/net/wireshark/files/pkg-message (revision 401778) +++ head/net/wireshark/files/pkg-message (nonexistent) @@ -1,17 +0,0 @@ -=============================================================================== - -In order for wireshark be able to capture packets when used by unprivileged -user, /dev/bpf should be in network group and have read-write permissions. -For example: - -# chgrp network /dev/bpf* -# chmod g+r /dev/bpf* -# chmod g+w /dev/bpf* - -In order for this to persist across reboots, add the following to -/etc/devfs.conf: - -own bpf* root:network -perm bpf* 0660 - -=============================================================================== Property changes on: head/net/wireshark/files/pkg-message ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/wireshark/Makefile =================================================================== --- head/net/wireshark/Makefile (revision 401778) +++ head/net/wireshark/Makefile (revision 401779) @@ -1,205 +1,147 @@ # Created by: Bill Fumerola # $FreeBSD$ PORTNAME?= wireshark PORTVERSION= 1.12.8 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ http://ftp.uni-kl.de/pub/wireshark/src/ \ http://wireshark.askapache.com/download/src/all-versions/ \ ftp://ftp.uni-kl.de/pub/wireshark/src/ \ http://prdownloads.sourceforge.net/wireshark/ \ http://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \ ftp://ftp.yz.yamagata-u.ac.jp/pub/network/security/wireshark/src/ \ http://wireshark.zing.org/download/src/ -DISTNAME= ${DATADIR_NAME}-${PORTVERSION} MAINTAINER= marcus@FreeBSD.org COMMENT?= Powerful network analyzer/capture tool LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -DATADIR_NAME= wireshark +CONFLICTS?= wireshark-qt5-[0-9]* +GNU_CONFIGURE= yes +USES= alias cpe gmake libtool perl5 pkgconfig python:build tar:bzip2 USE_PERL5= build -USES= alias cpe gettext gmake iconv libtool perl5 pkgconfig \ - python:build tar:bzip2 -WANT_GNOME= yes +USE_GNOME= glib20 USE_OPENSSL= yes -CONFLICTS?= wireshark-qt5-[0-9]* - CONFIGURE_ARGS+= --program-transform-name="" \ - --with-ssl=${OPENSSLBASE} \ - --with-qt=no + --with-ssl=${OPENSSLBASE} +INSTALL_TARGET= install-strip USE_LDCONFIG= yes -DATADIR= ${PREFIX}/share/${DATADIR_NAME} + CFLAGS+= -funit-at-a-time LIBS+= -L${LOCALBASE}/lib +PLIST_SUB+= PORTVERSION=${PORTVERSION} -DESKTOP_ENTRIES= "Wireshark" "Network Protocol Analyzer" \ - "${DATADIR}/hi48-app-wireshark.png" \ - "wireshark" "System;Monitor;GTK;" true - .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \ reordercap captype .if defined(LITE) PLIST_SUB+= ${x:tu}="@comment $x not installed" \ ${x:tu}_MAN="@comment $x not installed " CONFIGURE_ARGS+= --enable-$x=no .else PLIST_SUB+= ${x:tu}=bin/$x \ ${x:tu}_MAN="" .endif .endfor -.if !defined(LITE) -OPTIONS_DEFINE= RTP SNMP ADNS PCRE IPV6 GEOIP LUA CARES GSSAPI X11 \ - GNUTLS GCRYPT THREADS +OPTIONS_DEFINE= RTP SNMP IPV6 GEOIP LUA GCRYPT GNUTLS -OPTIONS_RADIO= GUI -OPTIONS_RADIO_GUI= GTK3 QT5 +OPTIONS_RADIO= ASYNCDNS GUI +OPTIONS_SINGLE= KERBEROS -OPTIONS_DEFAULT?= SNMP ADNS PCRE IPV6 GEOIP GSSAPI X11 GTK3 +OPTIONS_RADIO_ASYNCDNS= ADNS CARES +OPTIONS_RADIO_GUI= GTK2 GTK3 QT5 +OPTIONS_SINGLE_KERBEROS=KRB_BASE KRB_HEIMDAL KRB_MIT KRB_NONE +OPTIONS_DEFAULT?= SNMP ADNS IPV6 GEOIP KRB_BASE GTK3 + RTP_DESC= Enable support for playing back RTP streams -ADNS_DESC= Enable asynchronous DNS lookup support -.endif +GCRYPT_DESC= IPsec decryption support +GNUTLS_DESC= SSL decryption support +ASYNCDNS_DESC= Asynchronous DNS lookup support +ADNS_DESC= Asynchronous DNS resolution via GNU adns +KERBEROS_DESC= Kerberos dissection support +KRB_BASE_DESC= Kerberos support via base system +KRB_HEIMDAL_DESC= Kerberos support via security/heimdal +KRB_MIT_DESC= Kerberos support via security/krb5 +KRB_NONE_DESC= Disable Kerberos support -.include +GTK2_USE= GNOME=gtk20 +GTK3_USE= GNOME=gtk30 +QT5_USE= QT5=core,gui,widgets,printsupport,buildtools_build -.if ${PORT_OPTIONS:MX11} -USE_XORG= x11 -.endif +LUA_USES= lua:5[1-2] +KRB_BASE_USES= gssapi +KRB_HEIMDAL_USES= gssapi:heimdal +KRB_MIT_USES= gssapi:mit -.if ${PORT_OPTIONS:MX11} -PLIST_SUB+= WIRESHARK=bin/wireshark WIRESHARK_MAN="" -.else -PLIST_SUB+= WIRESHARK="@comment wireshark not built" \ - WIRESHARK_MAN="@comment wireshark not built " -USE_GNOME+= glib20 -CONFIGURE_ARGS+= --enable-wireshark=no \ - --disable-gtktest -.endif +RTP_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio +SNMP_LIB_DEPENDS= libsmi.so:${PORTSDIR}/net-mgmt/libsmi +ADNS_LIB_DEPENDS= libadns.so:${PORTSDIR}/dns/adns +CARES_LIB_DEPENDS= libcares.so:${PORTSDIR}/dns/c-ares +GEOIP_LIB_DEPENDS= libGeoIP.so:${PORTSDIR}/net/GeoIP +GCRYPT_LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls -.if ${PORT_OPTIONS:MGTK3} -USE_GNOME+= gtk30 -CONFIGURE_ARGS+= --with-gtk2=no \ - --with-gtk3=yes \ - --with-qt=no -.endif +IPV6_CONFIGURE_ENABLE= ipv6 -.if ${PORT_OPTIONS:MQT5} -CONFIGURE_ARGS+= --with-gtk2=no \ - --with-gtk3=no \ - --with-qt=yes -USE_QT5+= core widgets printsupport buildtools_build -PKGNAMESUFFIX+= -qt5 -MAKE_ENV+= PATH="${PATH}:${LOCALBASE}/lib/qt5/bin" -CONFIGURE_ENV+= PATH="${PATH}:${LOCALBASE}/lib/qt5/bin" -.endif +KRB_NONE_CONFIGURE_ON= --without-krb5 +KRB_NONE_CONFIGURE_OFF= --with-krb5 +KRB_NONE_CONFIGURE_ENV_OFF= KRB5_CONFIG=${KRB5CONFIG} -GNU_CONFIGURE= yes -PLIST_SUB+= PORTVERSION=${PORTVERSION} +GTK2_CONFIGURE_WITH= gtk2 +GTK3_CONFIGURE_WITH= gtk3 +QT5_CONFIGURE_WITH= qt +LUA_CONFIGURE_WITH= lua +RTP_CONFIGURE_WITH= portaudio +SNMP_CONFIGURE_WITH= libsmi +ADNS_CONFIGURE_WITH= adns +CARES_CONFIGURE_WITH= c-ares +GEOIP_CONFIGURE_WITH= geoip +GCRYPT_CONFIGURE_WITH= gcrypt +GNUTLS_CONFIGURE_WITH= gnutls -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+= --enable-ipv6=yes -.else -CONFIGURE_ARGS+= --enable-ipv6=no -.endif +LUA_CPPFLAGS= -I${LUA_INCDIR} -# XXX - untested -.if ${PORT_OPTIONS:MTHREADS} -CONFIGURE_ARGS+= --enable-threads -.endif +QT5_MAKE_ENV= PATH="${PATH}:${QT_BINDIR}" +QT5_VARS= PKGNAMESUFFIX=-qt5 -.if ${PORT_OPTIONS:MPCRE} && !defined(LITE) -LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre -CONFIGURE_ARGS+= --with-pcre=${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --with-pcre=no -.endif +OPTIONS_SUB= LUA -.if ${PORT_OPTIONS:MLUA} && !defined(LITE) -USES+= lua:51 -CONFIGURE_ARGS+=--with-lua=${PREFIX} -CFLAGS+= -I${LUA_INCDIR} -CPPFLAGS+= -I${LUA_INCDIR} -PLIST_SUB+= LUA="" -.else -CONFIGURE_ARGS+=--without-lua -PLIST_SUB+= LUA="@comment " -.endif +.include -.if ${PORT_OPTIONS:MRTP} && !defined(LITE) -LIB_DEPENDS+= libportaudio.so:${PORTSDIR}/audio/portaudio -CONFIGURE_ARGS+=--with-portaudio=${LOCALBASE} +.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MGTK3) && \ + empty(PORT_OPTIONS:MQT5) +CONFIGURE_ARGS+= --disable-wireshark +PLIST_SUB+= GUI="@comment " .else -CONFIGURE_ARGS+=--without-portaudio +USES+= desktop-file-utils shared-mime-info +INSTALLS_ICONS= yes +INSTALL_TARGET+= install_desktop_files +PLIST_SUB+= GUI="" .endif -.if ${PORT_OPTIONS:MSNMP} && !defined(LITE) -LIB_DEPENDS+= libsmi.so:${PORTSDIR}/net-mgmt/libsmi -CONFIGURE_ARGS+= --with-libsmi=${LOCALBASE} -.else -CONFIGURE_ARGS+= --with-libsmi=no +.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MGTK3) && \ + ${PORT_OPTIONS:MRTP} +IGNORE= the RTP support requires GTK+ frontend .endif -.if ${PORT_OPTIONS:MADNS} && !defined(LITE) -LIB_DEPENDS+= libadns.so:${PORTSDIR}/dns/adns -CONFIGURE_ARGS+= --with-adns=${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --with-adns=no -.endif - -.if ${PORT_OPTIONS:MCARES} && !defined(LITE) -LIB_DEPENDS+= libcares.so:${PORTSDIR}/dns/c-ares -CONFIGURE_ARGS+= --with-c-ares=${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --with-c-ares=no -.endif - -.if ${PORT_OPTIONS:MGEOIP} && !defined(LITE) -LIB_DEPENDS+= libGeoIP.so:${PORTSDIR}/net/GeoIP -CONFIGURE_ARGS+= --with-geoip=${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --with-geoip=no -.endif - -.if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls \ - libgcrypt.so:${PORTSDIR}/security/libgcrypt -CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE} \ - --with-gnutls=yes -.else -CONFIGURE_ARGS+=--with-gnutls=no -.endif - -.if ${PORT_OPTIONS:MGCRYPT} -LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt -CONFIGURE_ARGS+=--with-libgcrypt-prefix=${LOCALBASE} -.endif - -.if ! ${PORT_OPTIONS:MGSSAPI} -CONFIGURE_ARGS+=--with-krb5=no -.else -KRB5_CONFIG?= ${LOCALBASE}/bin/krb5-config -CONFIGURE_ENV+= KRB5_CONFIG=${KRB5_CONFIG} -LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/krb5 -.endif - -PKG_MESSAGE= ${FILESDIR}/pkg-message - post-patch: @${REINPLACE_CMD} -e 's|llua|llua-${LUA_VER}|g ; \ - s|-DGDK_PIXBUF_DISABLE_DEPRECATED||g ; \ - s|-Wl,--as-needed|| ' \ + s|-DQT_GUI_LIB|-DQT_GUI_LIB $$CPPFLAGS| ' \ ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/share/applications|${DESKTOPDIR}|g ; \ + s|/usr/share|${LOCALBASE}/share|g ; \ + s|{mime/packages,applications}|mime/packages| ; \ + s|{apps,mimetypes}|apps $$(DESTDIR)${LOCALBASE}/share/icons/hicolor/$$$${size}x$$$${size}/mimetypes|' \ + ${WRKSRC}/Makefile.in -post-install: - ${INSTALL_DATA} ${WRKSRC}/image/hi48-app-wireshark.png \ - ${STAGEDIR}${DATADIR} -.if ${PORT_OPTIONS:MQT5} - ${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-qt ${STAGEDIR}${PREFIX}/bin/${PORTNAME} -.endif +post-install-QT5-on: + ${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-qt \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include Index: head/net/wireshark/pkg-message =================================================================== --- head/net/wireshark/pkg-message (nonexistent) +++ head/net/wireshark/pkg-message (revision 401779) @@ -0,0 +1,17 @@ +=============================================================================== + +In order for wireshark be able to capture packets when used by unprivileged +user, /dev/bpf should be in network group and have read-write permissions. +For example: + +# chgrp network /dev/bpf* +# chmod g+r /dev/bpf* +# chmod g+w /dev/bpf* + +In order for this to persist across reboots, add the following to +/etc/devfs.conf: + +own bpf* root:network +perm bpf* 0660 + +=============================================================================== Property changes on: head/net/wireshark/pkg-message ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/wireshark/pkg-plist =================================================================== --- head/net/wireshark/pkg-plist (revision 401778) +++ head/net/wireshark/pkg-plist (revision 401779) @@ -1,277 +1,293 @@ %%CAPINFOS%% %%CAPTYPE%% %%DFTEST%% @group network @mode 2555 bin/dumpcap @mode @group %%EDITCAP%% -%%WIRESHARK%% +%%GUI%%bin/wireshark %%MERGECAP%% %%RANDPKT%% %%RAWSHARK%% %%REORDERCAP%% bin/tshark %%TEXT2PCAP%% lib/libfiletap.so lib/libfiletap.so.0 lib/libfiletap.so.0.0.8 lib/libwireshark.so lib/libwireshark.so.5 lib/libwireshark.so.5.0.8 lib/libwiretap.so lib/libwiretap.so.4 lib/libwiretap.so.4.0.8 lib/libwsutil.so lib/libwsutil.so.4 lib/libwsutil.so.4.1.0 lib/wireshark/plugins/%%PORTVERSION%%/docsis.so lib/wireshark/plugins/%%PORTVERSION%%/ethercat.so lib/wireshark/plugins/%%PORTVERSION%%/gryphon.so lib/wireshark/plugins/%%PORTVERSION%%/irda.so lib/wireshark/plugins/%%PORTVERSION%%/m2m.so lib/wireshark/plugins/%%PORTVERSION%%/mate.so lib/wireshark/plugins/%%PORTVERSION%%/opcua.so lib/wireshark/plugins/%%PORTVERSION%%/profinet.so lib/wireshark/plugins/%%PORTVERSION%%/stats_tree.so lib/wireshark/plugins/%%PORTVERSION%%/unistim.so lib/wireshark/plugins/%%PORTVERSION%%/wimax.so lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so lib/wireshark/plugins/%%PORTVERSION%%/wimaxmacphy.so %%CAPINFOS_MAN%%man/man1/capinfos.1.gz man/man1/dumpcap.1.gz %%EDITCAP_MAN%%man/man1/editcap.1.gz %%MERGECAP_MAN%%man/man1/mergecap.1.gz %%RAWSHARK_MAN%%man/man1/rawshark.1.gz %%TEXT2PCAP_MAN%%man/man1/text2pcap.1.gz %%DFTEST_MAN%%man/man1/dftest.1.gz %%RANDPKT_MAN%%man/man1/randpkt.1.gz %%REORDERCAP_MAN%%man/man1/reordercap.1.gz man/man1/tshark.1.gz -%%WIRESHARK_MAN%%man/man1/wireshark.1.gz +%%GUI%%man/man1/wireshark.1.gz man/man4/wireshark-filter.4.gz +%%GUI%%share/applications/wireshark.desktop +%%GUI%%share/icons/hicolor/128x128/apps/wireshark.png +%%GUI%%share/icons/hicolor/128x128/mimetypes/application-wireshark-doc.png +%%GUI%%share/icons/hicolor/16x16/apps/wireshark.png +%%GUI%%share/icons/hicolor/16x16/mimetypes/application-wireshark-doc.png +%%GUI%%share/icons/hicolor/24x24/apps/wireshark.png +%%GUI%%share/icons/hicolor/24x24/mimetypes/application-wireshark-doc.png +%%GUI%%share/icons/hicolor/256x256/apps/wireshark.png +%%GUI%%share/icons/hicolor/256x256/mimetypes/application-wireshark-doc.png +%%GUI%%share/icons/hicolor/32x32/apps/wireshark.png +%%GUI%%share/icons/hicolor/32x32/mimetypes/application-wireshark-doc.png +%%GUI%%share/icons/hicolor/48x48/apps/wireshark.png +%%GUI%%share/icons/hicolor/48x48/mimetypes/application-wireshark-doc.png +%%GUI%%share/icons/hicolor/64x64/apps/wireshark.png +%%GUI%%share/icons/hicolor/64x64/mimetypes/application-wireshark-doc.png +%%GUI%%share/icons/hicolor/scalable/apps/wireshark.svg +%%GUI%%share/mime/packages/wireshark.xml %%DATADIR%%/AUTHORS-SHORT %%DATADIR%%/COPYING %%DATADIR%%/capinfos.html %%DATADIR%%/cfilters %%DATADIR%%/colorfilters %%LUA%%%%DATADIR%%/console.lua %%DATADIR%%/dfilters %%DATADIR%%/dftest.html %%LUA%%%%DATADIR%%/dtd_gen.lua %%DATADIR%%/dumpcap.html %%DATADIR%%/diameter/AlcatelLucent.xml %%DATADIR%%/diameter/ChinaTelecom.xml %%DATADIR%%/diameter/Cisco.xml %%DATADIR%%/diameter/Custom.xml %%DATADIR%%/diameter/Ericsson.xml %%DATADIR%%/diameter/Nokia.xml %%DATADIR%%/diameter/NokiaSiemensNetworks.xml %%DATADIR%%/diameter/SKT.xml %%DATADIR%%/diameter/Starent.xml %%DATADIR%%/diameter/TGPPGmb.xml %%DATADIR%%/diameter/TGPPRx.xml %%DATADIR%%/diameter/TGPPS9.xml %%DATADIR%%/diameter/TGPPSh.xml %%DATADIR%%/diameter/VerizonWireless.xml %%DATADIR%%/diameter/Vodafone.xml %%DATADIR%%/diameter/chargecontrol.xml %%DATADIR%%/diameter/dictionary.dtd %%DATADIR%%/diameter/dictionary.xml %%DATADIR%%/diameter/eap.xml %%DATADIR%%/diameter/etsie2e4.xml %%DATADIR%%/diameter/gqpolicy.xml %%DATADIR%%/diameter/imscxdx.xml %%DATADIR%%/diameter/mobileipv4.xml %%DATADIR%%/diameter/mobileipv6.xml %%DATADIR%%/diameter/nasreq.xml %%DATADIR%%/diameter/sip.xml %%DATADIR%%/diameter/sunping.xml %%DATADIR%%/dtds/dc.dtd %%DATADIR%%/dtds/itunes.dtd %%DATADIR%%/dtds/mscml.dtd %%DATADIR%%/dtds/pocsettings.dtd %%DATADIR%%/dtds/presence.dtd %%DATADIR%%/dtds/reginfo.dtd %%DATADIR%%/dtds/rlmi.dtd %%DATADIR%%/dtds/rss.dtd %%DATADIR%%/dtds/smil.dtd %%DATADIR%%/dtds/watcherinfo.dtd %%DATADIR%%/dtds/xcap-caps.dtd %%DATADIR%%/dtds/xcap-error.dtd %%DATADIR%%/editcap.html %%LUA%%%%DATADIR%%/init.lua %%DATADIR%%/help/capture_filters.txt %%DATADIR%%/help/capturing.txt %%DATADIR%%/help/display_filters.txt %%DATADIR%%/help/faq.txt %%DATADIR%%/help/getting_started.txt %%DATADIR%%/help/overview.txt %%DATADIR%%/help/toc -%%DATADIR%%/hi48-app-wireshark.png %%DATADIR%%/ipmap.html %%DATADIR%%/manuf %%DATADIR%%/mergecap.html %%DATADIR%%/pdml2html.xsl %%DATADIR%%/profiles/Bluetooth/colorfilters %%DATADIR%%/profiles/Classic/colorfilters %%DATADIR%%/radius/README.radius_dictionary %%DATADIR%%/radius/custom.includes %%DATADIR%%/radius/dictionary %%DATADIR%%/radius/dictionary.3com %%DATADIR%%/radius/dictionary.3gpp %%DATADIR%%/radius/dictionary.3gpp2 %%DATADIR%%/radius/dictionary.acc %%DATADIR%%/radius/dictionary.acme %%DATADIR%%/radius/dictionary.airespace %%DATADIR%%/radius/dictionary.alcatel %%DATADIR%%/radius/dictionary.alcatel.esam %%DATADIR%%/radius/dictionary.alcatel.sr %%DATADIR%%/radius/dictionary.alcatel-lucent.aaa %%DATADIR%%/radius/dictionary.alcatel-lucent.xylan %%DATADIR%%/radius/dictionary.alteon %%DATADIR%%/radius/dictionary.altiga %%DATADIR%%/radius/dictionary.alvarion %%DATADIR%%/radius/dictionary.apc %%DATADIR%%/radius/dictionary.aptis %%DATADIR%%/radius/dictionary.aruba %%DATADIR%%/radius/dictionary.ascend %%DATADIR%%/radius/dictionary.asn %%DATADIR%%/radius/dictionary.audiocodes %%DATADIR%%/radius/dictionary.avaya %%DATADIR%%/radius/dictionary.azaire %%DATADIR%%/radius/dictionary.bay %%DATADIR%%/radius/dictionary.bintec %%DATADIR%%/radius/dictionary.bristol %%DATADIR%%/radius/dictionary.cablelabs %%DATADIR%%/radius/dictionary.cabletron %%DATADIR%%/radius/dictionary.chillispot %%DATADIR%%/radius/dictionary.cisco %%DATADIR%%/radius/dictionary.cisco.bbsm %%DATADIR%%/radius/dictionary.cisco.vpn3000 %%DATADIR%%/radius/dictionary.cisco.vpn5000 %%DATADIR%%/radius/dictionary.clavister %%DATADIR%%/radius/dictionary.colubris %%DATADIR%%/radius/dictionary.columbia_university %%DATADIR%%/radius/dictionary.compat %%DATADIR%%/radius/dictionary.cosine %%DATADIR%%/radius/dictionary.dhcp %%DATADIR%%/radius/dictionary.digium %%DATADIR%%/radius/dictionary.eltex %%DATADIR%%/radius/dictionary.epygi %%DATADIR%%/radius/dictionary.ericsson %%DATADIR%%/radius/dictionary.erx %%DATADIR%%/radius/dictionary.extreme %%DATADIR%%/radius/dictionary.fortinet %%DATADIR%%/radius/dictionary.foundry %%DATADIR%%/radius/dictionary.freeradius %%DATADIR%%/radius/dictionary.freeradius.internal %%DATADIR%%/radius/dictionary.freeswitch %%DATADIR%%/radius/dictionary.gandalf %%DATADIR%%/radius/dictionary.garderos %%DATADIR%%/radius/dictionary.gemtek %%DATADIR%%/radius/dictionary.h3c %%DATADIR%%/radius/dictionary.hp %%DATADIR%%/radius/dictionary.huawei %%DATADIR%%/radius/dictionary.iea %%DATADIR%%/radius/dictionary.infonet %%DATADIR%%/radius/dictionary.ipunplugged %%DATADIR%%/radius/dictionary.issanni %%DATADIR%%/radius/dictionary.itk %%DATADIR%%/radius/dictionary.jradius %%DATADIR%%/radius/dictionary.juniper %%DATADIR%%/radius/dictionary.karlnet %%DATADIR%%/radius/dictionary.lancom %%DATADIR%%/radius/dictionary.livingston %%DATADIR%%/radius/dictionary.localweb %%DATADIR%%/radius/dictionary.lucent %%DATADIR%%/radius/dictionary.manzara %%DATADIR%%/radius/dictionary.merit %%DATADIR%%/radius/dictionary.microsoft %%DATADIR%%/radius/dictionary.mikrotik %%DATADIR%%/radius/dictionary.motorola %%DATADIR%%/radius/dictionary.motorola.wimax %%DATADIR%%/radius/dictionary.navini %%DATADIR%%/radius/dictionary.netscreen %%DATADIR%%/radius/dictionary.networkphysics %%DATADIR%%/radius/dictionary.nexans %%DATADIR%%/radius/dictionary.nokia %%DATADIR%%/radius/dictionary.nokia.conflict %%DATADIR%%/radius/dictionary.nomadix %%DATADIR%%/radius/dictionary.nortel %%DATADIR%%/radius/dictionary.ntua %%DATADIR%%/radius/dictionary.openser %%DATADIR%%/radius/dictionary.packeteer %%DATADIR%%/radius/dictionary.patton %%DATADIR%%/radius/dictionary.propel %%DATADIR%%/radius/dictionary.prosoft %%DATADIR%%/radius/dictionary.quiconnect %%DATADIR%%/radius/dictionary.quintum %%DATADIR%%/radius/dictionary.redback %%DATADIR%%/radius/dictionary.redcreek %%DATADIR%%/radius/dictionary.rfc2865 %%DATADIR%%/radius/dictionary.rfc2866 %%DATADIR%%/radius/dictionary.rfc2867 %%DATADIR%%/radius/dictionary.rfc2868 %%DATADIR%%/radius/dictionary.rfc2869 %%DATADIR%%/radius/dictionary.rfc3162 %%DATADIR%%/radius/dictionary.rfc3576 %%DATADIR%%/radius/dictionary.rfc3580 %%DATADIR%%/radius/dictionary.rfc4072 %%DATADIR%%/radius/dictionary.rfc4372 %%DATADIR%%/radius/dictionary.rfc4603 %%DATADIR%%/radius/dictionary.rfc4675 %%DATADIR%%/radius/dictionary.rfc4679 %%DATADIR%%/radius/dictionary.rfc4818 %%DATADIR%%/radius/dictionary.rfc4849 %%DATADIR%%/radius/dictionary.rfc5090 %%DATADIR%%/radius/dictionary.rfc5176 %%DATADIR%%/radius/dictionary.rfc5447 %%DATADIR%%/radius/dictionary.rfc5580 %%DATADIR%%/radius/dictionary.rfc5607 %%DATADIR%%/radius/dictionary.rfc5904 %%DATADIR%%/radius/dictionary.rfc6519 %%DATADIR%%/radius/dictionary.rfc6572 %%DATADIR%%/radius/dictionary.riverstone %%DATADIR%%/radius/dictionary.roaringpenguin %%DATADIR%%/radius/dictionary.shasta %%DATADIR%%/radius/dictionary.shiva %%DATADIR%%/radius/dictionary.slipstream %%DATADIR%%/radius/dictionary.sofaware %%DATADIR%%/radius/dictionary.sonicwall %%DATADIR%%/radius/dictionary.springtide %%DATADIR%%/radius/dictionary.starent %%DATADIR%%/radius/dictionary.t_systems_nova %%DATADIR%%/radius/dictionary.telebit %%DATADIR%%/radius/dictionary.telkom %%DATADIR%%/radius/dictionary.trapeze %%DATADIR%%/radius/dictionary.tropos %%DATADIR%%/radius/dictionary.ukerna %%DATADIR%%/radius/dictionary.unix %%DATADIR%%/radius/dictionary.usr %%DATADIR%%/radius/dictionary.utstarcom %%DATADIR%%/radius/dictionary.valemount %%DATADIR%%/radius/dictionary.versanet %%DATADIR%%/radius/dictionary.vqp %%DATADIR%%/radius/dictionary.walabi %%DATADIR%%/radius/dictionary.waverider %%DATADIR%%/radius/dictionary.wichorus %%DATADIR%%/radius/dictionary.wimax %%DATADIR%%/radius/dictionary.wimax.wichorus %%DATADIR%%/radius/dictionary.wispr %%DATADIR%%/radius/dictionary.xedia %%DATADIR%%/radius/dictionary.zyxel %%DATADIR%%/randpkt.html %%DATADIR%%/rawshark.html %%DATADIR%%/reordercap.html %%DATADIR%%/services %%DATADIR%%/smi_modules %%DATADIR%%/tshark.html %%DATADIR%%/text2pcap.html %%DATADIR%%/tpncp/tpncp.dat %%DATADIR%%/wimaxasncp/dictionary.dtd %%DATADIR%%/wimaxasncp/dictionary.xml %%DATADIR%%/wireshark-filter.html %%DATADIR%%/wireshark.html %%DATADIR%%/ws.css Index: head/net/wireshark-lite/Makefile =================================================================== --- head/net/wireshark-lite/Makefile (revision 401778) +++ head/net/wireshark-lite/Makefile (revision 401779) @@ -1,10 +1,12 @@ # Created by: Bill Fumerola # $FreeBSD$ LITE= yes PKGNAMESUFFIX= -lite MASTERDIR= ${.CURDIR}/../wireshark COMMENT= Powerful network analyzer/capture tool (lite package) +OPTIONS_EXCLUDE= LUA RTP SNMP ADNS CARES GEOIP + .include "${MASTERDIR}/Makefile" Index: head/net/wireshark-qt5/Makefile =================================================================== --- head/net/wireshark-qt5/Makefile (revision 401778) +++ head/net/wireshark-qt5/Makefile (revision 401779) @@ -1,11 +1,11 @@ # $FreeBSD$ MASTERDIR= ${.CURDIR}/../wireshark COMMENT= Powerful network analyzer/capture tool (QT package) CONFLICTS= wireshark-[0-9]* -OPTIONS_EXCLUDE= GTK3 -OPTIONS_DEFAULT= SNMP ADNS PCRE IPV6 GEOIP GSSAPI X11 QT5 +OPTIONS_EXCLUDE= GTK2 GTK3 +OPTIONS_DEFAULT= SNMP ADNS IPV6 GEOIP KRB_BASE QT5 .include "${MASTERDIR}/Makefile"