From owner-svn-ports-all@freebsd.org Fri Feb 5 12:02:39 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 82AD7A9C9D9; Fri, 5 Feb 2016 12:02:39 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D3181F32; Fri, 5 Feb 2016 12:02:39 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u15C2c13092075; Fri, 5 Feb 2016 12:02:38 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u15C2ciB092072; Fri, 5 Feb 2016 12:02:38 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201602051202.u15C2ciB092072@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Fri, 5 Feb 2016 12:02:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408169 - in head/net/cnd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Feb 2016 12:02:39 -0000 Author: marino Date: Fri Feb 5 12:02:37 2016 New Revision: 408169 URL: https://svnweb.freebsd.org/changeset/ports/408169 Log: net/cnd: document ncurses requirement (USES+=ncurses), respect LDFLAGS Both patches got regenerated with makepatch in the process. approved by: infrastructure blanket Modified: head/net/cnd/Makefile head/net/cnd/files/patch-Makefile head/net/cnd/files/patch-main.c Modified: head/net/cnd/Makefile ============================================================================== --- head/net/cnd/Makefile Fri Feb 5 11:52:20 2016 (r408168) +++ head/net/cnd/Makefile Fri Feb 5 12:02:37 2016 (r408169) @@ -10,6 +10,7 @@ MASTER_SITES= http://www.bsd-geek.de/Fre MAINTAINER= lme@FreeBSD.org COMMENT= Console network display +USES= ncurses PLIST_FILES= bin/cnd do-install: Modified: head/net/cnd/files/patch-Makefile ============================================================================== --- head/net/cnd/files/patch-Makefile Fri Feb 5 11:52:20 2016 (r408168) +++ head/net/cnd/files/patch-Makefile Fri Feb 5 12:02:37 2016 (r408169) @@ -1,5 +1,5 @@ ---- Makefile.orig 2005-03-03 08:59:05.000000000 +0300 -+++ Makefile 2014-10-02 18:10:01.000000000 +0400 +--- Makefile.orig 2005-03-03 05:59:05 UTC ++++ Makefile @@ -1,10 +1,10 @@ -CC = cc +CC ?= cc @@ -9,7 +9,7 @@ all: $(OBJS) - $(CC) $(CFLAGS) -o cnd $(OBJS) -lcurses -lkvm -+ $(CC) $(CFLAGS) -o cnd $(OBJS) -lcurses ++ $(CC) $(CFLAGS) -o cnd $(OBJS) $(LDFLAGS) -lncurses .c.o: $(CC) $(CFLAGS) -c -I/usr/include/ -o $@ $< .SUFFIXS: .c .o Modified: head/net/cnd/files/patch-main.c ============================================================================== --- head/net/cnd/files/patch-main.c Fri Feb 5 11:52:20 2016 (r408168) +++ head/net/cnd/files/patch-main.c Fri Feb 5 12:02:37 2016 (r408169) @@ -1,5 +1,5 @@ ---- main.c.orig 2014-10-02 17:44:25.000000000 +0400 -+++ main.c 2014-10-02 18:08:23.000000000 +0400 +--- main.c.orig 2005-04-22 16:13:05 UTC ++++ main.c @@ -41,14 +41,13 @@ #include #include @@ -39,7 +39,7 @@ int winw,winh; WINDOW *mainw; -@@ -173,7 +161,6 @@ +@@ -173,7 +161,6 @@ void screen_init() { getmaxyx(stdscr,winh,winw); if(winh < 20 || winw < 20) { endwin(); @@ -47,7 +47,7 @@ fprintf(stderr,"Screen size is too small, sorry\n"); exit(1); } -@@ -241,35 +228,37 @@ +@@ -241,35 +228,37 @@ void screen_check() { return; } @@ -110,7 +110,7 @@ } int main(int argc, char *argv[]) { -@@ -280,9 +269,6 @@ +@@ -280,9 +269,6 @@ int main(int argc, char *argv[]) { unsigned long curo = 0; #define CURIS curi / timea.tv_sec #define CUROS curo / timea.tv_sec @@ -120,7 +120,7 @@ int i = 0; int x = 0; int j = 0; -@@ -393,48 +379,10 @@ +@@ -393,48 +379,10 @@ int main(int argc, char *argv[]) { argc -= optind; argv += optind; @@ -156,7 +156,7 @@ - } - if(kread(ifnetaddr,(char *)&foonet,sizeof foonet)) - return 1; -- + -#if __FreeBSD_version >= 501113 - strncpy(name,foonet.if_xname,sizeof(name)); -#else @@ -166,13 +166,12 @@ -#endif - - } -+ + readstat(&lasti, &lasto); + gettimeofday(&last,NULL); /* start curses */ initscr(); -@@ -486,37 +434,32 @@ +@@ -486,37 +434,32 @@ int main(int argc, char *argv[]) { } /* screen init.. */ screen_init(); @@ -218,7 +217,7 @@ in_total += curi; out_total += curo; -@@ -569,7 +512,6 @@ +@@ -569,7 +512,6 @@ int main(int argc, char *argv[]) { logi[i] = (unsigned int *)malloc(sizeof(unsigned int)); if(logi[i] == NULL) { fprintf(stderr,"error,allocating memory\n"); @@ -226,7 +225,7 @@ endwin(); exit(1); } -@@ -583,7 +525,6 @@ +@@ -583,7 +525,6 @@ int main(int argc, char *argv[]) { logo[i] = (unsigned int *)malloc(sizeof(unsigned int)); if(logo[i] == NULL) { fprintf(stderr,"error,allocating memory\n"); @@ -234,7 +233,7 @@ endwin(); exit(1); } -@@ -648,9 +589,8 @@ +@@ -648,9 +589,8 @@ int main(int argc, char *argv[]) { gettimeofday(&last,NULL); select(0,NULL,NULL,NULL,&timea);