Update to the f2c package, from Dan McMahill (mcmahill@mtl.mit.edu).

Fixes PR pkg/6026.

Modified slightly by me, to add NetBSD RCS Ids to patches, along with
a minimalist comment about each patch, and also modified the top-level
Makefile to use mkdir, rather than install -d (install -d was
clobbering directory permissions on ${PREFIX}/{bin,lib,include}).

12 files changed, 258 insertions, 54 deletions

diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 49b16810e54..2447eb7d64e 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 1998/07/22 09:58:50 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1998/08/25 08:54:06 agc Exp $
 
-DISTNAME=	f2c-19980516
+DISTNAME=	f2c-19980516p1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	mcmahill@alum.mit.edu
+HOMEPAGE=	http://www.netlib.org/f2c/index.html
 
 CONFLICTS=	egcs-current-19980608
 
diff --git a/lang/f2c/files/md5 b/lang/f2c/files/md5
index fd368594391..a0bfcfac7c6 100644
--- a/lang/f2c/files/md5
+++ b/lang/f2c/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:24:57 agc Exp $
+$NetBSD: md5,v 1.4 1998/08/25 08:54:06 agc Exp $
 
-MD5 (f2c-19980516.tar.gz) = 53276867e93ee502eb9e7ab6bb123e25
+MD5 (f2c-19980516p1.tar.gz) = 0c649bfc2a125036bf26fa5fafee2499
diff --git a/lang/f2c/patches/patch-aa b/lang/f2c/patches/patch-aa
index 6fe459c0396..fb15e129f44 100644
--- a/lang/f2c/patches/patch-aa
+++ b/lang/f2c/patches/patch-aa
@@ -1,11 +1,13 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:08:57 agc Exp $
+$NetBSD: patch-aa,v 1.3 1998/08/25 08:54:07 agc Exp $
 
---- /dev/null	Mon Jun 15 02:04:53 1998
-+++ Makefile	Mon Jun 15 10:16:05 1998
+Add a top level Makefile
+
+--- /dev/null	Mon Aug 24 13:53:09 1998
++++ Makefile	Mon Aug 24 14:03:31 1998
 @@ -0,0 +1,51 @@
-+# Top level Makefile for f2c,libF77, and libI77
++# Top level Makefile for f2c, libF77, and libI77
 +
-+all: f2c libf2c.a f77 man
++all: f2c libf2c.a f2c-f77 man
 +
 +
 +f2c:
@@ -37,20 +39,20 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:08:57 agc Exp $
 +
 +
 +install:
-+	${BSD_INSTALL_PROGRAM_DIR} ${PREFIX}/bin
++	-@mkdir -p ${PREFIX}/bin
 +	${BSD_INSTALL_PROGRAM} ./src/f2c ${PREFIX}/bin
-+	${BSD_INSTALL_SCRIPT} ./f77 ${PREFIX}/bin
-+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/lib
++	${BSD_INSTALL_SCRIPT} ./f2c-f77 ${PREFIX}/bin
++	-@mkdir -p ${PREFIX}/lib
 +	${BSD_INSTALL_DATA} ./libf2c.a ${PREFIX}/lib
 +	${BSD_INSTALL_DATA} ./libF77.a ${PREFIX}/lib
 +	${BSD_INSTALL_DATA} ./libI77.a ${PREFIX}/lib
-+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/include
++	-@mkdir -p ${PREFIX}/include
 +	${BSD_INSTALL_DATA} ./f2c.h ${PREFIX}/include
