[csw-devel] SF.net SVN: gar:[11050] csw/mgar/pkg/wireshark/trunk

[hson at users.sourceforge.net]

Revision: 11050
          http://gar.svn.sourceforge.net/gar/?rev=11050&view=rev
Author:   hson
Date:     2010-09-24 16:59:52 +0000 (Fri, 24 Sep 2010)

Log Message:
-----------
wireshark: Update to 1.4.0

Modified Paths:
--------------
    csw/mgar/pkg/wireshark/trunk/Makefile
    csw/mgar/pkg/wireshark/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch

Modified: csw/mgar/pkg/wireshark/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wireshark/trunk/Makefile	2010-09-24 04:16:42 UTC (rev 11049)
+++ csw/mgar/pkg/wireshark/trunk/Makefile	2010-09-24 16:59:52 UTC (rev 11050)
@@ -1,5 +1,5 @@
 GARNAME = wireshark
-GARVERSION = 1.2.7
+GARVERSION = 1.4.0
 CATEGORIES = apps
 
 DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer
@@ -14,25 +14,30 @@
 
 RUNTIME_DEP_PKGS_CSWwireshark += CSWgcrypt CSWgeoip CSWggettextrt CSWglib2
 RUNTIME_DEP_PKGS_CSWwireshark += CSWgpgerr CSWgtk2 CSWkrb5lib CSWlibpcap 
-RUNTIME_DEP_PKGS_CSWwireshark += CSWlua CSWpango CSWpcrert CSWzlib
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlua CSWpango CSWzlib
 RUNTIME_DEP_PKGS_CSWwireshark += CSWgnutls CSWlibcares
 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibsmi
 RUNTIME_DEP_PKGS_CSWwireshark += CSWosslrt
 
-# krb5-config has -R/opt/csw/lib/
-CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/
+PATCHFILES = 0001-Solaris-9-doesn-t-have-stdint.h.patch
 
+CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/dftest
+CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/rawshark
+CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/tshark
+CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/bin/wireshark
+CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libwireshark.so.0.0.1
+
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
 SPKG_SOURCEURL = http://www.wireshark.org/
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+#EXTRA_INC = $(prefix)/X11/include
+#EXTRA_LIB = $(prefix)/X11/lib
+#EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
 # We want to be link with Xrender from $(prefix)/X11/lib not $(prefix)/lib
 # since the latter is linked to /usr/openwin/lib/libX11.so.4
-EXTRA_SOS_LD_FLAGS += -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
+#EXTRA_SOS_LD_FLAGS += -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-usr-local=no

Modified: csw/mgar/pkg/wireshark/trunk/checksums
===================================================================
--- csw/mgar/pkg/wireshark/trunk/checksums	2010-09-24 04:16:42 UTC (rev 11049)
+++ csw/mgar/pkg/wireshark/trunk/checksums	2010-09-24 16:59:52 UTC (rev 11050)
@@ -1,2 +1 @@
-0fd62ea77189c27f583a3bc83d60c794  configure.diff
-cff6b18aa47a7e3eb973efe62c676b50  wireshark-1.2.7.tar.bz2
+13b188baea23cdad40b7a55921384a77  wireshark-1.4.0.tar.bz2

Added: csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch
===================================================================
--- csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch	                        (rev 0)
+++ csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch	2010-09-24 16:59:52 UTC (rev 11050)
@@ -0,0 +1,26 @@
+From dd7dcff4a05a4dfdd2e2db961c633e15fff4f8eb Mon Sep 17 00:00:00 2001
+From: Roger Hakansson <hson at current9x.(none)>
+Date: Thu, 23 Sep 2010 21:19:05 +0200
+Subject: [PATCH] Solaris 9 doesn't have stdint.h
+
+---
+ epan/wslua/lua_bitop.c |    4 ++
+ 1 files changed, 4 insertions(+)
+
+diff --git a/epan/wslua/lua_bitop.c b/epan/wslua/lua_bitop.c
+index e358e7a..6603eb6 100644
+--- a/epan/wslua/lua_bitop.c
++++ b/epan/wslua/lua_bitop.c
+@@ -40,8 +40,12 @@ typedef __int32 int32_t;
+ typedef unsigned __int32 uint32_t;
+ typedef unsigned __int64 uint64_t;
+ #else
++#if defined(__SUNPRO_C) || defined (__SUNPRO_CC)
++#include <sys/inttypes.h>
++#else
+ #include <stdint.h>
+ #endif
++#endif
+ 
+ typedef int32_t SBits;
+ typedef uint32_t UBits;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.