Attachment 120344 Details for Bug 163146 – file.diff

[patch] file.diff

file.diff (text/plain), 6.57 KB, created by Ruslan Makhmatkhanov on 2011-12-09 09:10:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ruslan Makhmatkhanov

Created: 2011-12-09 09:10:07 UTC

Size: 6.57 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/net/wireshark/Makefile,v
>retrieving revision 1.173
>diff -u -r1.173 Makefile
>--- Makefile	11 Sep 2011 00:40:29 -0000	1.173
>+++ Makefile	9 Dec 2011 08:58:05 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME?=	wireshark
>-PORTVERSION=	1.6.2
>+PORTVERSION=	1.6.4
> CATEGORIES=	net ipv6
> MASTER_SITES=	http://www.wireshark.org/download/src/ \
>     		http://wireshark.osmirror.nl/download/src/ \
>@@ -148,8 +148,7 @@
> 
> .if exists(${LOCALBASE}/lib/libgnutls.so) || !defined(WITHOUT_GNUTLS)
> LIB_DEPENDS+=	gnutls.47:${PORTSDIR}/security/gnutls \
>-    		gcrypt.18:${PORTSDIR}/security/libgcrypt
>-CONFIGURE_ARGS+=--with-libgnutls-prefix=${LOCALBASE}
>+		gcrypt.18:${PORTSDIR}/security/libgcrypt
> .endif
> 
> .if exists(${LOCALBASE}/lib/libgcrypt.so) || !defined(WITHOUT_LIBGCRYPT)
>@@ -162,7 +161,7 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|lua5\.1|lua${LUA_VER_STR}|g ; \
>-	    	s|-llua${LUA_VER_STR}|${LUA_LIBDIR}/liblua.a|g' \
>+		s|-llua${LUA_VER_STR}|${LUA_LIBDIR}/liblua.a|g' \
> 		${WRKSRC}/configure
> 
> .include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/net/wireshark/distinfo,v
>retrieving revision 1.89
>diff -u -r1.89 distinfo
>--- distinfo	11 Sep 2011 00:40:29 -0000	1.89
>+++ distinfo	9 Dec 2011 08:58:05 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (wireshark-1.6.2.tar.bz2) = 5343f514ce98c28498ec4734e40e34e2bbf779a6c57d958837e3f70234471e7f
>-SIZE (wireshark-1.6.2.tar.bz2) = 21408664
>+SHA256 (wireshark-1.6.4.tar.bz2) = 7f98191f53d375f020312a99a9747ff3b846ac4029af4027fc883f685fabef5d
>+SIZE (wireshark-1.6.4.tar.bz2) = 21464517
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/net/wireshark/pkg-plist,v
>retrieving revision 1.48
>diff -u -r1.48 pkg-plist
>--- pkg-plist	31 Jul 2011 03:52:33 -0000	1.48
>+++ pkg-plist	9 Dec 2011 08:58:05 -0000
>@@ -2,16 +2,16 @@
> %%DFTEST%%
> bin/dumpcap
> %%EDITCAP%%
>-%%WIRESHARK%%
> %%IDL2WRS%%
> %%MERGECAP%%
> %%RANDPKT%%
> %%RAWSHARK%%
>-bin/tshark
> %%TEXT2PCAP%%
>+bin/tshark
>+%%WIRESHARK%%
> lib/libwireshark.la
> lib/libwireshark.so
>-lib/libwireshark.so.1
>+lib/libwireshark.so.2
> lib/libwiretap.la
> lib/libwiretap.so
> lib/libwiretap.so.1
>@@ -64,8 +64,6 @@
> %%LUA%%%%DATADIR%%/console.lua
> %%DATADIR%%/dfilters
> %%DATADIR%%/dftest.html
>-%%LUA%%%%DATADIR%%/dtd_gen.lua
>-%%DATADIR%%/dumpcap.html
> %%DATADIR%%/diameter/Cisco.xml
> %%DATADIR%%/diameter/Ericsson.xml
> %%DATADIR%%/diameter/TGPPGmb.xml
>@@ -84,6 +82,7 @@
> %%DATADIR%%/diameter/nasreq.xml
> %%DATADIR%%/diameter/sip.xml
> %%DATADIR%%/diameter/sunping.xml
>+%%LUA%%%%DATADIR%%/dtd_gen.lua
> %%DATADIR%%/dtds/dc.dtd
> %%DATADIR%%/dtds/itunes.dtd
> %%DATADIR%%/dtds/mscml.dtd
>@@ -96,8 +95,8 @@
> %%DATADIR%%/dtds/watcherinfo.dtd
> %%DATADIR%%/dtds/xcap-caps.dtd
> %%DATADIR%%/dtds/xcap-error.dtd
>+%%DATADIR%%/dumpcap.html
> %%DATADIR%%/editcap.html
>-%%LUA%%%%DATADIR%%/init.lua
> %%DATADIR%%/help/capture_filters.txt
> %%DATADIR%%/help/capturing.txt
> %%DATADIR%%/help/display_filters.txt
>@@ -106,6 +105,7 @@
> %%DATADIR%%/help/overview.txt
> %%DATADIR%%/help/toc
> %%DATADIR%%/idl2wrs.html
>+%%LUA%%%%DATADIR%%/init.lua
> %%DATADIR%%/ipmap.html
> %%DATADIR%%/manuf
> %%DATADIR%%/mergecap.html
>@@ -116,8 +116,11 @@
> %%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.alteon
> %%DATADIR%%/radius/dictionary.altiga
> %%DATADIR%%/radius/dictionary.alvarion
>@@ -126,6 +129,7 @@
> %%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
>@@ -161,6 +165,7 @@
> %%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
>@@ -177,6 +182,7 @@
> %%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
>@@ -205,12 +211,16 @@
> %%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.rfc5580
>+%%DATADIR%%/radius/dictionary.rfc5607
>+%%DATADIR%%/radius/dictionary.rfc5904
> %%DATADIR%%/radius/dictionary.riverstone
> %%DATADIR%%/radius/dictionary.roaringpenguin
> %%DATADIR%%/radius/dictionary.shasta
>@@ -225,8 +235,7 @@
> %%DATADIR%%/radius/dictionary.telkom
> %%DATADIR%%/radius/dictionary.trapeze
> %%DATADIR%%/radius/dictionary.tropos
>-%%DATADIR%%/radius/dictionary.tunnel
>-%%DATADIR%%/radius/dictionary.unisphere
>+%%DATADIR%%/radius/dictionary.ukerna
> %%DATADIR%%/radius/dictionary.unix
> %%DATADIR%%/radius/dictionary.usr
> %%DATADIR%%/radius/dictionary.utstarcom
>@@ -235,7 +244,9 @@
> %%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.xylan
>@@ -244,17 +255,14 @@
> %%DATADIR%%/rawshark.html
> %%DATADIR%%/services
> %%DATADIR%%/smi_modules
>-%%DATADIR%%/tshark.html
> %%DATADIR%%/text2pcap.html
> %%DATADIR%%/tpncp/tpncp.dat
>+%%DATADIR%%/tshark.html
> %%DATADIR%%/wimaxasncp/dictionary.dtd
> %%DATADIR%%/wimaxasncp/dictionary.xml
> %%DATADIR%%/wireshark-filter.html
> %%DATADIR%%/wireshark.html
> %%DATADIR%%/ws.css
>-@dirrm lib/wireshark/plugins/%%PORTVERSION%%
>-@dirrm lib/wireshark/plugins
>-@dirrm lib/wireshark
> @dirrm %%DATADIR%%/wimaxasncp
> @dirrm %%DATADIR%%/tpncp
> @dirrm %%DATADIR%%/radius
>@@ -262,3 +270,6 @@
> @dirrm %%DATADIR%%/dtds
> @dirrm %%DATADIR%%/diameter
> @dirrm %%DATADIR%%
>+@dirrm lib/wireshark/plugins/%%PORTVERSION%%
>+@dirrm lib/wireshark/plugins
>+@dirrm lib/wireshark

Actions: View | Diff

Attachments on bug 163146: 120344