- fix a bug in the f2c-f77 script which caused -Ipath flags to not get

  passed to f2c (only to the c compiler)

- update my email

3 files changed, 26 insertions, 23 deletions

diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 1a4cf8f8042..10beee1dadb 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.6 1999/12/16 00:58:27 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.7 1999/12/22 20:22:14 dmcmahill Exp $
 
 DISTNAME=	f2c-19991025
+PKGNAME=	f2c-19991025p1
 WRKSRC=		${WRKDIR}/f2c
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
-MAINTAINER=	mcmahill@alum.mit.edu
+MAINTAINER=	dmcmahill@netbsd.org
 HOMEPAGE=	http://www.netlib.org/f2c/index.html
 
 CONFLICTS=	egcs-current-19980608
diff --git a/lang/f2c/files/patch-sum b/lang/f2c/files/patch-sum
index 4dec71c58b9..52922794dda 100644
--- a/lang/f2c/files/patch-sum
+++ b/lang/f2c/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.3 1999/12/16 00:58:27 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.4 1999/12/22 20:22:15 dmcmahill Exp $
 
 MD5 (patch-aa) = bacc4f81d3f1549b4f1bed03c922651c
 MD5 (patch-ab) = f3367ece1c03ae7f55efe25c9aa1a6f2
-MD5 (patch-ac) = 00bcec0f003263ab4c4d3b05dc92fb75
+MD5 (patch-ac) = bb70aee63dfdd2c463a19d6797429ed9
 MD5 (patch-ad) = 2fcc81cb41f650e25e2c093aa210a093
 MD5 (patch-ae) = 8547e4d9b2fe8e0ee6ca66193e6beaac
 MD5 (patch-ag) = d138fd979e5a962a151fca8f53e32f39
diff --git a/lang/f2c/patches/patch-ac b/lang/f2c/patches/patch-ac
index 2785ea58330..7b99da17933 100644
--- a/lang/f2c/patches/patch-ac
+++ b/lang/f2c/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 1999/12/16 00:58:27 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.7 1999/12/22 20:22:15 dmcmahill Exp $
 
 Much cleanup of the script.  Added various options such as
 -O for optimization
@@ -8,7 +8,7 @@ Much cleanup of the script.  Added various options such as
 -v, for verbose output
 
 --- fc.orig	Fri Apr 16 09:24:46 1999
-+++ fc	Tue Dec  7 19:13:04 1999
++++ fc	Wed Dec 22 15:15:08 1999
 @@ -1,101 +1,125 @@
  #!/bin/sh
 -
@@ -118,19 +118,19 @@ Much cleanup of the script.  Added various options such as
  
 -#		-D def		passed to C compiler (for .c files)
 -#				or to cpp (for .F files)
--
--#		-I includepath	passed to C compiler (for .c files)
--#				or to cpp (for .F files), and to f2c
--
--#		-Ntnnn		allow nnn entries in table t
--
--#		-P		emit .P files
 +# if no input arguments, then spit out the help stuff from the beginning
 +# of this file.
 +if [ $# = 0 ]; then
 + cat $0 | awk '$1 == "#USAGESTART", $1 == ""' | tail +2 | sed 's/#//g'
 +fi
  
+-#		-I includepath	passed to C compiler (for .c files)
+-#				or to cpp (for .F files), and to f2c
+-
+-#		-Ntnnn		allow nnn entries in table t
+-
+-#		-P		emit .P files
+-
 -#		-U def		passed to C compiler (for .c files)
 -#				or to cpp (for .F files) to remove def
  
@@ -198,13 +198,15 @@ Much cleanup of the script.  Added various options such as
 +		G="-g"
  		shift;;
  
-@@ -105,61 +129,95 @@
+@@ -105,61 +129,97 @@
  		;;
  
 -	-U)	CPPFLAGS="$CPPFLAGS -U$2"
 -		shift 2
 -		;;
 +        -I*)    CFLAGS="$CFLAGS $1"
++		CPPFLAGS="$CPPFLAGS $1"
++		F2CFLAGS="$F2CFLAGS $1"
 +                shift 1
 +                ;;
 +
@@ -318,7 +320,7 @@ Much cleanup of the script.  Added various options such as
 +
  while
  	test -n "$1"
-@@ -171,4 +229,7 @@
+@@ -171,4 +231,7 @@
  		case "$1" in
  			*.f)	b=`basename $1 .f`
 +				if test $VERBOSE = "yes"; then
@@ -326,7 +328,7 @@ Much cleanup of the script.  Added various options such as
 +				fi
  				$F2C $F2CFLAGS $1
  				rc=$?
-@@ -178,4 +239,7 @@
+@@ -178,4 +241,7 @@
  				rc=$?
  				case $rc in 0)
 +					if test $VERBOSE="yes"; then
@@ -334,35 +336,35 @@ Much cleanup of the script.  Added various options such as
 +					fi
  					$F2C $F2CFLAGS <$b.i >$b.c
  					rc=$?
-@@ -185,5 +249,5 @@
+@@ -185,5 +251,5 @@
  			esac
  		case $rc in 0);; *) exit;; esac
 -                $CC -c $CFLAGSF2C $CFLAGS $b.c 2>$s
 +                $CC -c $CFLAGS $b.c 2>$s
  		rc=$?
  		sed '/parameter .* is not referenced/d;/warning: too many parameters/d' $s 1>&2
-@@ -200,5 +264,5 @@
+@@ -200,5 +266,5 @@
  		$F2C $F2CFLAGS $b.f
  		case $? in 0);; *) rc=$?; exit;; esac
 -                $CC -c $CFLAGSF2C $CFLAGS $b.c
 +                $CC -c $CFLAGS $b.c
  		case $? in 0);; *) rc=$?; exit;; esac
  		OFILES="$OFILES $b.o"
-@@ -213,5 +277,5 @@
+@@ -213,5 +279,5 @@
  		$F2C $F2CFLAGS $b.f
  		case $? in 0);; *) rc=$?; exit;; esac
 -		$CC -c $CFLAGSF2C $CFLAGS $b.c
 +		$CC -c $CFLAGS $b.c
  		case $? in 0);; *) rc=$?; exit;; esac
  		OFILES="$OFILES $b.o"
-@@ -232,5 +296,5 @@
+@@ -232,5 +298,5 @@
  		echo $1: 1>&2
  		OFILE=`basename $1 .c`.o
 -                $CC -c $CFLAGSF2C $CPPFLAGS $CFLAGS $1
 +                $CC -c $CPPFLAGS $CFLAGS $1
  		rc=$?; case $rc in 0);; *) rc=$?; exit;; esac
  		OFILES="$OFILES $OFILE"
-@@ -248,10 +312,10 @@
+@@ -248,10 +314,10 @@
  		shift
  		;;
 -	-[lL])
@@ -376,7 +378,7 @@ Much cleanup of the script.  Added various options such as
 +	-l*)
  		OFILES="$OFILES $1"
  		shift
-@@ -259,6 +323,5 @@
+@@ -259,6 +325,5 @@
  		;;
  	-o)
 -		case $cOPT in 0) CFLAGS="$CFLAGS -o $2";; *) OUTF=$2;; esac
@@ -384,7 +386,7 @@ Much cleanup of the script.  Added various options such as
 +		OUTF=$2; shift 2;;
  	*.P)
  		F2CFLAGS="$F2CFLAGS $1"
-@@ -273,9 +336,11 @@
+@@ -273,9 +338,11 @@
  done
  
 -### On some (IRIX) systems, -Wl,-dont_warn_unused prevents complaints