head 1.2; access; symbols pkgsrc-2016Q2:1.1.0.4 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.2 pkgsrc-2016Q1-base:1.1; locks; strict; comment @# @; 1.2 date 2016.08.01.09.48.02; author wiz; state dead; branches; next 1.1; commitid IpTRpnTGck5lmAgz; 1.1 date 2016.03.03.13.30.27; author wiz; state Exp; branches; next ; commitid N5jkf9xPyihLrcXy; desc @@ 1.2 log @Remove net/wireshark1, eol'd on 2016-07-31. Use net/wireshark instead. @ text @$NetBSD: patch-ac,v 1.1 2016/03/03 13:30:27 wiz Exp $ Fix build problem caused by name space polution. --- epan/dissectors/packet-mtp3.h.orig 2008-10-20 20:19:32.000000000 +0100 +++ epan/dissectors/packet-mtp3.h 2008-10-26 13:41:50.000000000 +0000 @@@@ -46,6 +46,10 @@@@ guint8 ni; } mtp3_addr_pc_t; +#if defined(__NetBSD__) && defined(si_code) +#undef si_code +#endif + typedef struct _mtp3_tap_rec_t { mtp3_addr_pc_t addr_opc; mtp3_addr_pc_t addr_dpc; @ 1.1 log @Re-import wireshark-1.12.9 as net/wireshark1. The default stable version is 2.0.2. Wireshark is a network traffic analyzer, or "sniffer", for Unix and Unix-like operating systems. It uses GTK+, a graphical user interface library, and libpcap, a packet capture and filtering library. The Wireshark distribution also comes with TShark, which is a line-oriented sniffer (similar to Sun's snoop, or tcpdump) that uses the same dissection, capture-file reading and writing, and packet filtering code as Wireshark, and with editcap, which is a program to read capture files and write the packets from that capture file, possibly in a different capture file format, and with some packets possibly removed from the capture. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2013/12/18 11:52:25 tron Exp $ @