Fix build.

XXX: is there any reason the distfile shouldn't be updated from base HEAD?

3 files changed, 132 insertions, 15 deletions

diff --git a/devel/fortran-utils/distinfo b/devel/fortran-utils/distinfo
index ac5eace302a..7f226fe916d 100644
--- a/devel/fortran-utils/distinfo
+++ b/devel/fortran-utils/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2011/09/25 19:44:08 joerg Exp $
+$NetBSD: distinfo,v 1.7 2011/10/02 23:12:06 dholland Exp $
 
 SHA1 (fortran-utils-1.1.tar.gz) = 587f55857876b9447326faa1074d6d8b6b1a058e
 RMD160 (fortran-utils-1.1.tar.gz) = e286108ce7eb0a8062b6f624bea28c71be759109
 Size (fortran-utils-1.1.tar.gz) = 7566 bytes
-SHA1 (patch-ac) = 43f7683cb7d4a2b06db447a3f28c34c57c2252a7
-SHA1 (patch-fsplit-fsplit.c) = 78dddf494e55cdf493677215a33c063973df0b85
+SHA1 (patch-ac) = 398da92ea8343835b3d2b6bf31d2966af059c443
+SHA1 (patch-fsplit-fsplit.c) = 61a4de606737cc005d1c36cbed305c5044afcdba
diff --git a/devel/fortran-utils/patches/patch-ac b/devel/fortran-utils/patches/patch-ac
index 57502531b4d..d8fbdfd6388 100644
--- a/devel/fortran-utils/patches/patch-ac
+++ b/devel/fortran-utils/patches/patch-ac
@@ -1,16 +1,32 @@
-$NetBSD: patch-ac,v 1.1 2006/01/15 18:28:32 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2011/10/02 23:12:06 dholland Exp $
+
+- use <stdlib.h> instead of a custom malloc declaration
+- avoid symbol conflict with gettext
+- make copyright/rcsid strings external to avoid unused warnings
+- use standard C
 
 --- fpr/fpr.c.orig	1994-05-27 12:31:21.000000000 +0000
 +++ fpr/fpr.c
-@@ -44,6 +44,7 @@ static char copyright[] =
- static char sccsid[] = "@(#)fpr.c	8.1 (Berkeley) 6/6/93";
+@@ -35,15 +35,16 @@
+  */
+ 
+ #ifndef lint
+-static char copyright[] =
++char copyright[] =
+ "@(#) Copyright (c) 1989, 1993\n\
+ 	The Regents of the University of California.  All rights reserved.\n";
+ #endif /* not lint */
+ 
+ #ifndef lint
+-static char sccsid[] = "@(#)fpr.c	8.1 (Berkeley) 6/6/93";
++char sccsid[] = "@(#)fpr.c	8.1 (Berkeley) 6/6/93";
  #endif /* not lint */
  
 +#include <stdlib.h>
  #include <stdio.h>
  
  #define BLANK ' '
-@@ -80,10 +81,7 @@ COLUMN *line;
+@@ -80,13 +81,15 @@ COLUMN *line;
  int maxpos;
  int maxcol;
  
@@ -18,11 +34,20 @@ $NetBSD: patch-ac,v 1.1 2006/01/15 18:28:32 joerg Exp $
 -extern char *calloc();
 -extern char *realloc();
 -
++void init(void);
 +void my_gettext(void);
