jer 14/07/18 03:11:48
Modified: trafshow-5.2.3-gcc44.patch
trafshow-5.2.3-gentoo.patch
Added: trafshow-5.2.3-tinfo.patch
Log:
EAPI bump. Fix building against sys-libs/ncurses[tinfo]. Clean up patches.
Remove short <longdescription>.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.2 net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch?r1=1.1&r2=1.2
Index: trafshow-5.2.3-gcc44.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/trafshow/files/trafshow-5.2.3-gcc44.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trafshow-5.2.3-gcc44.patch 25 Jul 2009 20:55:47 -0000 1.1
+++ trafshow-5.2.3-gcc44.patch 18 Jul 2014 03:11:48 -0000 1.2
@@ -1,6 +1,5 @@
-diff -ur trafshow-5.2.3.orig/session.c trafshow-5.2.3/session.c
---- trafshow-5.2.3.orig/session.c 2006-01-08 07:58:08.000000000 +0200
-+++ trafshow-5.2.3/session.c 2009-07-25 23:54:32.000000000 +0300
+--- a/session.c
++++ b/session.c
@@ -40,7 +40,7 @@
#define ASYNC_MODE FNDELAY
#elif O_ASYNC
1.3 net-analyzer/trafshow/files/trafshow-5.2.3-gentoo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/trafshow/files/trafshow-5.2.3-gentoo.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/trafshow/files/trafshow-5.2.3-gentoo.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/trafshow/files/trafshow-5.2.3-gentoo.patch?r1=1.2&r2=1.3
Index: trafshow-5.2.3-gentoo.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/trafshow/files/trafshow-5.2.3-gentoo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trafshow-5.2.3-gentoo.patch 15 Jan 2009 06:18:06 -0000 1.2
+++ trafshow-5.2.3-gentoo.patch 18 Jul 2014 03:11:48 -0000 1.3
@@ -1,5 +1,5 @@
---- trafshow-5.2.3/Makefile.in.orig 2004-06-15 10:29:14.000000000 +0200
-+++ trafshow-5.2.3/Makefile.in 2009-01-15 06:49:41.000000000 +0100
+--- a/Makefile.in
++++ b/Makefile.in
@@ -73,9 +73,9 @@
@echo 'char compiled[] = "$(CC) $(CFLAGS) $(LIBS)";' >> $@
1.1 net-analyzer/trafshow/files/trafshow-5.2.3-tinfo.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/trafshow/files/trafshow-5.2.3-tinfo.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/trafshow/files/trafshow-5.2.3-tinfo.patch?rev=1.1&content-type=text/plain
Index: trafshow-5.2.3-tinfo.patch
===================================================================
--- a/configure.in
+++ b/configure.in
@@ -23,6 +23,9 @@
AC_PROG_CC
AC_PROG_YACC
AC_PROG_LEX
+
+PKG_PROG_PKG_CONFIG
+
AC_REQUIRE_CPP
AC_AIX
ACX_PTHREAD(, AC_MSG_ERROR(cannot find pthread; see the INSTALL notes))
@@ -51,7 +54,7 @@
)
)
if test "$ac_cv_type_in_addr_t" != yes; then
- AC_DEFINE_UNQUOTED(in_addr_t, $ac_cv_type_in_addr_t)
+ AC_DEFINE_UNQUOTED([in_addr_t], [$ac_cv_type_in_addr_t], [addr_t])
fi
AC_CACHE_CHECK(for socklen_t, ac_cv_type_socklen_t,
@@ -65,7 +68,7 @@
)
)
if test "$ac_cv_type_socklen_t" != yes; then
- AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_type_socklen_t)
+ AC_DEFINE_UNQUOTED([socklen_t], [$ac_cv_type_socklen_t], [socklen_t])
fi
AC_CACHE_CHECK(for struct sockaddr_storage, ac_cv_sockaddr_storage,
@@ -79,7 +82,7 @@
)
)
if test "$ac_cv_sockaddr_storage" != no; then
- AC_DEFINE(HAVE_SOCKADDR_STORAGE)
+ AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [have sockaddr_storage])
fi
AC_CACHE_CHECK(for struct ether_addr, ac_cv_ether_addr,
@@ -94,7 +97,7 @@
)
)
if test "$ac_cv_ether_addr" != no; then
- AC_DEFINE(HAVE_ETHER_ADDR)
+ AC_DEFINE(HAVE_ETHER_ADDR, 1, [have ether_addr])
fi
dnl Check for network system libraries.
@@ -144,20 +147,21 @@
case "$ac_cv_have_curses" in
slang)
- AC_DEFINE(HAVE_SLCURSES)
- AC_DEFINE(HAVE_HAS_COLORS)
+ AC_DEFINE(HAVE_SLCURSES, 1, [have slcurses])
+ AC_DEFINE(HAVE_HAS_COLORS, 1, [have colors])
;;
ncurses)
- AC_DEFINE(HAVE_NCURSES)
+ PKG_CHECK_MODULES(ncurses,ncurses, [LIBS="$LIBS $ncurses_LIBS"],
[ncurses not found])
+ AC_DEFINE(HAVE_NCURSES, 1, [have ncurses])
AC_CHECK_FUNCS(has_colors)
;;
n_curses)
CFLAGS="-I/usr/include/ncurses $CFLAGS"
- AC_DEFINE(HAVE_NCURSES)
+ AC_DEFINE(HAVE_NCURSES, 1, [have n_curses])
AC_CHECK_FUNCS(has_colors)
;;
curses)
- AC_DEFINE(HAVE_CURSES)
+ AC_DEFINE(HAVE_CURSES, 1, [have curses])
AC_CHECK_FUNCS(has_colors)
;;
*)