-+	${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/doc/f2c
++	-@mkdir -p ${PREFIX}/share/doc/f2c
 +	${BSD_INSTALL_DATA} ./f2c.ps ${PREFIX}/share/doc/f2c
 +	${BSD_INSTALL_DATA} ./changes ${PREFIX}/share/doc/f2c
 +	${BSD_INSTALL_MAN} ./f2c.1 ${PREFIX}/man/man1
 +	${BSD_INSTALL_MAN} ./f2c.0 ${PREFIX}/man/cat1
 +
-+f77: fc
-+	sed 's!PREFIX!${PREFIX}!g' fc > f77
++f2c-f77: fc
++	sed 's!PREFIX!${PREFIX}!g' fc > f2c-f77
diff --git a/lang/f2c/patches/patch-ab b/lang/f2c/patches/patch-ab
index ce75597a493..a0b4cfa4255 100644
--- a/lang/f2c/patches/patch-ab
+++ b/lang/f2c/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:08:58 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/08/25 08:54:07 agc Exp $
+
+Set optimisation level appropriately
 
 --- src/makefile.orig	Wed Feb 25 08:18:04 1998
 +++ src/makefile	Sun Jul 19 23:14:03 1998
diff --git a/lang/f2c/patches/patch-ac b/lang/f2c/patches/patch-ac
index 9414a8ab31f..eabcbd9cb8c 100644
--- a/lang/f2c/patches/patch-ac
+++ b/lang/f2c/patches/patch-ac
@@ -1,67 +1,252 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:08:58 agc Exp $
+$NetBSD: patch-ac,v 1.3 1998/08/25 08:54:07 agc Exp $
+
+Add various options to f2c, including PIC support
 
 --- fc.orig	Tue May 16 17:37:49 1995
-+++ fc	Thu Jul  9 08:36:49 1998
-@@ -1,4 +1,4 @@
++++ fc	Mon Aug 24 14:05:40 1998
+@@ -1,26 +1,51 @@
  #!/bin/sh
 -PATH=/v/bin:/bin:/usr/bin
 +PATH=/bin:/usr/bin:PREFIX/bin
++#USAGESTART
  # f77-style shell script to compile and load fortran, C, and assembly codes
- 
-@@ -21,4 +21,14 @@
- #		-w		omit all warning messages
- 
-+#		-Wall		turn on the -Wall flag to the c compiler
-+
+-
++#
+ #	usage:	f77 [options] files [-l library]
+-
++#
+ #	Options:
+-
+-#		-o objfile	Override default executable name a.out.
+-
++#
+ #		-c		Do not call linker, leave relocatables in *.o.
+-
++#
+ #		-C		Check that subscripts are in bounds.
+-
+-#		-S		leave assembler output on file.s
+-
++#
++#		-D def		passed to C compiler (for .c files)
++#				or to cpp (for .F files)
++#
++#		-fPIC		turn on the -fPIC flag to the c compiler
++#
++#		-I includepath	passed to C compiler (for .c files)
++#				or to cpp (for .F files), and to f2c
++#
+ #		-l library	(passed to ld).
+-
++#
++#		-L includepath	passed to ld.  Library include path
++#
++#		-Ntnnn		allow nnn entries in table t
++#
++#		-o objfile	Override default executable name a.out.
++#
 +#		-O		turn on the -O flag to the c compiler
-+
++#
 +#		-O1		turn on the -O1 flag to the c compiler
-+
++#
 +#		-O2		turn on the -O2 flag to the c compiler
-+
++#
 +#		-O3		turn on the -O3 flag to the c compiler
-+
++#
++#		-P		emit .P files
++#
++#		-S		leave assembler output on file.s
++#
+ #		-u		complain about undeclared variables
+-
++#
+ #		-w		omit all warning messages
+-
++#
  #		-w66		omit Fortran 66 compatibility warning messages
+-
++#
++#		-Wall		turn on the -Wall flag to the c compiler
++#
+ #		files		FORTRAN source files ending in .f .
+ #				FORTRAN with cpp preprocessor directives
+@@ -30,21 +55,18 @@
+ #				efl source files ending in .e .
+ #				RATFOR files ending in .r .
+-
++#
+ #				f2c prototype files ending in .P ; such
+ #				files only affect subsequent files.
+ 
+-#		-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
++# 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
+ 
+-#		-P		emit .P files
  
-@@ -46,5 +56,5 @@
  s=/tmp/stderr_$$
  t=/tmp/f77_$$.o
 -CC=${CC_f2c:-'cc -common'}
 +CC=${CC_f2c:-'cc '}
  EFL=${EFL:-efl}
  EFLFLAGS=${EFLFLAGS:-'system=portable deltastno=10'}
-@@ -58,7 +68,8 @@
+@@ -58,25 +80,29 @@
  OUTF=a.out
  cOPT=1
 -set -- `getopt cCD:gI:N:Oo:Suw6 "$@"`
-+set -- `getopt cCD:gI:N:W:O:o:Suw6 "$@"`
- case $? in 0);; *) rc=$?; exit;; esac
+-case $? in 0);; *) rc=$?; exit;; esac
++ARGS=
  CPPFLAGS=
 +CFLAGS=-IPREFIX/include 
++LIBS=
  while
