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

[hson at users.sourceforge.net]

Revision: 9612
          http://gar.svn.sourceforge.net/gar/?rev=9612&view=rev
Author:   hson
Date:     2010-04-11 00:37:03 +0000 (Sun, 11 Apr 2010)

Log Message:
-----------
wireshark: Update to 1.2.7, cleanup of Makefile

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

Modified: csw/mgar/pkg/wireshark/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wireshark/trunk/Makefile	2010-04-10 10:22:38 UTC (rev 9611)
+++ csw/mgar/pkg/wireshark/trunk/Makefile	2010-04-11 00:37:03 UTC (rev 9612)
@@ -1,5 +1,5 @@
 GARNAME = wireshark
-GARVERSION = 1.2.3
+GARVERSION = 1.2.7
 CATEGORIES = apps
 
 DESCRIPTION = Wireshark (was Ethereal) is a free network protocol analyzer
@@ -12,34 +12,31 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 
-RUNTIME_DEP_PKGS += CSWgcrypt CSWgeoip CSWggettextrt CSWglib2 CSWgnutls
-RUNTIME_DEP_PKGS += CSWgpgerr CSWgtk2 CSWkrb5lib CSWlibpcap CSWlibxext
-RUNTIME_DEP_PKGS += CSWlua CSWpango CSWpcrert CSWzlib
+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 += CSWgnutls CSWlibcares
+RUNTIME_DEP_PKGS_CSWwireshark += CSWlibsmi
+RUNTIME_DEP_PKGS_CSWwireshark += CSWosslrt
 
-# We define upstream file regex so we can be notifed of new upstream software release
+# krb5-config has -R/opt/csw/lib/
+CHECKPKG_OVERRIDES_CSWwireshark += bad-rpath-entry|/opt/csw/lib/
+
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
 SPKG_SOURCEURL = http://www.wireshark.org/
 
-#SED = /opt/csw/bin/gsed
-#EXTRA_COMMON_EXPORTS = SED
-
 EXTRA_INC = $(prefix)/X11/include
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-#EXTRA_INC += /opt/csw/include/gtk-2.0
-#EXTRA_INC += /opt/csw/lib/gtk-2.0/include
-#EXTRA_INC += /opt/csw/include/glib-2.0
-#EXTRA_INC += /opt/csw/lib/glib-2.0/include
-#EXTRA_INC += /opt/csw/include/cairo
-#EXTRA_INC += /opt/csw/include/pango-1.0
-#EXTRA_INC += /opt/csw/include/atk-1.0
+# 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_LINKER_FLAGS = -lgtk-x11-2.0 -lX11 /usr/openwin/lib/libXext.so
-EXTRA_LINKER_FLAGS = /usr/openwin/lib/libXext.so
-
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --enable-usr-local=no
+CONFIGURE_ARGS += --with-ssl=/opt/csw
 
 TEST_SCRIPTS =
 

Modified: csw/mgar/pkg/wireshark/trunk/checksums
===================================================================
--- csw/mgar/pkg/wireshark/trunk/checksums	2010-04-10 10:22:38 UTC (rev 9611)
+++ csw/mgar/pkg/wireshark/trunk/checksums	2010-04-11 00:37:03 UTC (rev 9612)
@@ -1 +1,2 @@
-c2dfc197e485a0b0072ca64b8ac4d24c  wireshark-1.2.3.tar.bz2
+0fd62ea77189c27f583a3bc83d60c794  configure.diff
+cff6b18aa47a7e3eb973efe62c676b50  wireshark-1.2.7.tar.bz2


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