summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/wireshark/Makefile5
-rw-r--r--net/wireshark/distinfo10
-rw-r--r--net/wireshark/patches/patch-ad12
3 files changed, 13 insertions, 14 deletions
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 1fcd9d56db7..546eb89d820 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2010/01/17 12:02:36 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2010/01/29 12:09:52 tron Exp $
-DISTNAME= wireshark-1.2.5
-PKGREVISION= 1
+DISTNAME= wireshark-1.2.6
CATEGORIES= net
MASTER_SITES= http://www.wireshark.org/download/src/ \
${MASTER_SITE_SOURCEFORGE:=wireshark/}
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index 88d785b37ed..bef56d80d34 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.27 2009/12/20 19:25:34 tonnerre Exp $
+$NetBSD: distinfo,v 1.28 2010/01/29 12:09:52 tron Exp $
-SHA1 (wireshark-1.2.5.tar.bz2) = 46b74b82ae6bfad5f5f68ef1b3b7d453ae9b1087
-RMD160 (wireshark-1.2.5.tar.bz2) = 85f77a8a1c94999671c6e5226e4ced080176fbdd
-Size (wireshark-1.2.5.tar.bz2) = 15296289 bytes
+SHA1 (wireshark-1.2.6.tar.bz2) = 83bc67009ee1312b490a0632cb9b51e68a30fd78
+RMD160 (wireshark-1.2.6.tar.bz2) = 8ee66d910383b6f42713e5edecdef1210c7989e4
+Size (wireshark-1.2.6.tar.bz2) = 15340008 bytes
SHA1 (patch-aa) = d0744f069ac2d3a8a43b810e1f958360d99200a9
SHA1 (patch-ab) = 5ae79916603f04c2d362c764d39f0c99728e716c
SHA1 (patch-ac) = 4e985520ea4b118aea6fc001f256b5de96de7840
-SHA1 (patch-ad) = fa293d23390d015d0863367033ab07a3472430de
+SHA1 (patch-ad) = 38baddf10f9335e2f766dc987589e7646b8ca014
diff --git a/net/wireshark/patches/patch-ad b/net/wireshark/patches/patch-ad
index 462bbedb0a2..e887da44fea 100644
--- a/net/wireshark/patches/patch-ad
+++ b/net/wireshark/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.4 2009/07/21 20:39:41 tron Exp $
+$NetBSD: patch-ad,v 1.5 2010/01/29 12:09:52 tron Exp $
---- configure.orig 2009-07-20 00:24:18.000000000 +0200
-+++ configure
-@@ -25051,7 +25051,7 @@ _ACEOF
+--- configure.orig 2010-01-27 16:14:11.000000000 +0000
++++ configure 2010-01-29 11:42:14.000000000 +0000
+@@ -14889,7 +14889,7 @@
fi
- if test x$have_ige_mac == x
+ if test x$have_ige_mac = x
then
- { echo "$as_me:$LINENO: checking for ige_mac_menu_set_menu_bar in -ligemacintegration" >&5
- echo $ECHO_N "checking for ige_mac_menu_set_menu_bar in -ligemacintegration... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ige_mac_menu_set_menu_bar in -ligemacintegration" >&5
+ $as_echo_n "checking for ige_mac_menu_set_menu_bar in -ligemacintegration... " >&6; }