-fix the combined f2c library. problem noted by Jason Beegan

- enable the -N option to the f2c-f77.  Allows increasing some runtime
  table sizes in the f2c compiler.

7 files changed, 58 insertions, 25 deletions

diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 179ea55b4bf..8dffd6075a8 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2001/04/07 12:43:47 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.13 2001/04/09 01:44:38 dmcmahill Exp $
 
 DISTNAME=	f2c-20001205
-PKGNAME=	f2c-20001205nb1
+PKGNAME=	f2c-20001205nb2
 WRKSRC=		${WRKDIR}/f2c
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
@@ -49,4 +49,16 @@ post-patch:
 	@${ECHO} "major=${F2CMAJOR}" > ${WRKSRC}/libI77/shlib_version
 	@${ECHO} "minor=${F2CMINOR}" >> ${WRKSRC}/libI77/shlib_version
 
+# for OBJECT_FMT
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OBJECT_FMT} == "ELF")
+post-install:
+	${LN} -fs ${PREFIX}/lib/libf2c.so.${F2CMAJOR}.${F2CMINOR} \
+		${PREFIX}/lib/libf2c.so.${F2CMAJOR}
+	${LN} -fs ${PREFIX}/lib/libf2c.so.${F2CMAJOR}.${F2CMINOR} \
+		${PREFIX}/lib/libf2c.so
+
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/f2c/files/patch-sum b/lang/f2c/files/patch-sum
index bf68c5ea98e..1cdbc94c31c 100644
--- a/lang/f2c/files/patch-sum
+++ b/lang/f2c/files/patch-sum
@@ -1,10 +1,10 @@
-$NetBSD: patch-sum,v 1.7 2001/04/07 12:47:45 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.8 2001/04/09 01:44:39 dmcmahill Exp $
 
-SHA1 (patch-aa) = 782f754e84680f0aad1f228f14069b666cc899b5
+SHA1 (patch-aa) = 81be1056f42c7d7fa54ac52a3cc59039acc74689
 SHA1 (patch-ab) = ddd695d45ac7819578b22a8a8aed0f09803cd3a0
-SHA1 (patch-ac) = bc53ff9946e4ef7b072fd2440afddcda9967b2b9
+SHA1 (patch-ac) = 397e84dffe4ade99f0ee5b08e56ed524c710090f
 SHA1 (patch-ad) = 0144d0cdf55ce8117d179a56acc4db64fe67c8e0
-SHA1 (patch-ae) = 00278dbc3a8bf4d8a9e54f11c337cbaeb65e7016
-SHA1 (patch-ag) = 0229f503b2c7e22016d40c9de4a26f47cf315663
+SHA1 (patch-ae) = b3ba2a1a40aee9f3151fc36aa89d34e472f80325
+SHA1 (patch-ag) = d56c32c8ce651a1a773b32b3e8f9645d3acb2a87
 SHA1 (patch-ai) = ccfa759c016e980ed05105833557215ef00c74de
 SHA1 (patch-aj) = c58361fbbfc06e033b2a47e1d1e370716c4b185c
diff --git a/lang/f2c/patches/patch-aa b/lang/f2c/patches/patch-aa
index 42c3993e58b..600fe2fb643 100644
--- a/lang/f2c/patches/patch-aa
+++ b/lang/f2c/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.8 2001/04/07 12:47:46 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.9 2001/04/09 01:44:39 dmcmahill Exp $
 
 Add a top level Makefile
 
 --- /dev/null	Thu Apr  5 17:09:09 2001
 +++ Makefile	Thu Apr  5 18:31:35 2001
-@@ -0,0 +1,48 @@
+@@ -0,0 +1,62 @@
 +# Top level Makefile for f2c, libF77, and libI77
 +
-+all: f2c libf2c.a f2c-f77 man
++all: f2c libf2c/libf2c.a f2c-f77 man
 +
 +
 +f2c:
@@ -23,9 +23,19 @@ Add a top level Makefile
 +	@echo Making all in 'libI77'
 +	cd libI77 &&  ${MAKE} all
 +
-+libf2c.a: libI77/libI77.a libF77/libF77.a
-+	ar ruv libf2c.a libF77/libF77.a libI77/libI77.a
-+	ranlib libf2c.a
++libf2c/libf2c.a: libI77/libI77.a libF77/libF77.a
++	-mkdir libf2c
++	if [ -f libF77/libF77.a ]; then  cd libf2c && ar x ../libF77/libF77.a ; fi
++	if [ -f libF77/libF77_p.a ]; then cd libf2c && ar x ../libF77/libF77_p.a ; fi
++	if [ -f libF77/libF77_pic.a ]; then cd libf2c && ar x ../libF77/libF77_pic.a ; fi
++	if [ -f libI77/libI77.a ]; then cd libf2c && ar x ../libI77/libI77.a ; fi
++	if [ -f libI77/libI77_p.a ]; then cd libf2c && ar x ../libI77/libI77_p.a ; fi
++	if [ -f libI77/libI77_pic.a ]; then cd libf2c && ar x ../libI77/libI77_pic.a ; fi
++	if [ -f libF77/libF77.a ]; then cd libf2c && ar cruv libf2c.a *.o ; fi
++	if [ -f libF77/libF77_p.a ]; then cd libf2c && ar cruv libf2c_p.a *.po ; fi
++	if [ -f libF77/libF77_pic.a ]; then cd libf2c && ar cruv libf2c_pic.a *.so ; fi
++	if [ -f libF77/libF77_pic.a ]; then cd libf2c && \
++		ld -Bshareable -soname f2c.${F2CMAJOR} -o libf2c.so.${F2CMAJOR}.${F2CMINOR} *.so ; fi
 +
 +man: f2c.0
 +
