svn commit: r415039 - head/devel/fortran-utils/files

[Baptiste Daroussin]

Author: bapt
Date: Wed May 11 21:55:09 2016
New Revision: 415039
URL: https://svnweb.freebsd.org/changeset/ports/415039

Log:
  Prevent collision with getline(3)
  while here regen patches

Added:
  head/devel/fortran-utils/files/patch-fpr_fpr.c   (contents, props changed)
  head/devel/fortran-utils/files/patch-fsplit_fsplit.c   (contents, props changed)
Deleted:
  head/devel/fortran-utils/files/patch-fpr.c

Added: head/devel/fortran-utils/files/patch-fpr_fpr.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/fortran-utils/files/patch-fpr_fpr.c	Wed May 11 21:55:09 2016	(r415039)
@@ -0,0 +1,83 @@
+--- fpr/fpr.c.orig	1994-05-27 12:31:21 UTC
++++ fpr/fpr.c
+@@ -45,6 +45,7 @@ static char sccsid[] = "@(#)fpr.c	8.1 (B
+ #endif /* not lint */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #define BLANK ' '
+ #define TAB '\t'
+@@ -80,12 +81,13 @@ COLUMN *line;
+ int maxpos;
+ int maxcol;
+ 
+-extern char *malloc();
+-extern char *calloc();
+-extern char *realloc();
+-
+-

++void init();
++void mygettext();
++void flush();
++void savech(int);
++void nospace();
+ 
++int
+ main()
+ {
+   register int ch;
+@@ -124,7 +126,7 @@ main()
+ 
+   while ( ! ateof)
+     {
+-      gettext();
++      mygettext();
+       ch = getchar();
+       if (ch == EOF)
+ 	{
+@@ -176,6 +178,7 @@ main()
+ 
+ 

+ 
++void
+ init()
+ {
+   register COLUMN *cp;
+@@ -210,7 +213,8 @@ init()
+ 
+ 

+ 
+-gettext()
++void
++mygettext()
+ {
+   register int i;
+   register char ateol;
+@@ -283,8 +287,8 @@ gettext()
+ 
+ 

+ 
+-savech(col)
+-int col;
++void
++savech(int col)
+ {
+   register char ch;
+   register int oldmax;
+@@ -340,6 +344,7 @@ int col;
+ 
+ 

+ 
++void
+ flush()
+ {
+   register int i;
+@@ -403,6 +408,7 @@ flush()
+ 
+ 

+ 
++void
+ nospace()
+ {
+   fputs("Storage limit exceeded.\n", stderr);

Added: head/devel/fortran-utils/files/patch-fsplit_fsplit.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/fortran-utils/files/patch-fsplit_fsplit.c	Wed May 11 21:55:09 2016	(r415039)
@@ -0,0 +1,29 @@
+--- fsplit/fsplit.c.orig	2000-01-30 21:03:32 UTC
++++ fsplit/fsplit.c
+@@ -97,7 +97,7 @@ struct stat sbuf;
+ 
+ #define trim(p)	while (*p == ' ' || *p == '\t') p++
+ 
+-int   getline __P((void));
++int   get_line __P((void));
+ void  get_name __P((char *, int));
+ char *functs __P((char *));
+ int   lend __P((void));
+@@ -171,7 +171,7 @@ char **argv;
+ 		errx(1, "can not open %s", x);
+ 	nflag = 0;
+ 	rv = 0;
+-	while (getline() > 0) {
++	while (get_line() > 0) {
+ 		rv = 1;
+ 		fprintf(ofp, "%s", buf);
+ 		if (lend())		/* look for an 'end' statement */
+@@ -263,7 +263,7 @@ int letters;
+ }
+ 
+ int
+-getline()
++get_line()
+ {
+ 	register char *ptr;
+