From owner-svn-ports-head@freebsd.org Fri May 13 19:34:57 2016 Return-Path: Delivered-To: svn-ports-head@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 D7909B3A4AB; Fri, 13 May 2016 19:34:57 +0000 (UTC) (envelope-from bapt@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 B42BA1FAF; Fri, 13 May 2016 19:34:57 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4DJYu2x073074; Fri, 13 May 2016 19:34:56 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4DJYupM073070; Fri, 13 May 2016 19:34:56 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201605131934.u4DJYupM073070@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 13 May 2016 19:34:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r415141 - head/math/physcalc/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-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2016 19:34:57 -0000 Author: bapt Date: Fri May 13 19:34:56 2016 New Revision: 415141 URL: https://svnweb.freebsd.org/changeset/ports/415141 Log: Prevent collision on getline(3) While here regen patches Modified: head/math/physcalc/files/patch-physcalc.h head/math/physcalc/files/patch-physconv.c head/math/physcalc/files/patch-physmain.c head/math/physcalc/files/patch-physnode.c Modified: head/math/physcalc/files/patch-physcalc.h ============================================================================== --- head/math/physcalc/files/patch-physcalc.h Fri May 13 19:33:43 2016 (r415140) +++ head/math/physcalc/files/patch-physcalc.h Fri May 13 19:34:56 2016 (r415141) @@ -1,5 +1,5 @@ ---- physcalc.h Sun Aug 27 17:46:31 2000 -+++ physcalc.h.new Sun Aug 27 17:46:57 2000 +--- physcalc.h.orig 1998-08-29 14:13:40 UTC ++++ physcalc.h @@ -22,6 +22,10 @@ #error This program requires more memory than the tiny model allows! #endif Modified: head/math/physcalc/files/patch-physconv.c ============================================================================== --- head/math/physcalc/files/patch-physconv.c Fri May 13 19:33:43 2016 (r415140) +++ head/math/physcalc/files/patch-physconv.c Fri May 13 19:34:56 2016 (r415141) @@ -1,6 +1,24 @@ ---- physconv.c.orig 1998-08-30 15:58:16.000000000 -0500 -+++ physconv.c 2009-06-25 22:22:21.000000000 -0500 -@@ -260,12 +260,16 @@ +--- physconv.c.orig 1998-08-30 13:58:16 UTC ++++ physconv.c +@@ -32,7 +32,7 @@ + #include "physdecl.h" + + #ifdef __PROTOTYPES__ +-LOCAL void getline(FILE *fp, char *buf); ++LOCAL void get_line(FILE *fp, char *buf); + LOCAL int evalxpon(char *s); + LOCAL void fixplural(char *s); + LOCAL int output_dims(FILE *fp, int const d[MAXDIM]); +@@ -86,7 +86,7 @@ EXPORT struct dimstruct *dimension_list= + + /*-----Functions-----*/ + +-LOCAL void getline(fp,buf) /* Get a line from the file & doctor it up */ ++LOCAL void get_line(fp,buf) /* Get a line from the file & doctor it up */ + FILE *fp; + char *buf; + { +@@ -260,12 +260,16 @@ char const *s; { /* read in lines from fp and do each as if typed from console */ FILE *fp; char buf[SMALLBUF]; @@ -18,7 +36,16 @@ printf("Can't open %s\n",s); return; } -@@ -797,7 +801,7 @@ +@@ -276,7 +280,7 @@ char const *s; + #endif + echo = FALSE; + while (TRUE) { +- getline(fp,buf); ++ get_line(fp,buf); + if (!buf[0]) + break; + do_cmd(buf); +@@ -797,7 +801,7 @@ char const *s; } else { showdims(&d); printf("Convert to: "); Modified: head/math/physcalc/files/patch-physmain.c ============================================================================== --- head/math/physcalc/files/patch-physmain.c Fri May 13 19:33:43 2016 (r415140) +++ head/math/physcalc/files/patch-physmain.c Fri May 13 19:34:56 2016 (r415141) @@ -1,6 +1,6 @@ ---- physmain.c.orig 1998-08-30 14:48:34.000000000 -0500 -+++ physmain.c 2009-06-25 22:32:46.000000000 -0500 -@@ -227,7 +227,7 @@ +--- physmain.c.orig 1998-08-30 12:48:34 UTC ++++ physmain.c +@@ -227,7 +227,7 @@ char const *s; printf("Replace %s = ",v->name); printexpr(v->value); printf(" ?"); @@ -9,7 +9,16 @@ printf("\n"); } else answer[0] = 'Y'; -@@ -711,7 +711,8 @@ +@@ -656,7 +656,7 @@ void LegalCrap() + + } + +-void main(argc, argv) ++int main(argc, argv) + int argc; + char *argv[]; + { /* Main program: Init vars, load unit & help data, enter main loop */ +@@ -711,7 +711,8 @@ char *argv[]; } else while (TRUE) { printf(">"); Modified: head/math/physcalc/files/patch-physnode.c ============================================================================== --- head/math/physcalc/files/patch-physnode.c Fri May 13 19:33:43 2016 (r415140) +++ head/math/physcalc/files/patch-physnode.c Fri May 13 19:34:56 2016 (r415141) @@ -1,6 +1,6 @@ ---- physnode.c.orig Sat Oct 7 21:33:27 2006 -+++ physnode.c Sat Oct 7 21:33:30 2006 -@@ -305,12 +305,12 @@ +--- physnode.c.orig 1998-08-29 14:17:12 UTC ++++ physnode.c +@@ -305,12 +305,12 @@ NODEP n; } EXPORT void bytecopy(dst, src, bytes)