5 files changed, 57 insertions, 125 deletions

diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 27a49fa170f6..dbf0f990f9e3 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	wireshark
-PORTVERSION=	1.0.8
+PORTVERSION=	1.2.0
 PORTREVISION?=	0
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
@@ -33,8 +33,7 @@ WANT_GNOME=	yes
 USE_OPENSSL=	yes
 CONFIGURE_ENV=	LIBS="${WIRESHARK_LIBS}"
 CONFIGURE_ARGS+=	--program-transform-name="" \
-			--with-ssl=${OPENSSLBASE} \
-			--disable-warnings-as-errors
+			--with-ssl=${OPENSSLBASE}
 USE_LDCONFIG=	yes
 DATADIR=	${PREFIX}/share/${DATADIR_NAME}
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -70,7 +69,8 @@ OPTIONS=	RTP "Enable support for playing back RTP streams" off \
 		SNMP "Enable SNMP OID translation support" on \
 		ADNS "Enable asynchronous DNS lookup support" on \
 		PCRE "Enable regular expression matching support" on \
-		IPV6 "Enable IPv6 support" on
+		IPV6 "Enable IPv6 support" on \
+		GEOIP "Enable GeoIP lookups" on
 .endif
 
 .include <bsd.port.pre.mk>
@@ -78,20 +78,13 @@ OPTIONS=	RTP "Enable support for playing back RTP streams" off \
 .if !defined(WITHOUT_X11)
 MAN1+=		wireshark.1
 PLIST_SUB+=	WIRESHARK=bin/wireshark
-.if defined(WITHOUT_GTK2)
-USE_GNOME+=	gtk12
-CONFIGURE_ARGS+=	--disable-gtk2
-.else
 USE_GNOME+=	gtk20
 WIRESHARK_LIBS+=${PTHREAD_LIBS}
-.endif
 .else
 PLIST_SUB+=	WIRESHARK="@comment wireshark not built"
-USE_GNOME+=	glib12
+USE_GNOME+=	glib20
 CONFIGURE_ARGS+=	--enable-wireshark=no \
-			--disable-gtktest \
-			--with-gtk-prefix=/nonexistent \
-			--disable-gtk2
+			--disable-gtktest
 .endif
 
 GNU_CONFIGURE=	yes
@@ -147,6 +140,13 @@ CONFIGURE_ARGS+=	--with-adns=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-adns=no
 .endif
 
+.if !defined(WITHOUT_GEOIP) && !defined(LITE)
+LIB_DEPENDS+=	GeoIP.5:${PORTSDIR}/net/GeoIP
+CONFIGURE_ARGS+=	--with-geoip=${LOCALBASE}/lib
+.else
+CONFIGURE_ARGS+=	--with-geoip=no
+.endif
+
 .if exists(${LOCALBASE}/lib/libgnutls.so) || defined(WITH_GNUTLS)
 LIB_DEPENDS+=	gnutls.26:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--with-libgnutls-prefix=${LOCALBASE}
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index a830706e99b3..7836e9a510bb 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,3 +1,3 @@
-MD5 (wireshark-1.0.8.tar.bz2) = 09d895f111ee768cc0d7c7e2c427c496
-SHA256 (wireshark-1.0.8.tar.bz2) = c07b7ec145c77be6ca7d011e4340ee283d021052c44958da18e87d55e896f894
-SIZE (wireshark-1.0.8.tar.bz2) = 13347689
+MD5 (wireshark-1.2.0.tar.bz2) = d3f799e0ae7953cd3426d9e0b6e2708d
+SHA256 (wireshark-1.2.0.tar.bz2) = bd8558ec36e2d31a628c3bdc70027487b79dad3a51fb5f0f79375c768b984e97
+SIZE (wireshark-1.2.0.tar.bz2) = 15387864
diff --git a/net/wireshark/files/patch-configure b/net/wireshark/files/patch-configure
index f597c87f551a..32b92d11c60c 100644
--- a/net/wireshark/files/patch-configure
+++ b/net/wireshark/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2007-12-20 02:18:48.000000000 -0500
-+++ configure	2007-12-20 02:23:34.000000000 -0500
-@@ -22284,7 +22284,7 @@ echo $ECHO_N "checking whether we should
+--- configure.orig	2009-06-20 18:39:36.000000000 -0400
++++ configure	2009-06-20 18:39:40.000000000 -0400
+@@ -23392,7 +23392,7 @@ echo $ECHO_N "checking whether we should
  # Check whether --enable-warnings-as-errors was given.
  if test "${enable_warnings_as_errors+set}" = set; then
    enableval=$enable_warnings_as_errors;