- 	test X"$1" != X--
-@@ -90,5 +101,5 @@
+-	test X"$1" != X--
++	test -n "$1"
+ do
+ 	case "$1"
+ 	in
+-	-C)	F2CFLAGS="$F2CFLAGS -C"
+-		shift;;
+-
+ 	-c)	cOPT=0
+ 		shift
+ 		;;
+ 
+-	-D)	CPPFLAGS="$CPPFLAGS -D$2"
+-		shift 2
+-		;;
++	-C)	F2CFLAGS="$F2CFLAGS -C"
++		shift;;
++
++	-D*)	CPPFLAGS="$CPPFLAGS $1"
++		shift;;
++
++        -fPIC)  CFLAGS="$CFLAGS $1"
++                shift;;
+ 
+ 	-g)	CFLAGS="$CFLAGS -g"
+ 		F2CFLAGS="$F2CFLAGS -g"
++		G="-g"
+ 		shift;;
+ 
+@@ -86,45 +112,75 @@
+ 		;;
+ 
++        -I*)    CFLAGS="$CFLAGS $1"
++                shift 1
++                ;;
++
++        -l*)    LIBS="$LIBS $1"
++                shift 1
++                ;;
++
++        -L*)    LIBS="$LIBS $1"
++                shift 1
++                ;;
++
+ 	-o)	OUTF=$2
+ 		shift 2
  		;;
  
 -	-O)	case $2 in -1) O=-O1;; -2) O=-O2;; -3) O=-O3;; *) O=-O;; esac
-+	-O)	case $2 in 1) O=-O1;; 2) O=-O2;; 3) O=-O3;; *) O=-O;; esac
- 		case $O in -O);; *) shift;; esac
- 		CFLAGS="$CFLAGS $O"
-@@ -96,4 +107,10 @@
+-		case $O in -O);; *) shift;; esac
+-		CFLAGS="$CFLAGS $O"
++#	-N)	F2CFLAGS="$F2CFLAGS $1""$2"
++#		shift 2
++#		;;
++# can't seem to find out what -N is supposed to do.
++
++	-O|-O1|-O2|-O3)	
++		CFLAGS="$CFLAGS $1"
+ 		shift
  		;;
  
-+	-W)	case $2 in all) W=-Wall;; *) echo "don't understand -W$2";; esac
-+		case $O in -W);; *) shift;; esac
-+		CFLAGS="$CFLAGS $W"
+-	-u)	F2CFLAGS="$F2CFLAGS -u"
++	-P)	F2CFLAGS="$F2CFLAGS $1"
+ 		shift
+ 		;;
+ 
+-	-w)	F2CFLAGS="$F2CFLAGS -w"
+-		case $2 in -6) F2CFLAGS="$F2CFLAGS"66; shift
+-			case $2 in -6) shift;; esac;; esac
++
++	-S)	CFLAGS="$CFLAGS -S"
++		cOPT=0
+ 		shift
+ 		;;
+ 
+-	-N)	F2CFLAGS="$F2CFLAGS $1""$2"
+-		shift 2
++	-u)	F2CFLAGS="$F2CFLAGS -u"
++		shift
+ 		;;
+ 
+-	-P)	F2CFLAGS="$F2CFLAGS $1"
++	-w)	F2CFLAGS="$F2CFLAGS -w"
+ 		shift
+ 		;;
+ 
++	-w66)	F2CFLAGS="$F2CFLAGS -w66"
 +		shift
 +		;;
+ 
+-	-S)	CFLAGS="$CFLAGS -S"
+-		cOPT=0
++	-Wall)	CFLAGS="$CFLAGS -Wall"
+ 		shift
+ 		;;
+ 
++	-*)	echo "ERROR:  $1 is not a valid option"
++		exit 1
++		;;
 +
- 	-u)	F2CFLAGS="$F2CFLAGS -u"
+ 	*)
+-		echo "invalid parameter $1" 1>&2
++		ARGS="$ARGS $1"
  		shift
-@@ -232,5 +249,5 @@
+ 		;;
+ 	esac
+ done
+-shift
++
++if test $cOPT = 0; then
++  if test "$OUTF" != "a.out"; then
++    CFLAGS="$CFLAGS -o $OUTF"
++  fi
++fi
++set -- $ARGS
++
++
+ while
+ 	test -n "$1"
+@@ -232,5 +288,20 @@
  done
  
 -case $cOPT in 2) $CC -o $OUTF -u MAIN__ $OFILES -lf2c -lm;; esac
-+case $cOPT in 2) $CC -o $OUTF -u _MAIN__ $OFILES -LPREFIX/lib -lf2c -lm;; esac
++case $cOPT 
++in 
++  2) $CC $CFLAGS -o $OUTF -u _MAIN__ $OFILES $LIBS -LPREFIX/lib -lf2c -lm
++     ;; 
++esac
++
  rc=$?
  exit $rc