++void savech(int col);
++void flush(void);
++void nospace(void);
  
  
- main()
-@@ -124,7 +122,7 @@ main()
+-main()
++int
++main(void)
+ {
+   register int ch;
+   register char ateof;
+@@ -124,7 +127,7 @@ main()
  
    while ( ! ateof)
      {
@@ -31,7 +56,17 @@ $NetBSD: patch-ac,v 1.1 2006/01/15 18:28:32 joerg Exp $
        ch = getchar();
        if (ch == EOF)
  	{
-@@ -209,8 +207,8 @@ init()
+@@ -176,7 +179,8 @@ main()
+ 
+ 
+ 
+-init()
++void
++init(void)
+ {
+   register COLUMN *cp;
+   register COLUMN *cend;
+@@ -209,8 +213,8 @@ init()
  }
  
  
@@ -42,3 +77,34 @@ $NetBSD: patch-ac,v 1.1 2006/01/15 18:28:32 joerg Exp $
  {
    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,7 +344,8 @@ int col;
+ 
+ 
+ 
+-flush()
++void
++flush(void)
+ {
+   register int i;
+   register int anchor;
+@@ -403,7 +408,8 @@ flush()
+ 
+ 
+ 
+-nospace()
++void
++nospace(void)
+ {
+   fputs("Storage limit exceeded.\n", stderr);
+   exit(1);
diff --git a/devel/fortran-utils/patches/patch-fsplit-fsplit.c b/devel/fortran-utils/patches/patch-fsplit-fsplit.c
index 86bbb35fb39..54d5b1f349c 100644
--- a/devel/fortran-utils/patches/patch-fsplit-fsplit.c
+++ b/devel/fortran-utils/patches/patch-fsplit-fsplit.c
@@ -1,8 +1,13 @@
-$NetBSD: patch-fsplit-fsplit.c,v 1.1 2011/09/25 19:44:08 joerg Exp $
+$NetBSD: patch-fsplit-fsplit.c,v 1.2 2011/10/02 23:12:06 dholland Exp $
 
---- fsplit/fsplit.c.orig	2011-09-25 09:50:22.000000000 +0000
+- avoid conflict with posix getline
+- add const for clean build
+- use <ctype.h> functions correctly
+- use standard C
+
+--- fsplit/fsplit.c.orig	2000-01-30 21:03:32.000000000 +0000
 +++ fsplit/fsplit.c
-@@ -97,7 +97,7 @@ struct stat sbuf;
+@@ -97,28 +97,25 @@ struct stat sbuf;
  
  #define trim(p)	while (*p == ' ' || *p == '\t') p++
  
@@ -11,7 +16,30 @@ $NetBSD: patch-fsplit-fsplit.c,v 1.1 2011/09/25 19:44:08 joerg Exp $
  void  get_name __P((char *, int));
  char *functs __P((char *));
  int   lend __P((void));
-@@ -171,7 +171,7 @@ char **argv;
+ int   lname __P((char *, int));
+-char *look __P((char *, char *));
++char *look __P((char *, const char *));
+ int   saveit __P((char *));
+ int   scan_name __P((char *, char *, int));
+ char *skiplab __P((char *));
+ static void usage __P((void));
+ 
+ int
+-main(argc, argv)
+-int argc;
+-char **argv;
++main(int argc, char **argv)
+ {
+ 	extern int optind;
+ 	extern char *optarg;
+ 
+ 	register FILE *ofp;	/* output file */
+ 	register int rv;	/* 1 if got card in output file, 0 otherwise */
+-	register char *ptr;
+ 	int nflag,		/* 1 if got name of subprog., 0 otherwise */
+ 		retval,
+ 		i;
+@@ -171,7 +168,7 @@ char **argv;
  		errx(1, "can not open %s", x);
  	nflag = 0;
  	rv = 0;
@@ -20,7 +48,7 @@ $NetBSD: patch-fsplit-fsplit.c,v 1.1 2011/09/25 19:44:08 joerg Exp $
  		rv = 1;
  		fprintf(ofp, "%s", buf);
  		if (lend())		/* look for an 'end' statement */
-@@ -263,7 +263,7 @@ int letters;
+@@ -263,7 +260,7 @@ int letters;
  }
  
  int
@@ -29,3 +57,26 @@ $NetBSD: patch-fsplit-fsplit.c,v 1.1 2011/09/25 19:44:08 joerg Exp $
  {
  	register char *ptr;
  
+@@ -332,7 +329,7 @@ int len;
+ 	/*  copy to buffer and converting to lower case */
+ 	p = ptr;
+ 	while (*p && p <= &buf[71] ) {
+-	   *iptr = isupper(*p) ? tolower(*p) : *p;
++	   *iptr = isupper((unsigned char)*p) ? tolower((unsigned char)*p) : *p;
+ 	   iptr++;
+ 	   p++;
+ 	}
+@@ -437,9 +434,11 @@ char *p;
+ /* 	return 0 if m doesn't match initial part of s;
+ 	otherwise return ptr to next char after m in s */
+ char *look(s, m)
+-char *s, *m;
++char *s;
++const char *m;
+ {
+-	register char *sp, *mp;
++	register char *sp;
++	register const char *mp;
+ 
+ 	sp = s; mp = m;
+ 	while (*mp) {