@@ -9,66 +9,16 @@
      with_warnings_as_errors="yes"
      { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
-@@ -23494,6 +23494,7 @@ echo $ECHO_N "checking for GLIB - versio
+@@ -25128,7 +25128,7 @@ _ACEOF
+ fi
  
-     GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-     GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-+    GLIB_LIBS="-liconv $GLIB_LIBS"
-     glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-     glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-@@ -23504,7 +23505,7 @@ echo $ECHO_N "checking for GLIB - versio
-       ac_save_CFLAGS="$CFLAGS"
-       ac_save_LIBS="$LIBS"
-       CFLAGS="$CFLAGS $GLIB_CFLAGS"
--      LIBS="$GLIB_LIBS $LIBS"
-+      LIBS="$GLIB_LIBS -liconv $LIBS"
-       rm -f conf.glibtest
-       if test "$cross_compiling" = yes; then
-   echo $ac_n "cross compiling; assumed OK... $ac_c"
-@@ -23819,6 +23820,7 @@ echo $ECHO_N "checking for GLIB - versio
-   else
-     GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-     GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-+    GLIB_LIBS="-liconv $GLIB_LIBS"
-     glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-     glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-@@ -24158,6 +24160,7 @@ echo $ECHO_N "checking for GLIB - versio
  
-     GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
-     GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
-+    GLIB_LIBS="-liconv $GLIB_LIBS"
-     glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
-            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-     glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \
-@@ -24483,6 +24486,7 @@ echo $ECHO_N "checking for GLIB - versio
-   else
-     GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
-     GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
-+    GLIB_LIBS="-liconv $GLIB_LIBS"
-     glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
-            sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
-     glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
-@@ -24493,7 +24497,7 @@ echo $ECHO_N "checking for GLIB - versio
-       ac_save_CFLAGS="$CFLAGS"
-       ac_save_LIBS="$LIBS"
-       CFLAGS="$CFLAGS $GLIB_CFLAGS"
--      LIBS="$GLIB_LIBS $LIBS"
-+      LIBS="$GLIB_LIBS -liconv $LIBS"
-       rm -f conf.glibtest
-       if test "$cross_compiling" = yes; then
-   echo $ac_n "cross compiling; assumed OK... $ac_c"
-@@ -24722,7 +24726,7 @@ echo $ECHO_N "checking whether GLib supp
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
--LIBS="$GLIB_LIBS $LIBS"
-+LIBS="$GLIB_LIBS -liconv $LIBS"
- if test "$cross_compiling" = yes; then
-   echo $ac_n "cross compiling; assumed OK... $ac_c"
-     ac_cv_glib_supports_modules=yes
-@@ -30482,7 +30486,7 @@ echo "${ECHO_T}yes" >&6; }
+-	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; }
+@@ -30490,7 +30490,7 @@ echo "${ECHO_T}yes" >&6; }
  	  #
  	  CFLAGS="$CFLAGS -I$krb5_dir/include"
  	  CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
@@ -77,7 +27,7 @@
  	  ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
  	  ac_krb5_version="$ac_heimdal_version$ac_mit_version"
  	  if test "x$ac_krb5_version" = "xHEIMDAL"
-@@ -30541,7 +30545,7 @@ fi
+@@ -30549,7 +30549,7 @@ fi
  
  	  if test -x "$KRB5_CONFIG"
  	  then
diff --git a/net/wireshark/files/patch-epan_Makefile.in b/net/wireshark/files/patch-epan_Makefile.in
index 66499dc72565..6b411a68bd85 100644
--- a/net/wireshark/files/patch-epan_Makefile.in
+++ b/net/wireshark/files/patch-epan_Makefile.in
@@ -1,20 +1,20 @@
---- epan/Makefile.in.orig	2008-03-29 13:27:14.000000000 -0400
-+++ epan/Makefile.in	2008-04-01 01:50:07.000000000 -0400
-@@ -792,7 +792,7 @@ MAINTAINERCLEANFILES = \
+--- epan/Makefile.in.orig	2009-06-16 00:04:18.000000000 -0400
++++ epan/Makefile.in	2009-06-20 18:40:38.000000000 -0400
+@@ -770,7 +770,7 @@ MAINTAINERCLEANFILES = \
  # Add the object files for missing routines, if any.
  #