++
++
++
++
++
++
++
++
++
++
diff --git a/lang/f2c/patches/patch-ad b/lang/f2c/patches/patch-ad
index 3872548132a..db05fc197a8 100644
--- a/lang/f2c/patches/patch-ad
+++ b/lang/f2c/patches/patch-ad
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:08:58 agc Exp $
+$NetBSD: patch-ad,v 1.3 1998/08/25 08:54:07 agc Exp $
+
+Name libraries correctly
 
 --- f2c.1t.orig	Sat May 16 17:16:53 1998
 +++ f2c.1t	Thu Jul  9 07:54:55 1998
diff --git a/lang/f2c/patches/patch-ae b/lang/f2c/patches/patch-ae
index c9b33fc18b7..09dbf30d410 100644
--- a/lang/f2c/patches/patch-ae
+++ b/lang/f2c/patches/patch-ae
@@ -1,4 +1,7 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:08:58 agc Exp $
+$NetBSD: patch-ae,v 1.3 1998/08/25 08:54:07 agc Exp $
+
+Omit any package-modified files from the distributed checksum
+(the pkgsrc checksum is still valid)
 
 --- libF77/makefile.orig	Sun Jul 19 22:58:11 1998
 +++ libF77/makefile	Sun Jul 19 23:11:54 1998
diff --git a/lang/f2c/patches/patch-af b/lang/f2c/patches/patch-af
index 1e2b403baac..a34b99f911a 100644
--- a/lang/f2c/patches/patch-af
+++ b/lang/f2c/patches/patch-af
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:08:58 agc Exp $
+$NetBSD: patch-af,v 1.3 1998/08/25 08:54:07 agc Exp $
+
+Adjust for pkgsrc-related changes
 
 --- libF77/libF77.xsum.orig	Thu Jul  9 08:25:14 1998
 +++ libF77/libF77.xsum	Thu Jul  9 08:25:31 1998
diff --git a/lang/f2c/patches/patch-ag b/lang/f2c/patches/patch-ag
index fe8a2d64e11..d033a6c2f70 100644
--- a/lang/f2c/patches/patch-ag
+++ b/lang/f2c/patches/patch-ag
@@ -1,4 +1,7 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 11:08:59 agc Exp $
+$NetBSD: patch-ag,v 1.3 1998/08/25 08:54:08 agc Exp $
+
+Set optimisation level appropriately, and omit modified
+files from distributed checksum
 
 --- libI77/makefile.orig	Sun Jul 19 22:58:35 1998
 +++ libI77/makefile	Sun Jul 19 23:13:08 1998
diff --git a/lang/f2c/patches/patch-ah b/lang/f2c/patches/patch-ah
index ef472484a00..d2c4e7451d7 100644
--- a/lang/f2c/patches/patch-ah
+++ b/lang/f2c/patches/patch-ah
@@ -1,4 +1,6 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 11:08:59 agc Exp $
+$NetBSD: patch-ah,v 1.3 1998/08/25 08:54:08 agc Exp $
+
+Omit pkgsrc-modified files from distributed checksum
 
 --- libI77/libI77.xsum.orig	Thu Jul  9 08:26:43 1998
 +++ libI77/libI77.xsum	Thu Jul  9 08:27:14 1998
diff --git a/lang/f2c/pkg/PLIST b/lang/f2c/pkg/PLIST
index 3f391b05f36..d6492f613bb 100644
--- a/lang/f2c/pkg/PLIST
+++ b/lang/f2c/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 1998/07/21 16:40:47 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 1998/08/25 08:54:08 agc Exp $
 bin/f2c
-bin/f77
+bin/f2c-f77
 include/f2c.h
 lib/libf2c.a
 lib/libF77.a
diff --git a/lang/f2c/scripts/post-extract b/lang/f2c/scripts/post-extract
index 2d1a0e51fa4..84f4a663bfc 100755
--- a/lang/f2c/scripts/post-extract
+++ b/lang/f2c/scripts/post-extract
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: post-extract,v 1.2 1998/08/07 11:09:01 agc Exp $
+# $NetBSD: post-extract,v 1.3 1998/08/25 08:54:08 agc Exp $
 #
 
 echo "Running post-extract"
@@ -24,3 +24,5 @@ cd src
 rm index.html
 mv .depend depend.orig
 gunzip *.gz
+
+exit 0