SF.net SVN: gar:[22770] csw/mgar/pkg/iftop/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22770
          http://sourceforge.net/p/gar/code/22770
Author:   dmichelsen
Date:     2014-01-01 20:22:37 +0000 (Wed, 01 Jan 2014)
Log Message:
-----------
iftop/trunk: Some work toward 1.0

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

Added Paths:
-----------
    csw/mgar/pkg/iftop/trunk/files/0001-Also-look-in-libcares.patch

Modified: csw/mgar/pkg/iftop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/iftop/trunk/Makefile	2014-01-01 20:19:36 UTC (rev 22769)
+++ csw/mgar/pkg/iftop/trunk/Makefile	2014-01-01 20:22:37 UTC (rev 22770)
@@ -1,6 +1,9 @@
+# TODO
+# ! Test manually with   CPPFLAGS="-I/opt/csw/include -I/opt/csw/include/ncursesw" LDFLAGS="-L/opt/csw/lib/sparcv8plus -R/opt/csw/lib/sparcv8plus" ./configure --with-resolver=ares
+
 NAME = iftop
 #VERSION = 0.17
-VERSION = 1.0pre2
+VERSION = 1.0pre3
 GARTYPE = v2
 
 DESCRIPTION = Display bandwidth usage on an interface by host
@@ -13,13 +16,13 @@
 
 MASTER_SITES = http://www.ex-parrot.com/~pdw/iftop/download/
 DISTFILES  += $(DISTNAME).tar.gz
-PATCHFILES += 0001-old-style-patch-patch-ui.c.patch
-PATCHFILES += 0002-Omit-static-function-sigalrm.patch
+#PATCHFILES += 0001-old-style-patch-patch-ui.c.patch
+#PATCHFILES += 0002-Omit-static-function-sigalrm.patch
 PATCHFILES += 0003-Add-sys-sockio.h-to-have-SIOCGIFFLAGS.patch
-PATCHFILES += 0004-Skip-the-parts-not-only-in-Linux-but-also-Solaris.patch
+#PATCHFILES += 0004-Skip-the-parts-not-only-in-Linux-but-also-Solaris.patch
 
 # Also look for libcares when specifying ares as resolver
-PATCHFILES += 0001-Add-libcares-in-addition-to-libares-redo-autoreconf.patch
+#PATCHFILES += 0001-Add-libcares-in-addition-to-libares-redo-autoreconf.patch
 
 RUNTIME_DEP_PKGS_CSWiftop += CSWlibncursesw5
 RUNTIME_DEP_PKGS_CSWiftop += CSWlibpcap1
@@ -28,10 +31,10 @@
 # Because of use of anonymous unions, which are invalid in C (even C99), but valid in C++ with -features=extensions
 GARCOMPILER = GNU
 
-EXTRA_LDFLAGS  = -lpthread
+# EXTRA_LDFLAGS  = -lpthread
 
 CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --with-resolver=ares
+# CONFIGURE_ARGS += --with-resolver=ares
 
 # TEST_SCRIPTS = 
 

Modified: csw/mgar/pkg/iftop/trunk/checksums
===================================================================
--- csw/mgar/pkg/iftop/trunk/checksums	2014-01-01 20:19:36 UTC (rev 22769)
+++ csw/mgar/pkg/iftop/trunk/checksums	2014-01-01 20:22:37 UTC (rev 22770)
@@ -1 +1 @@
-fef521a49ec0122458d02c64212af3c5  iftop-1.0pre2.tar.gz
+eac65d14c2fca05df848dcf58c0ca9d3  iftop-1.0pre3.tar.gz

Added: csw/mgar/pkg/iftop/trunk/files/0001-Also-look-in-libcares.patch
===================================================================
--- csw/mgar/pkg/iftop/trunk/files/0001-Also-look-in-libcares.patch	                        (rev 0)
+++ csw/mgar/pkg/iftop/trunk/files/0001-Also-look-in-libcares.patch	2014-01-01 20:22:37 UTC (rev 22770)
@@ -0,0 +1,34 @@
+From d4fecf72fcc090a4547dc119b0900d7e9615c860 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 1 Jan 2014 21:20:09 +0100
+Subject: [PATCH] Also look in libcares
+
+---
+ configure.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 6c369a8..81b39fa 100644
+--- a/configure.in
++++ b/configure.in
+@@ -28,7 +28,7 @@ AC_CONFIG_AUX_DIR(config)
+ 
+ AC_CANONICAL_SYSTEM
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE(iftop, "1.0pre3")
+ 
+ AC_DEFINE_UNQUOTED(IFTOP_VERSION, "$VERSION", [The iftop version number])
+@@ -259,7 +259,7 @@ fi
+ dnl They may have asked for ares.
+ if test x$resolver = xares ; then
+     dnl See if ares is to hand....
+-    AC_SEARCH_LIBS(ares_init, [ares], [
++    AC_SEARCH_LIBS(ares_init, [ares cares], [
+         AC_DEFINE(USE_ARES, 1, [use ARES for name resolution])
+         ], [
+         dnl They asked for ares, but we can't give it to them, so stop.
+-- 
+1.8.4.1
+

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