- libwireshark_la_LIBADD = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ \
+ libwireshark_la_LIBADD = \
 -	@INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
-+	@INET_ATON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
- 	libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
- 	dfilter/libdfilter.la dissectors/libcleandissectors.la \
- 	dissectors/libdissectors.la dissectors/libasndissectors.la \
-@@ -801,7 +801,7 @@ libwireshark_la_LIBADD = @G_ASCII_STRCAS
- 	@SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm
++	@INET_ATON_LO@ @INET_PTON_LO@ libwireshark_generated.la \
+ 	libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \
+ 	ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
+ 	dissectors/libdirtydissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
+@@ -779,7 +779,7 @@ libwireshark_la_LIBADD = \
+ 	${top_builddir}/wsutil/libwsutil.la -lm
  
- libwireshark_la_DEPENDENCIES = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ \
+ libwireshark_la_DEPENDENCIES = \
 -	@INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
-+	@INET_ATON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
- 	libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
- 	dfilter/libdfilter.la dissectors/libcleandissectors.la \
- 	dissectors/libdissectors.la dissectors/libasndissectors.la \
++	@INET_ATON_LO@ @INET_PTON_LO@ libwireshark_generated.la \
+ 	libwireshark_asmopt.la crc/libcrc.la crypt/libairpdcap.la \
+ 	ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
+ 	dissectors/libdirtydissectors.la $(wslua_lib) \
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index ee64a22278b8..280d369190ef 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -9,72 +9,51 @@ bin/dumpcap
 %%RAWSHARK%%
 bin/tshark
 %%TEXT2PCAP%%
-lib/wireshark/plugins/%%PORTVERSION%%/agentx.la
-lib/wireshark/plugins/%%PORTVERSION%%/agentx.so
-lib/wireshark/plugins/%%PORTVERSION%%/artnet.la
-lib/wireshark/plugins/%%PORTVERSION%%/artnet.so
+lib/libwireshark.la
+lib/libwireshark.so
+lib/libwireshark.so.0
+lib/libwiretap.la
+lib/libwiretap.so
+lib/libwiretap.so.0
+lib/libwsutil.la
+lib/libwsutil.so
+lib/libwsutil.so.0
 lib/wireshark/plugins/%%PORTVERSION%%/asn1.la
 lib/wireshark/plugins/%%PORTVERSION%%/asn1.so
-lib/wireshark/plugins/%%PORTVERSION%%/ciscosm.la
-lib/wireshark/plugins/%%PORTVERSION%%/ciscosm.so
 lib/wireshark/plugins/%%PORTVERSION%%/coseventcomm.la
 lib/wireshark/plugins/%%PORTVERSION%%/coseventcomm.so
 lib/wireshark/plugins/%%PORTVERSION%%/cosnaming.la
 lib/wireshark/plugins/%%PORTVERSION%%/cosnaming.so
 lib/wireshark/plugins/%%PORTVERSION%%/docsis.la
 lib/wireshark/plugins/%%PORTVERSION%%/docsis.so
-lib/wireshark/plugins/%%PORTVERSION%%/enttec.la
-lib/wireshark/plugins/%%PORTVERSION%%/enttec.so
 lib/wireshark/plugins/%%PORTVERSION%%/ethercat.la
 lib/wireshark/plugins/%%PORTVERSION%%/ethercat.so
 lib/wireshark/plugins/%%PORTVERSION%%/gryphon.la
 lib/wireshark/plugins/%%PORTVERSION%%/gryphon.so
-lib/wireshark/plugins/%%PORTVERSION%%/infiniband.la
-lib/wireshark/plugins/%%PORTVERSION%%/infiniband.so
 lib/wireshark/plugins/%%PORTVERSION%%/irda.la
 lib/wireshark/plugins/%%PORTVERSION%%/irda.so