@@ -42,7 +52,11 @@ Add a top level Makefile
 +	-@mkdir -p ${PREFIX}/lib
 +	@cd libI77 && ${MAKE} install LIBDIR=${PREFIX}/lib
 +	@cd libF77 && ${MAKE} install LIBDIR=${PREFIX}/lib
-+	${BSD_INSTALL_DATA} ./libf2c.a ${PREFIX}/lib
++	${BSD_INSTALL_DATA} ./libf2c/libf2c.a ${PREFIX}/lib
++	if [ -f ./libf2c/libf2c_p.a ]; then ${BSD_INSTALL_DATA} ./libf2c/libf2c_p.a ${PREFIX}/lib ; fi
++	if [ -f ./libf2c/libf2c_pic.a ]; then ${BSD_INSTALL_DATA} ./libf2c/libf2c_pic.a ${PREFIX}/lib ; fi
++	if [ -f ./libf2c/libf2c.so.${F2CMAJOR}.${F2CMINOR} ]; then \
++		${BSD_INSTALL_DATA} ./libf2c/libf2c.so.${F2CMAJOR}.${F2CMINOR} ${PREFIX}/lib ; fi
 +	-@mkdir -p ${PREFIX}/include
 +	${BSD_INSTALL_DATA} ./f2c.h ${PREFIX}/include
 +	-@mkdir -p ${PREFIX}/share/doc/f2c
diff --git a/lang/f2c/patches/patch-ac b/lang/f2c/patches/patch-ac
index 7590d59c75b..d2189a0aca0 100644
--- a/lang/f2c/patches/patch-ac
+++ b/lang/f2c/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.9 2001/04/07 12:43:48 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.10 2001/04/09 01:44:39 dmcmahill Exp $
 
 Much cleanup of the script.  Added various options such as
 -O    for optimization
@@ -261,10 +261,10 @@ Much cleanup of the script.  Added various options such as
 -	-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 -Olimit 2000"
-+#	-N)	F2CFLAGS="$F2CFLAGS $1""$2"
-+#		shift 2
-+#		;;
-+# can't seem to find out what -N is supposed to do.
++
++	-N)	F2CFLAGS="$F2CFLAGS $1""$2"
++		shift 2
++		;;
 +
 +	-O|-O1|-O2|-O3)	
 +		CFLAGS="$CFLAGS $1"
diff --git a/lang/f2c/patches/patch-ae b/lang/f2c/patches/patch-ae
index c09dc83a022..076924b5657 100644
--- a/lang/f2c/patches/patch-ae
+++ b/lang/f2c/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.6 2001/04/07 12:43:48 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.7 2001/04/09 01:44:39 dmcmahill Exp $
 
 use a bsd style makefile for building shared libs
 
 --- libF77/makefile.orig	Fri Apr  6 22:20:09 2001
 +++ libF77/makefile	Fri Apr  6 22:20:40 2001
-@@ -1,26 +1,4 @@
+@@ -1,26 +1,5 @@
 -.SUFFIXES: .c .o
 -CC = cc
 -SHELL = /bin/sh
@@ -31,6 +31,7 @@ use a bsd style makefile for building shared libs
 -
 +CPPFLAGS+= -Wcast-align -DNO_ONEXIT -DSkip_f2c_Undefs
 +NOGCCERROR=	yes
++MKLINT=	no
  MISC =	F77_aloc.o Version.o main.o s_rnge.o abort_.o getarg_.o iargc_.o \
  	getenv_.o signal_.o s_stop.o s_paus.o system_.o cabs.o\
 @@ -47,57 +25,11 @@
diff --git a/lang/f2c/patches/patch-ag b/lang/f2c/patches/patch-ag
index 10248b04db0..e42040a605e 100644
--- a/lang/f2c/patches/patch-ag
+++ b/lang/f2c/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.6 2001/04/07 12:43:48 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.7 2001/04/09 01:44:39 dmcmahill Exp $
 
 use a BSD style makefile for building shared libs
 
 --- libI77/makefile.orig	Fri Apr  6 22:20:23 2001
 +++ libI77/makefile	Fri Apr  6 22:20:42 2001
-@@ -1,16 +1,4 @@
+@@ -1,16 +1,5 @@
 -.SUFFIXES: .c .o
 -CC = cc
 -CFLAGS = -O
@@ -21,7 +21,8 @@ use a BSD style makefile for building shared libs
 -## or remove both the ld and mv lines above.
 +CPPFLAGS+= -Wcast-align -DSkip_f2c_Undefs
 +NOGCCERROR=	yes
- 
++MKLINT=	no 
+
  OBJ =	Version.o backspace.o close.o dfe.o dolio.o due.o endfile.o err.o \
 @@ -18,87 +6,7 @@
  	open.o rdfmt.o rewind.o rsfe.o rsli.o rsne.o sfe.o sue.o typesize.o \
diff --git a/lang/f2c/pkg/PLIST b/lang/f2c/pkg/PLIST
index 9a74987edc1..baaf0c9a9b4 100644
--- a/lang/f2c/pkg/PLIST
+++ b/lang/f2c/pkg/PLIST
@@ -1,8 +1,13 @@
-@comment $NetBSD: PLIST,v 1.5 2001/04/07 12:43:49 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/04/09 01:44:40 dmcmahill Exp $
 bin/f2c
 bin/f2c-f77
 include/f2c.h
 lib/libf2c.a
+lib/libf2c_p.a
+lib/libf2c_pic.a
+lib/libf2c.so.${F2CMAJOR}.${F2CMINOR}
+lib/libf2c.so.${F2CMAJOR}
+lib/libf2c.so
 lib/libF77.a
 lib/libF77_p.a
 lib/libF77_pic.a