jer 14/07/15 00:14:28 Modified: nstats-0.4-makefile.patch nstats-0.4-glibc24.patch Added: nstats-0.4-tinfo.patch Log: EAPI bump. Fix building against sys-libs/ncurses[tinfo]. Drop <sys-libs/glibc-2.4 condition. Clean up patches. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.3 net-analyzer/nstats/files/nstats-0.4-makefile.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nstats/files/nstats-0.4-makefile.patch?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nstats/files/nstats-0.4-makefile.patch?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nstats/files/nstats-0.4-makefile.patch?r1=1.2&r2=1.3 Index: nstats-0.4-makefile.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nstats/files/nstats-0.4-makefile.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nstats-0.4-makefile.patch 13 Dec 2011 19:02:18 -0000 1.2 +++ nstats-0.4-makefile.patch 15 Jul 2014 00:14:28 -0000 1.3 @@ -2,8 +2,8 @@ # net-analyzer/bmon, sys-cluster/ceph and sys-process/nmon # bug #364685 ---- a/nstats-0.4/Makefile -+++ b/nstats-0.4/Makefile +--- a/Makefile ++++ b/Makefile @@ -53,7 +53,7 @@ mkdir -p $(DESTDIR)$(prefix)/bin/ mkdir -p $(DESTDIR)$(mandir)/man8/ 1.2 net-analyzer/nstats/files/nstats-0.4-glibc24.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nstats/files/nstats-0.4-glibc24.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nstats/files/nstats-0.4-glibc24.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nstats/files/nstats-0.4-glibc24.patch?r1=1.1&r2=1.2 Index: nstats-0.4-glibc24.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nstats/files/nstats-0.4-glibc24.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nstats-0.4-glibc24.patch 27 Mar 2006 00:41:43 -0000 1.1 +++ nstats-0.4-glibc24.patch 15 Jul 2014 00:14:28 -0000 1.2 @@ -1,5 +1,5 @@ ---- ./nstats-0.4.orig/src/packet.c 2002-05-02 17:34:25.000000000 +0200 -+++ ./nstats-0.4/src/packet.c 2006-03-27 02:15:47.000000000 +0200 +--- a/src/packet.c ++++ b/src/packet.c @@ -148,9 +148,9 @@ stats.ip.ipv6.icmp.dst_unreach.s_admin += hdr->len; break; @@ -35,8 +35,8 @@ case ND_ROUTER_SOLICIT: stats.ip.ipv6.icmp.nd_router_solicit++; stats.ip.ipv6.icmp.s_nd_router_solicit += hdr->len; ---- ./nstats-0.4.orig/src/stats.c 2002-05-02 17:34:25.000000000 +0200 -+++ ./nstats-0.4/src/stats.c 2006-03-27 02:18:41.000000000 +0200 +--- a/src/stats.c ++++ b/src/stats.c @@ -316,15 +316,6 @@ print_line("Echo Reply:", ICMP6.echo_reply, ICMP6.cnt, ICMP6.s_echo_reply, ICMP6.bs, .0); @@ -53,8 +53,8 @@ print_line("ND Rtr Solicit:", ICMP6.nd_router_solicit, ICMP6.cnt, ICMP6.s_nd_router_solicit, ICMP6.bs, .0); NEXT_ROW; ---- ./nstats-0.4.orig/src/stats.h 2002-05-02 17:34:25.000000000 +0200 -+++ ./nstats-0.4/src/stats.h 2006-03-27 02:16:25.000000000 +0200 +--- a/src/stats.h ++++ b/src/stats.h @@ -233,7 +233,7 @@ cnt_t noroute; cnt_t s_noroute; @@ -74,8 +74,8 @@ cnt_t nd_router_solicit; cnt_t s_nd_router_solicit; cnt_t nd_router_advert; cnt_t s_nd_router_advert; cnt_t nd_neighbor_solicit; cnt_t s_nd_neighbor_solicit; ---- ./nstats-0.4.orig/src/nstats.c 2002-05-02 17:34:25.000000000 +0200 -+++ ./nstats-0.4/src/nstats.c 2006-03-27 02:25:42.000000000 +0200 +--- a/src/nstats.c ++++ b/src/nstats.c @@ -528,12 +528,6 @@ ICMP6.s_echo_request, ICMP6.bs); print_line("Echo Reply:", ICMP6.echo_reply, ICMP6.cnt, 1.1 net-analyzer/nstats/files/nstats-0.4-tinfo.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nstats/files/nstats-0.4-tinfo.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nstats/files/nstats-0.4-tinfo.patch?rev=1.1&content-type=text/plain Index: nstats-0.4-tinfo.patch =================================================================== --- a/configure.in +++ b/configure.in @@ -15,11 +15,12 @@ AC_TYPE_SIGNAL +PKG_CHECK_MODULES(ncurses,ncurses,,AC_MSG_ERROR([ncurses is needed])) AC_CHECK_LIB(ncurses,initscr,[ - NMON_LIB="${NMON_LIB} -lncurses" - BMON_LIB="${BMON_LIB} -lncurses" - CMON_LIB="${CMON_LIB} -lncurses" + NMON_LIB="${NMON_LIB} $ncurses_LIBS" + BMON_LIB="${BMON_LIB} $ncurses_LIBS" + CMON_LIB="${CMON_LIB} $ncurses_LIBS" ],[ echo echo "Missing dependency"