-lib/wireshark/plugins/%%PORTVERSION%%/lwres.la
-lib/wireshark/plugins/%%PORTVERSION%%/lwres.so
 lib/wireshark/plugins/%%PORTVERSION%%/m2m.la
 lib/wireshark/plugins/%%PORTVERSION%%/m2m.so
 lib/wireshark/plugins/%%PORTVERSION%%/mate.la
 lib/wireshark/plugins/%%PORTVERSION%%/mate.so
 lib/wireshark/plugins/%%PORTVERSION%%/opcua.la
 lib/wireshark/plugins/%%PORTVERSION%%/opcua.so
-lib/wireshark/plugins/%%PORTVERSION%%/opsi.la
-lib/wireshark/plugins/%%PORTVERSION%%/opsi.so
 lib/wireshark/plugins/%%PORTVERSION%%/parlay.la
 lib/wireshark/plugins/%%PORTVERSION%%/parlay.so
-lib/wireshark/plugins/%%PORTVERSION%%/pcli.la
-lib/wireshark/plugins/%%PORTVERSION%%/pcli.so
 lib/wireshark/plugins/%%PORTVERSION%%/profinet.la
 lib/wireshark/plugins/%%PORTVERSION%%/profinet.so
-lib/wireshark/plugins/%%PORTVERSION%%/rlm.la
-lib/wireshark/plugins/%%PORTVERSION%%/rlm.so
-lib/wireshark/plugins/%%PORTVERSION%%/rtnet.la
-lib/wireshark/plugins/%%PORTVERSION%%/rtnet.so
-lib/wireshark/plugins/%%PORTVERSION%%/rudp.la
-lib/wireshark/plugins/%%PORTVERSION%%/rudp.so
-lib/wireshark/plugins/%%PORTVERSION%%/sbus.la
-lib/wireshark/plugins/%%PORTVERSION%%/sbus.so
+lib/wireshark/plugins/%%PORTVERSION%%/sercosiii.la
+lib/wireshark/plugins/%%PORTVERSION%%/sercosiii.so
 lib/wireshark/plugins/%%PORTVERSION%%/stats_tree.la
 lib/wireshark/plugins/%%PORTVERSION%%/stats_tree.so
 lib/wireshark/plugins/%%PORTVERSION%%/tango.la
 lib/wireshark/plugins/%%PORTVERSION%%/tango.so
 lib/wireshark/plugins/%%PORTVERSION%%/unistim.la
 lib/wireshark/plugins/%%PORTVERSION%%/unistim.so
-lib/wireshark/plugins/%%PORTVERSION%%/v5ua.la
-lib/wireshark/plugins/%%PORTVERSION%%/v5ua.so
 lib/wireshark/plugins/%%PORTVERSION%%/wimax.la
 lib/wireshark/plugins/%%PORTVERSION%%/wimax.so
 lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.la
 lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so
-lib/libwireshark.la
-lib/libwireshark.so
-lib/libwireshark.so.0
-lib/libwiretap.la
-lib/libwiretap.so
-lib/libwiretap.so.0
 %%DATADIR%%/AUTHORS-SHORT
 %%DATADIR%%/COPYING
 %%DATADIR%%/capinfos.html
@@ -124,6 +103,7 @@ lib/libwiretap.so.0
 %%DATADIR%%/help/overview.txt
 %%DATADIR%%/help/toc
 %%DATADIR%%/idl2wrs.html
+%%DATADIR%%/ipmap.html
 %%DATADIR%%/manuf
 %%DATADIR%%/mergecap.html
 %%DATADIR%%/radius/dictionary
@@ -178,6 +158,7 @@ lib/libwiretap.so.0
 %%DATADIR%%/radius/dictionary.shiva
 %%DATADIR%%/radius/dictionary.sonicwall
 %%DATADIR%%/radius/dictionary.springtide
+%%DATADIR%%/radius/dictionary.starent
 %%DATADIR%%/radius/dictionary.t_systems_nova
 %%DATADIR%%/radius/dictionary.telebit
 %%DATADIR%%/radius/dictionary.trapeze
@@ -189,6 +170,7 @@ lib/libwiretap.so.0
 %%DATADIR%%/radius/dictionary.versanet
 %%DATADIR%%/radius/dictionary.wispr
 %%DATADIR%%/radius/dictionary.xedia
+%%DATADIR%%/radius/dictionary.wimax
 %%DATADIR%%/rawshark.html
 %%DATADIR%%/tshark.html
 %%DATADIR%%/text2pcap.html