teach the f2c-f77 script about "-pg" (generate profiled code).

3 files changed, 33 insertions, 25 deletions

diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 50f42160f38..ad6b2bae36d 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2001/04/18 21:43:18 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.16 2001/04/22 13:55:27 dmcmahill Exp $
 
 DISTNAME=	f2c-20001205
-PKGNAME=	f2c-20001205nb3
+PKGNAME=	f2c-20001205nb4
 WRKSRC=		${WRKDIR}/f2c
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/lang/f2c/distinfo b/lang/f2c/distinfo
index fb72a4b7d96..a1433bcc982 100644
--- a/lang/f2c/distinfo
+++ b/lang/f2c/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 21:43:18 dmcmahill Exp $
+$NetBSD: distinfo,v 1.3 2001/04/22 13:55:27 dmcmahill Exp $
 
 SHA1 (f2c-20001205.tar.gz) = f3cc1653eb962fee45d850df50890fc53448a17f
 Size (f2c-20001205.tar.gz) = 988607 bytes
 SHA1 (patch-aa) = 488a5adc6bf30a28fa221351224fa16952d54537
 SHA1 (patch-ab) = ddd695d45ac7819578b22a8a8aed0f09803cd3a0
-SHA1 (patch-ac) = 2d9d23d9a391c5490e6cf7a12c316d7edb49394f
+SHA1 (patch-ac) = 89cd707fdf5e2c4d70a1bbbd905ab7c392d52d77
 SHA1 (patch-ad) = 0144d0cdf55ce8117d179a56acc4db64fe67c8e0
 SHA1 (patch-ae) = b3ba2a1a40aee9f3151fc36aa89d34e472f80325
 SHA1 (patch-ag) = d56c32c8ce651a1a773b32b3e8f9645d3acb2a87
diff --git a/lang/f2c/patches/patch-ac b/lang/f2c/patches/patch-ac
index 0eb957f144f..6fc8f001be1 100644
--- a/lang/f2c/patches/patch-ac
+++ b/lang/f2c/patches/patch-ac
@@ -1,17 +1,19 @@
-$NetBSD: patch-ac,v 1.11 2001/04/15 02:00:25 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.12 2001/04/22 13:55:28 dmcmahill Exp $
+
 
 Much cleanup of the script.  Added various options such as
 -O    for optimization
 -fPIC for PIC support
 -Wxxx for gcc warnings
 -Wl,  for additional linker arguments
--r8,  promote REAL and COMPLEX to DOUBLE REAL and DOUBLE COMPLEX
--s,   to strip executible 
--v,   for verbose output
+-pg   for profiled code
+-r8   promote REAL and COMPLEX to DOUBLE REAL and DOUBLE COMPLEX
+-s    to strip executible 
+-v    for verbose output
 
 --- fc.orig	Fri Jul  7 17:47:06 2000
-+++ fc	Sat Apr 14 21:57:18 2001
-@@ -1,178 +1,257 @@
++++ fc	Sun Apr 22 09:04:41 2001
+@@ -1,178 +1,263 @@
 -#! /bin/sh
 -
 -# NOTE: you may need to adjust the references to /usr/local/... below
@@ -68,6 +70,9 @@ Much cleanup of the script.  Added various options such as
 +#
 +#		-o objfile	Override default executable name a.out.
 +#
++#		-pg		pass -pg (generate profile information) to the c
++#				compiler.
++#
 +#		-O		turn on the -O flag to the c compiler
 +#
 +#		-O1		turn on the -O1 flag to the c compiler
@@ -138,18 +143,18 @@ Much cleanup of the script.  Added various options such as
 -
 -#		-I includepath	passed to C compiler (for .c files)
 -#				or to cpp (for .F files), and to f2c
--
--#		-m xxx		passed to C compiler as -mxxx
--
--#		-N tnnn		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
  
+-#		-m xxx		passed to C compiler as -mxxx
+-
+-#		-N tnnn		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
  
@@ -271,6 +276,9 @@ Much cleanup of the script.  Added various options such as
  		;;
  
 -	-u)	F2CFLAGS="$F2CFLAGS -u"
++        -pg)    CFLAGS="$CFLAGS $1"
++                shift;;
++
 +	-P)	F2CFLAGS="$F2CFLAGS $1"
  		shift
  		;;
@@ -367,7 +375,7 @@ Much cleanup of the script.  Added various options such as
 +
  while
  	test -n "$1"
-@@ -184,4 +263,7 @@
+@@ -184,4 +269,7 @@
  		case "$1" in
  			*.f)	b=`basename $1 .f`
 +				if test $VERBOSE = "yes"; then
@@ -375,7 +383,7 @@ Much cleanup of the script.  Added various options such as
 +				fi
  				$F2C $F2CFLAGS $1
  				rc=$?
-@@ -191,4 +273,7 @@
+@@ -191,4 +279,7 @@
  				rc=$?
  				case $rc in 0)
 +					if test $VERBOSE="yes"; then
@@ -383,35 +391,35 @@ Much cleanup of the script.  Added various options such as
 +					fi
  					$F2C $F2CFLAGS <$b.i >$b.c
  					rc=$?
-@@ -198,5 +283,5 @@
+@@ -198,5 +289,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
-@@ -213,5 +298,5 @@
+@@ -213,5 +304,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"
-@@ -226,5 +311,5 @@
+@@ -226,5 +317,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"
-@@ -245,5 +330,5 @@
+@@ -245,5 +336,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"
-@@ -261,10 +346,10 @@
+@@ -261,10 +352,10 @@
  		shift
  		;;
 -	-[lL])
@@ -425,7 +433,7 @@ Much cleanup of the script.  Added various options such as
 +	-l*)
  		OFILES="$OFILES $1"
  		shift
-@@ -272,6 +357,5 @@
+@@ -272,6 +363,5 @@
  		;;
  	-o)
 -		case $cOPT in 0) CFLAGS="$CFLAGS -o $2";; *) OUTF=$2;; esac
@@ -433,7 +441,7 @@ Much cleanup of the script.  Added various options such as
 +		OUTF=$2; shift 2;;
  	*.P)
  		F2CFLAGS="$F2CFLAGS $1"
-@@ -286,9 +370,11 @@
+@@ -286,9 +376,11 @@
  done
  
 -### On some (IRIX) systems, -Wl,-dont_warn_unused prevents complaints