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-ba,v 1.1 2016/03/03 13:30:27 wiz Exp $

Avoid conflict with NetBSD's popcount(3).

--- epan/dissectors/packet-x11.c.orig	2011-07-18 21:18:26.000000000 +0100
+++ epan/dissectors/packet-x11.c	2011-07-20 19:03:27.000000000 +0100
@@@@ -3044,7 +3044,7 @@@@
       g_hash_table_insert(reply_table, (gpointer)name, (gpointer)reply_info);
 }
 
-static int popcount(unsigned int mask)
+static int my_popcount(unsigned int mask)
 {
 #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
       /* GCC 3.4 or newer */
@


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-ba,v 1.2 2011/07/20 18:42:45 tron Exp $
@