--- a/components/wireshark/patches/man.patch Thu Jun 21 10:26:25 2012 -0700
+++ b/components/wireshark/patches/man.patch Fri Jun 22 03:52:09 2012 -0700
@@ -1,6 +1,6 @@
--- doc/tshark.pod
+++ doc/tshark.pod
-@@ -419,9 +419,9 @@
+@@ -439,9 +439,9 @@
Network interface names should match one of the names listed in
"B<tshark -D>" (described above); a number, as reported by
@@ -13,27 +13,27 @@
If no interface is specified, B<TShark> searches the list of
interfaces, choosing the first non-loopback interface if there are any
-@@ -1102,7 +1102,7 @@
+@@ -1328,7 +1328,7 @@
=head1 CAPTURE FILTER SYNTAX
--See the manual page of pcap-filter(4) or, if that doesn't exist, tcpdump(8),
+-See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
+See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
=head1 READ FILTER SYNTAX
-@@ -1355,7 +1355,7 @@
-
+@@ -1589,7 +1589,7 @@
=head1 SEE ALSO
--wireshark-filter(4), wireshark(1), editcap(1), pcap-filter(4), tcpdump(8),
-+wireshark-filter(4), wireshark(1), editcap(1), pcap-filter(5), tcpdump(1),
- pcap(3), dumpcap(1), text2pcap(1), mergecap(1)
+ wireshark-filter(4), wireshark(1), editcap(1), pcap(3), dumpcap(1),
+-text2pcap(1), mergecap(1), pcap-filter(7) or tcpdump(8) if it doesn't exist.
++text2pcap(1), mergecap(1), pcap-filter(5) or tcpdump(1) if it doesn't exist.
=head1 NOTES
+
--- doc/wireshark.pod.template
+++ doc/wireshark.pod.template
-@@ -309,9 +309,9 @@
+@@ -354,9 +354,9 @@
Network interface names should match one of the names listed in
"B<wireshark -D>" (described above); a number, as reported by
@@ -46,114 +46,112 @@
If no interface is specified, B<Wireshark> searches the list of
interfaces, choosing the first non-loopback interface if there are any
-@@ -2349,7 +2349,7 @@
+@@ -2435,7 +2435,7 @@
=head1 CAPTURE FILTER SYNTAX
--See the manual page of pcap-filter(4) or, if that doesn't exist, tcpdump(8),
+-See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
+See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
=head1 DISPLAY FILTER SYNTAX
-@@ -2705,7 +2705,7 @@
-
+@@ -2807,7 +2807,7 @@
=head1 SEE ALSO
--wireshark-filter(4), tshark(1), editcap(1), pcap-filter(4), tcpdump(8),
-+wireshark-filter(4), tshark(1), editcap(1), pcap-filter(5), tcpdump(1),
- pcap(3), dumpcap(1), mergecap(1), text2pcap(1)
+ wireshark-filter(4), tshark(1), editcap(1), pcap(3), dumpcap(1), mergecap(1),
+-text2pcap(1), pcap-filter(7) or tcpdump(8) if it doesn't exist.
++text2pcap(1), pcap-filter(5) or tcpdump(1) if it doesn't exist.
=head1 NOTES
+
--- doc/capinfos.pod
+++ doc/capinfos.pod
-@@ -319,7 +319,7 @@
-
+@@ -320,7 +320,7 @@
=head1 SEE ALSO
--tcpdump(8), pcap(3), wireshark(1), mergecap(1), editcap(1), tshark(1),
-+tcpdump(1), pcap(3), wireshark(1), mergecap(1), editcap(1), tshark(1),
- dumpcap(1)
+ pcap(3), wireshark(1), mergecap(1), editcap(1), tshark(1),
+-dumpcap(1), pcap-filter(7) or tcpdump(8) if it doesn't exist
++dumpcap(1), pcap-filter(5) or tcpdump(1) if it doesn't exist
=head1 NOTES
+
--- doc/dumpcap.pod
+++ doc/dumpcap.pod
-@@ -265,13 +265,13 @@
+@@ -314,13 +314,13 @@
=head1 CAPTURE FILTER SYNTAX
--See the manual page of pcap-filter(4) or, if that doesn't exist, tcpdump(8),
+-See the manual page of pcap-filter(7) or, if that doesn't exist, tcpdump(8),
+See the manual page of pcap-filter(5) or, if that doesn't exist, tcpdump(1),
or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>.
=head1 SEE ALSO
--wireshark(1), tshark(1), editcap(1), mergecap(1), capinfos(1), pcap-filter(4),
--tcpdump(8), pcap(3)
-+wireshark(1), tshark(1), editcap(1), mergecap(1), capinfos(1), pcap-filter(5),
-+tcpdump(1), pcap(3)
+ wireshark(1), tshark(1), editcap(1), mergecap(1), capinfos(1), pcap(3),
+-pcap-filter(7) or tcpdump(8) if it doesn't exist.
++pcap-filter(5) or tcpdump(1) if it doesn't exist.
=head1 NOTES
--- doc/editcap.pod
+++ doc/editcap.pod
-@@ -368,7 +368,7 @@
-
+@@ -369,7 +369,7 @@
=head1 SEE ALSO
--tcpdump(8), pcap(3), wireshark(1), tshark(1), mergecap(1), dumpcap(1),
-+tcpdump(1), pcap(3), wireshark(1), tshark(1), mergecap(1), dumpcap(1),
- capinfos(1), text2pcap(1), od(1)
+ pcap(3), wireshark(1), tshark(1), mergecap(1), dumpcap(1), capinfos(1),
+-text2pcap(1), od(1), pcap-filter(7) or tcpdump(8) if it doesn't exist.
++text2pcap(1), od(1), pcap-filter(5) or tcpdump(1) if it doesn't exist.
=head1 NOTES
+
--- doc/mergecap.pod
+++ doc/mergecap.pod
@@ -134,7 +134,7 @@
-
=head1 SEE ALSO
--tcpdump(8), pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1),
-+tcpdump(1), pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1),
- text2pcap(1)
+ pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), text2pcap(1),
+-pcap-filter(7) or tcpdump(8) if it doesn't exist.
++pcap-filter(5) or tcpdump(1) if it doesn't exist.
=head1 NOTES
+
--- doc/rawshark.pod
+++ doc/rawshark.pod
-@@ -488,7 +488,7 @@
-
+@@ -493,7 +493,7 @@
=head1 SEE ALSO
--wireshark-filter(4), wireshark(1), tshark(1), editcap(1), tcpdump(8),
-+wireshark-filter(4), wireshark(1), tshark(1), editcap(1), tcpdump(1),
- pcap(3), dumpcap(1), text2pcap(1)
+ wireshark-filter(4), wireshark(1), tshark(1), editcap(1), pcap(3), dumpcap(1),
+-text2pcap(1), pcap-filter(7) or tcpdump(8) if it doesn't exist.
++text2pcap(1), pcap-filter(5) or tcpdump(1) if it doesn't exist.
=head1 NOTES
+
--- doc/text2pcap.pod
+++ doc/text2pcap.pod
-@@ -202,7 +202,7 @@
-
+@@ -211,7 +211,7 @@
=head1 SEE ALSO
--od(1), tcpdump(8), pcap(3), wireshark(1), tshark(1), dumpcap(1), mergecap(1),
-+od(1), tcpdump(1), pcap(3), wireshark(1), tshark(1), dumpcap(1), mergecap(1),
- editcap(1), strptime(3).
+ od(1), pcap(3), wireshark(1), tshark(1), dumpcap(1), mergecap(1),
+-editcap(1), strptime(3), pcap-filter(7) or tcpdump(8) if it doesn't exist.
++editcap(1), strptime(3), pcap-filter(5) or tcpdump(1) if it doesn't exist.
=head1 NOTES
+
--- doc/wireshark-filter.pod
+++ doc/wireshark-filter.pod
-@@ -400,13 +400,13 @@
+@@ -421,13 +421,13 @@
the Perl-Compatible Regular Expressions library: see B<http://www.pcre.org/>.
This manpage does not describe the capture filter syntax, which is
--different. See the manual page of pcap-filter(4) or, if that doesn't exist,
--tcpdump(8), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
+-different. See the manual page of pcap-filter(7) or, if that doesn't exist,
+different. See the manual page of pcap-filter(5) or, if that doesn't exist,
-+tcpdump(1), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
+ tcpdump(8), or, if that doesn't exist, L<http://wiki.wireshark.org/CaptureFilters>
for a description of capture filters.
=head1 SEE ALSO
--wireshark(1), tshark(1), editcap(1), pcap-filter(4), tcpdump(8), pcap(3)
-+wireshark(1), tshark(1), editcap(1), pcap-filter(5), tcpdump(1), pcap(3)
+-wireshark(1), tshark(1), editcap(1), pcap(3), pcap-filter(7) or tcpdump(8) if it
++wireshark(1), tshark(1), editcap(1), pcap(3), pcap-filter(5) or tcpdump(1) if it
+ doesn't exist.
=head1 AUTHORS
-