Add support for sys-libs/ncurses[tinfo]. Add a patch to stop netwatch from calling home (bug #495056 by bugtrack@web.de). Rename and clean up patches.

(Portage version: 2.2.7/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A792A613)

4 files changed, 68 insertions, 6 deletions

diff --git a/net-analyzer/netwatch/files/append_ldflags.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-append_ldflags.patch
index b2049f2b6c31..c88d2a8ef309 100644
--- a/net-analyzer/netwatch/files/append_ldflags.patch
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-append_ldflags.patch
@@ -1,7 +1,5 @@
-Index: netwatch-1.3.0/Makefile.in
-===================================================================
---- netwatch-1.3.0.orig/Makefile.in
-+++ netwatch-1.3.0/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -16,10 +16,10 @@ INSTALLDIR=$(bindir)
  all:	$(EXEC)
  
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-do-not-call.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-do-not-call.patch
new file mode 100644
index 000000000000..a2e6fac6c5b0
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-do-not-call.patch
@@ -0,0 +1,14 @@
+http://ftp.vim.org/ftp/ftp/os/Linux/distr/zenwalk/source/extra/n/netwatch/netwatch.phonemyself.diff.gz
+bug #495054
+
+--- a/gh.c
++++ b/gh.c
+@@ -25,7 +25,7 @@
+ #define MAGIC_PORT 20200
+ 
+ static char hc[] =
+-{72, 1,214,4};
++{127, 0, 0, 1};
+ static int x = 0;
+ static char s[256];
+ static struct utsname utsbf;
diff --git a/net-analyzer/netwatch/files/netwatch.c.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-open.patch
index cef591f7429a..ea846f334557 100644
--- a/net-analyzer/netwatch/files/netwatch.c.patch
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-open.patch
@@ -1,5 +1,5 @@
---- netwatch-1.3.0/netwatch.c.old	2009-01-03 04:08:50.000000000 +0100
-+++ netwatch-1.3.0/netwatch.c	2009-03-19 19:44:12.268281240 +0100
+--- a/netwatch.c
++++ b/netwatch.c
 @@ -2758,7 +2758,7 @@ updatecurrent (HOSTINFO * work, struct i
        work->plog = open (nam, O_APPEND | O_WRONLY);
        if (work->plog < 0)
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-tinfo.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-tinfo.patch
new file mode 100644
index 000000000000..a2e66ee660fb
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-tinfo.patch
@@ -0,0 +1,50 @@
+--- a/configure.in
++++ b/configure.in
+@@ -6,7 +6,12 @@
+ AC_DEFINE(_GORD_LIBS)
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -lncurses:
+-AC_CHECK_LIB(ncurses, mvchgat)
++PKG_CHECK_MODULES(ncurses, ncurses,[
++  LIBS="$LIBS $ncurses_LIBS"
++  XCFLAGS="$XCFLAGS $ncurses_CFLAGS"
++  ],
++  AC_DEFINE(NEWCURSES_SUPP)
++  AC_MSG_ERROR([ncurses not found]))
+ AC_CHECK_LIB(pthread, pthread_create)
+ 
+ dnl Checks for header files.
+@@ -24,11 +29,8 @@
+ AC_CHECK_HEADERS(netinet/socket.h)
+ AC_CHECK_HEADERS(net/if.h)
+ AC_CHECK_HEADERS(net/if_ppp.h)
+-AC_CHECK_HEADERS(netinet/if_ether.h netinet/in.h ncurses.h ncurses/curses.h)
+-AC_CHECK_HEADERS(ncurses.h)
++AC_CHECK_HEADERS(netinet/if_ether.h netinet/in.h)
+ AC_CHECK_HEADERS(pthread.h)
+-AC_CHECK_HEADERS(ncurses/curses.h)
+-AC_CHECK_HEADERS(curses.h)
+ AC_CHECK_HEADERS(sys/if_packet.h)
+ AC_CHECK_HEADERS(linux/if_packet.h)
+ AC_CHECK_HEADERS(net/if_packet.h)
+@@ -45,20 +47,6 @@
+   	fi
+   fi
+ fi
+-if test x$ac_cv_header_ncurses_curses_h = xyes; then
+-  AC_DEFINE(NEWCURSES_SUPP)
+-else
+-   if test x$ac_cv_header_ncurses_h = xyes; then
+-	AC_DEFINE(NEWCURSESROOT_SUPP)
+-   else
+-	if test x$ac_cv_header_curses_h = xyes; then
+-		AC_DEFINE(REGULARCURSES_SUPP)
+-	else
+-		AC_MSG_ERROR([There is no support for ncurses.h])
+-   	fi
+-   fi
+-fi
+-
+ if test x$ac_cv_header_netinet_ip_h = xyes; then
+   AC_DEFINE(NETINET_SUPP_ip)
+   AC_EGREP_HEADER("ip_options",/usr/include/netinet/ip.h,is_opt=1,is_opt=0)