Date: Tue, 24 Nov 2015 00:00:37 +0800 From: Sunpoet Po-Chuan Hsieh <sunpoet@freebsd.org> To: Joe Marcus Clarke <marcus@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r402248 - in head/net: tshark wireshark Message-ID: <CAMHz58SWJ6mOo9R0Oq8eATTPVCYx5-QMPCzjwgkv3SY%2BjzojXw@mail.gmail.com> In-Reply-To: <201511222346.tAMNkYsf032931@repo.freebsd.org> References: <201511222346.tAMNkYsf032931@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Nov 23, 2015 at 7:46 AM, Joe Marcus Clarke <marcus@freebsd.org> wrote: > Author: marcus > Date: Sun Nov 22 23:46:33 2015 > New Revision: 402248 > URL: https://svnweb.freebsd.org/changeset/ports/402248 > > Log: > Update to 2.0.0 and provide a pointer on how to build with Kerberos > when the port is installed. > > The relase notes for 2.0 can be found at > https://www.wireshark.org/docs/relnotes/wireshark-2.0.0.html . > > Modified: > head/net/tshark/Makefile > head/net/wireshark/Makefile > head/net/wireshark/distinfo > head/net/wireshark/pkg-plist > > Modified: head/net/tshark/Makefile > > ============================================================================== > --- head/net/tshark/Makefile Sun Nov 22 23:30:35 2015 (r402247) > +++ head/net/tshark/Makefile Sun Nov 22 23:46:33 2015 (r402248) > @@ -2,7 +2,6 @@ > # $FreeBSD$ > > PORTNAME= tshark > -PORTREVISION= 2 > CATEGORIES= net ipv6 > > MASTERDIR= ${.CURDIR}/../wireshark > > Modified: head/net/wireshark/Makefile > > ============================================================================== > --- head/net/wireshark/Makefile Sun Nov 22 23:30:35 2015 (r402247) > +++ head/net/wireshark/Makefile Sun Nov 22 23:46:33 2015 (r402248) > @@ -2,8 +2,8 @@ > # $FreeBSD$ > > PORTNAME?= wireshark > -PORTVERSION= 1.12.8 > -PORTREVISION?= 1 > +PORTVERSION= 2.0.0 > +PORTREVISION?= 0 > CATEGORIES= net ipv6 > MASTER_SITES= http://www.wireshark.org/download/src/ \ > http://ftp.uni-kl.de/pub/wireshark/src/ \ > @@ -41,7 +41,7 @@ LIBS+= -L${LOCALBASE}/lib > PLIST_SUB+= PORTVERSION=${PORTVERSION} > > .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \ > - reordercap captype > + reordercap captype androiddump > .if defined(LITE) > PKGNAMESUFFIX= -lite > PLIST_SUB+= ${x:tu}="@comment $x not installed" \ > @@ -115,6 +115,10 @@ LUA_CPPFLAGS= -I${LUA_INCDIR} > > QT5_MAKE_ENV= PATH="${PATH}:${QT_BINDIR}" > QT5_VARS= PKGNAMESUFFIX=-qt5 > +QT5_PLIST_SUB= GUI_GTK="@comment " > + > +GTK2_PLIST_SUB= GUI_GTK="" > +GTK3_PLIST_SUB= GUI_GTK="" > GUI_GTK is undefined in PLIST_SUB if all GUI options (GTK2, GTK3 and QT5) are disabled. Then I got error message as follows: ===> Building package for wireshark-2.0.0 pkg-static: Unable to access file /usr/ports/works/usr/ports/net/wireshark/work/stage/usr/local/%%GUI_GTK%%share/applications/wireshark-gtk.desktop: No such file or directory *** Error code 1 > OPTIONS_SUB= LUA > It'll be better to use OPTIONS_SUB=yes as other ports did. > > @@ -127,10 +131,14 @@ PLIST_SUB+= GUI="@comment " > .else > USES+= desktop-file-utils shared-mime-info > INSTALLS_ICONS= yes > -INSTALL_TARGET+= install_desktop_files > PLIST_SUB+= GUI="" > .endif > > +.if ${PORT_OPTIONS:MKRB_BASE} && exists(${LOCALBASE}/include/krb5.h) > +IGNORE= cannot build with base Kerberos if krb5 > port is installed. \ > + Use ``make config'' to choose a different option > +.endif > + > .if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MGTK3) && \ > ${PORT_OPTIONS:MRTP} > IGNORE= the RTP support requires GTK+ frontend > @@ -146,8 +154,8 @@ post-patch: > s|{apps,mimetypes}|apps > $$(DESTDIR)${LOCALBASE}/share/icons/hicolor/$$$${size}x$$$${size}/mimetypes|' > \ > ${WRKSRC}/Makefile.in > > -post-install-QT5-on: > - ${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-qt \ > +post-install-QT5-off: > + ${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-gtk \ > ${STAGEDIR}${PREFIX}/bin/${PORTNAME} > > .include <bsd.port.mk> > > Modified: head/net/wireshark/distinfo > > ============================================================================== > --- head/net/wireshark/distinfo Sun Nov 22 23:30:35 2015 (r402247) > +++ head/net/wireshark/distinfo Sun Nov 22 23:46:33 2015 (r402248) > @@ -1,2 +1,2 @@ > -SHA256 (wireshark-1.12.8.tar.bz2) = > 357e0a4e49525d80cdc740bb16539fcdb526ad38cc2ed6cabedafc9bdee5c7e7 > -SIZE (wireshark-1.12.8.tar.bz2) = 29216939 > +SHA256 (wireshark-2.0.0.tar.bz2) = > 90026c761a85701d7783c7e2eaa4c1de247dfbadbd53221df355f121e42691dd > +SIZE (wireshark-2.0.0.tar.bz2) = 30976957 > > Modified: head/net/wireshark/pkg-plist > > ============================================================================== > --- head/net/wireshark/pkg-plist Sun Nov 22 23:30:35 2015 > (r402247) > +++ head/net/wireshark/pkg-plist Sun Nov 22 23:46:33 2015 > (r402248) > @@ -1,3 +1,4 @@ > +%%ANDROIDDUMP%% > %%CAPINFOS%% > %%CAPTYPE%% > %%DFTEST%% > @@ -7,6 +8,7 @@ bin/dumpcap > @mode > @group > %%EDITCAP%% > +bin/idl2wrs > %%GUI%%bin/wireshark > %%MERGECAP%% > %%RANDPKT%% > @@ -14,18 +16,15 @@ bin/dumpcap > %%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/libwireshark.so.6 > +lib/libwireshark.so.6.0.0 > lib/libwiretap.so > -lib/libwiretap.so.4 > -lib/libwiretap.so.4.0.8 > +lib/libwiretap.so.5 > +lib/libwiretap.so.5.0.0 > lib/libwsutil.so > -lib/libwsutil.so.4 > -lib/libwsutil.so.4.1.0 > +lib/libwsutil.so.6 > +lib/libwsutil.so.6.0.0 > lib/wireshark/plugins/%%PORTVERSION%%/docsis.so > lib/wireshark/plugins/%%PORTVERSION%%/ethercat.so > lib/wireshark/plugins/%%PORTVERSION%%/gryphon.so > @@ -51,7 +50,9 @@ man/man1/dumpcap.1.gz > man/man1/tshark.1.gz > %%GUI%%man/man1/wireshark.1.gz > man/man4/wireshark-filter.4.gz > +%%GUI%%share/appdata/wireshark.appdata.xml > %%GUI%%share/applications/wireshark.desktop > +%%GUI_GTK%%share/applications/wireshark-gtk.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 > @@ -70,6 +71,7 @@ man/man4/wireshark-filter.4.gz > %%GUI%%share/mime/packages/wireshark.xml > %%DATADIR%%/AUTHORS-SHORT > %%DATADIR%%/COPYING > +%%DATADIR%%/androiddump.html > %%DATADIR%%/capinfos.html > %%DATADIR%%/cfilters > %%DATADIR%%/colorfilters > @@ -79,27 +81,22 @@ man/man4/wireshark-filter.4.gz > %%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/HP.xml > %%DATADIR%%/diameter/Nokia.xml > -%%DATADIR%%/diameter/NokiaSiemensNetworks.xml > -%%DATADIR%%/diameter/SKT.xml > +%%DATADIR%%/diameter/NokiaSolutionsAndNetworks.xml > +%%DATADIR%%/diameter/Oracle.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/TGPP.xml > +%%DATADIR%%/diameter/TGPP2.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 > @@ -140,17 +137,20 @@ man/man4/wireshark-filter.4.gz > %%DATADIR%%/radius/dictionary.3gpp2 > %%DATADIR%%/radius/dictionary.acc > %%DATADIR%%/radius/dictionary.acme > +%%DATADIR%%/radius/dictionary.actelis > +%%DATADIR%%/radius/dictionary.aerohive > %%DATADIR%%/radius/dictionary.airespace > %%DATADIR%%/radius/dictionary.alcatel > +%%DATADIR%%/radius/dictionary.alcatel-lucent.aaa > %%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.alvarion.wimax.v2_2 > %%DATADIR%%/radius/dictionary.apc > %%DATADIR%%/radius/dictionary.aptis > +%%DATADIR%%/radius/dictionary.arbor > %%DATADIR%%/radius/dictionary.aruba > %%DATADIR%%/radius/dictionary.ascend > %%DATADIR%%/radius/dictionary.asn > @@ -159,28 +159,47 @@ man/man4/wireshark-filter.4.gz > %%DATADIR%%/radius/dictionary.azaire > %%DATADIR%%/radius/dictionary.bay > %%DATADIR%%/radius/dictionary.bintec > +%%DATADIR%%/radius/dictionary.bluecoat > %%DATADIR%%/radius/dictionary.bristol > +%%DATADIR%%/radius/dictionary.broadsoft > +%%DATADIR%%/radius/dictionary.brocade > +%%DATADIR%%/radius/dictionary.bskyb > +%%DATADIR%%/radius/dictionary.bt > %%DATADIR%%/radius/dictionary.cablelabs > %%DATADIR%%/radius/dictionary.cabletron > +%%DATADIR%%/radius/dictionary.camiant > %%DATADIR%%/radius/dictionary.chillispot > %%DATADIR%%/radius/dictionary.cisco > +%%DATADIR%%/radius/dictionary.cisco.asa > %%DATADIR%%/radius/dictionary.cisco.bbsm > %%DATADIR%%/radius/dictionary.cisco.vpn3000 > %%DATADIR%%/radius/dictionary.cisco.vpn5000 > +%%DATADIR%%/radius/dictionary.citrix > %%DATADIR%%/radius/dictionary.clavister > %%DATADIR%%/radius/dictionary.colubris > %%DATADIR%%/radius/dictionary.columbia_university > %%DATADIR%%/radius/dictionary.compat > +%%DATADIR%%/radius/dictionary.compatible > %%DATADIR%%/radius/dictionary.cosine > +%%DATADIR%%/radius/dictionary.dante > %%DATADIR%%/radius/dictionary.dhcp > %%DATADIR%%/radius/dictionary.digium > +%%DATADIR%%/radius/dictionary.dlink > +%%DATADIR%%/radius/dictionary.dragonwave > +%%DATADIR%%/radius/dictionary.efficientip > %%DATADIR%%/radius/dictionary.eltex > %%DATADIR%%/radius/dictionary.epygi > +%%DATADIR%%/radius/dictionary.equallogic > %%DATADIR%%/radius/dictionary.ericsson > +%%DATADIR%%/radius/dictionary.ericsson.ab > +%%DATADIR%%/radius/dictionary.ericsson.packet.core.networks > %%DATADIR%%/radius/dictionary.erx > %%DATADIR%%/radius/dictionary.extreme > +%%DATADIR%%/radius/dictionary.f5 > +%%DATADIR%%/radius/dictionary.fdxtended > %%DATADIR%%/radius/dictionary.fortinet > %%DATADIR%%/radius/dictionary.foundry > +%%DATADIR%%/radius/dictionary.freedhcp > %%DATADIR%%/radius/dictionary.freeradius > %%DATADIR%%/radius/dictionary.freeradius.internal > %%DATADIR%%/radius/dictionary.freeswitch > @@ -190,7 +209,9 @@ man/man4/wireshark-filter.4.gz > %%DATADIR%%/radius/dictionary.h3c > %%DATADIR%%/radius/dictionary.hp > %%DATADIR%%/radius/dictionary.huawei > +%%DATADIR%%/radius/dictionary.iana > %%DATADIR%%/radius/dictionary.iea > +%%DATADIR%%/radius/dictionary.infoblox > %%DATADIR%%/radius/dictionary.infonet > %%DATADIR%%/radius/dictionary.ipunplugged > %%DATADIR%%/radius/dictionary.issanni > @@ -198,12 +219,15 @@ man/man4/wireshark-filter.4.gz > %%DATADIR%%/radius/dictionary.jradius > %%DATADIR%%/radius/dictionary.juniper > %%DATADIR%%/radius/dictionary.karlnet > +%%DATADIR%%/radius/dictionary.kineto > %%DATADIR%%/radius/dictionary.lancom > %%DATADIR%%/radius/dictionary.livingston > %%DATADIR%%/radius/dictionary.localweb > %%DATADIR%%/radius/dictionary.lucent > %%DATADIR%%/radius/dictionary.manzara > +%%DATADIR%%/radius/dictionary.meinberg > %%DATADIR%%/radius/dictionary.merit > +%%DATADIR%%/radius/dictionary.meru > %%DATADIR%%/radius/dictionary.microsoft > %%DATADIR%%/radius/dictionary.mikrotik > %%DATADIR%%/radius/dictionary.motorola > @@ -219,12 +243,15 @@ man/man4/wireshark-filter.4.gz > %%DATADIR%%/radius/dictionary.ntua > %%DATADIR%%/radius/dictionary.openser > %%DATADIR%%/radius/dictionary.packeteer > +%%DATADIR%%/radius/dictionary.paloalto > %%DATADIR%%/radius/dictionary.patton > +%%DATADIR%%/radius/dictionary.perle > %%DATADIR%%/radius/dictionary.propel > %%DATADIR%%/radius/dictionary.prosoft > +%%DATADIR%%/radius/dictionary.proxim > +%%DATADIR%%/radius/dictionary.purewave > %%DATADIR%%/radius/dictionary.quiconnect > %%DATADIR%%/radius/dictionary.quintum > -%%DATADIR%%/radius/dictionary.redback > %%DATADIR%%/radius/dictionary.redcreek > %%DATADIR%%/radius/dictionary.rfc2865 > %%DATADIR%%/radius/dictionary.rfc2866 > @@ -249,19 +276,37 @@ man/man4/wireshark-filter.4.gz > %%DATADIR%%/radius/dictionary.rfc5904 > %%DATADIR%%/radius/dictionary.rfc6519 > %%DATADIR%%/radius/dictionary.rfc6572 > +%%DATADIR%%/radius/dictionary.rfc6677 > +%%DATADIR%%/radius/dictionary.rfc6911 > +%%DATADIR%%/radius/dictionary.rfc6929 > +%%DATADIR%%/radius/dictionary.rfc6930 > +%%DATADIR%%/radius/dictionary.rfc7055 > +%%DATADIR%%/radius/dictionary.rfc7155 > +%%DATADIR%%/radius/dictionary.rfc7268 > +%%DATADIR%%/radius/dictionary.rfc7499 > +%%DATADIR%%/radius/dictionary.riverbed > %%DATADIR%%/radius/dictionary.riverstone > %%DATADIR%%/radius/dictionary.roaringpenguin > +%%DATADIR%%/radius/dictionary.ruckus > +%%DATADIR%%/radius/dictionary.ruggedcom > +%%DATADIR%%/radius/dictionary.sg > %%DATADIR%%/radius/dictionary.shasta > %%DATADIR%%/radius/dictionary.shiva > +%%DATADIR%%/radius/dictionary.siemens > %%DATADIR%%/radius/dictionary.slipstream > %%DATADIR%%/radius/dictionary.sofaware > %%DATADIR%%/radius/dictionary.sonicwall > %%DATADIR%%/radius/dictionary.springtide > %%DATADIR%%/radius/dictionary.starent > +%%DATADIR%%/radius/dictionary.starent.vsa1 > +%%DATADIR%%/radius/dictionary.surfnet > +%%DATADIR%%/radius/dictionary.symbol > %%DATADIR%%/radius/dictionary.t_systems_nova > %%DATADIR%%/radius/dictionary.telebit > %%DATADIR%%/radius/dictionary.telkom > +%%DATADIR%%/radius/dictionary.terena > %%DATADIR%%/radius/dictionary.trapeze > +%%DATADIR%%/radius/dictionary.travelping > %%DATADIR%%/radius/dictionary.tropos > %%DATADIR%%/radius/dictionary.ukerna > %%DATADIR%%/radius/dictionary.unix > @@ -274,9 +319,14 @@ man/man4/wireshark-filter.4.gz > %%DATADIR%%/radius/dictionary.waverider > %%DATADIR%%/radius/dictionary.wichorus > %%DATADIR%%/radius/dictionary.wimax > +%%DATADIR%%/radius/dictionary.wimax.alvarion > %%DATADIR%%/radius/dictionary.wimax.wichorus > %%DATADIR%%/radius/dictionary.wispr > %%DATADIR%%/radius/dictionary.xedia > +%%DATADIR%%/radius/dictionary.xylan > +%%DATADIR%%/radius/dictionary.yubico > +%%DATADIR%%/radius/dictionary.zeus > +%%DATADIR%%/radius/dictionary.zte > %%DATADIR%%/radius/dictionary.zyxel > %%DATADIR%%/randpkt.html > %%DATADIR%%/rawshark.html > _______________________________________________ > svn-ports-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-ports-all > To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58SWJ6mOo9R0Oq8eATTPVCYx5-QMPCzjwgkv3SY%2BjzojXw>