misc/135268: Update to version 1.1.3 and update messages warning in the Makefile

Sylvio Cesar scjamorim at bsd.com.br
Thu Jun 4 19:00:11 UTC 2009


>Number:         135268
>Category:       misc
>Synopsis:       Update to version 1.1.3 and update messages warning in the Makefile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 04 19:00:10 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Sylvio Cesar
>Release:        
>Organization:
>Environment:
>Description:
Update to version 1.1.3 and update messages warning in the Makefile, too removed files in the directory "files", this files not more needs.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/wireshark/Makefile,v
retrieving revision 1.142
diff -u -r1.142 Makefile
--- Makefile	22 May 2009 05:36:06 -0000	1.142
+++ Makefile	4 Jun 2009 18:34:17 -0000
@@ -5,9 +5,8 @@
 # $FreeBSD: ports/net/wireshark/Makefile,v 1.142 2009/05/22 05:36:06 marcus Exp $
 #
 
-PORTNAME?=	wireshark
-PORTVERSION=	1.0.8
-PORTREVISION?=	0
+PORTNAME=	wireshark
+PORTVERSION=	1.1.3
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.wireshark.org/download/src/ \
     		http://wireshark.osmirror.nl/download/src/ \
@@ -18,7 +17,7 @@
 DISTNAME=	${DATADIR_NAME}-${PORTVERSION}
 
 MAINTAINER=	marcus at FreeBSD.org
-COMMENT?=	A powerful network analyzer/capture tool
+COMMENT=	A powerful network analyzer/capture tool
 
 DATADIR_NAME=	wireshark
 
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/wireshark/distinfo,v
retrieving revision 1.69
diff -u -r1.69 distinfo
--- distinfo	22 May 2009 05:36:07 -0000	1.69
+++ distinfo	4 Jun 2009 18:34:17 -0000
@@ -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.1.3.tar.bz2) = 835b239174fb7f8b812db87d7d9cdcf2
+SHA256 (wireshark-1.1.3.tar.bz2) = 7d42838483bb5fdef85c2f439d89334230c6350019cecc22d3aece9429244872
+SIZE (wireshark-1.1.3.tar.bz2) = 14491266
Index: files/patch-configure
===================================================================
RCS file: files/patch-configure
diff -N files/patch-configure
--- files/patch-configure	20 Dec 2007 18:49:27 -0000	1.9
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,88 +0,0 @@
---- 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
- # Check whether --enable-warnings-as-errors was given.
- if test "${enable_warnings_as_errors+set}" = set; then
-   enableval=$enable_warnings_as_errors;
--  if test "x$GCC" = "xyes" -a "x$enableval" == "xyes" -a "x$wireshark_extra_gcc_flags" != "xyes"; then
-+  if test "x$GCC" = "xyes" -a "x$enableval" = "xyes" -a "x$wireshark_extra_gcc_flags" != "xyes"; then
-     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
- 
-     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; }
- 	  #
- 	  CFLAGS="$CFLAGS -I$krb5_dir/include"
- 	  CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
--	  ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
-+	  ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'`
- 	  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
- 
- 	  if test -x "$KRB5_CONFIG"
- 	  then
--	    KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
-+	    KRB5_FLAGS=`"$KRB5_CONFIG" --cflags | sed -e 's/@INCLUDE_des@//g'`
- 	    KRB5_LIBS=`"$KRB5_CONFIG" --libs`
- 	    CFLAGS="$CFLAGS $KRB5_FLAGS"
- 	    CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
Index: files/patch-epan_Makefile.in
===================================================================
RCS file: files/patch-epan_Makefile.in
diff -N files/patch-epan_Makefile.in
--- files/patch-epan_Makefile.in	1 Apr 2008 06:19:11 -0000	1.6
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- 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 = \
- # Add the object files for missing routines, if any.
- #
- libwireshark_la_LIBADD = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ \
--	@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
- 
- libwireshark_la_DEPENDENCIES = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ \
--	@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 \


>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-bugs mailing list