Update f2c to 2009-04-11 snapshot.

Changes are mostly bug fixes.
Perform conservative update: recreate libF77 and libI77 providing
binary compatibility.
Prefer files to patches creating respective files.
Override build system completely, we effectively did that anyway.

8 files changed, 0 insertions, 467 deletions

diff --git a/lang/f2c/patches/patch-aa b/lang/f2c/patches/patch-aa
deleted file mode 100644
index d5240ad80fa..00000000000
--- a/lang/f2c/patches/patch-aa
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.18 2009/10/31 19:15:44 asau Exp $
-
---- Makefile.orig	Tue Sep 14 16:47:52 2004
-+++ Makefile
-@@ -0,0 +1,39 @@
-+# Top level Makefile for f2c, libF77, and libI77
-+
-+all: f2c libF77/libF77.la libI77/libI77.la man
-+
-+
-+f2c:
-+	@echo Making all in 'src'
-+	cd src; ${MAKE} all
-+	cp src/f2c f2c
-+
-+libF77/libF77.la:
-+	@echo Making all in 'libF77'
-+	cd libF77 &&  ${MAKE} all LIBDIR=${PREFIX}/lib
-+
-+libI77/libI77.la:
-+	@echo Making all in 'libI77'
-+	cd libI77 &&  ${MAKE} all LIBDIR=${PREFIX}/lib
-+
-+man: f2c.0
-+
-+f2c.0: f2c.1t
-+	rm f2c.1
-+	sed 's!/usr!${PREFIX}!g' f2c.1t | sed 's!lib/libc.a!usr/lib/libc.a!g' > f2c.1
-+	nroff -man f2c.1 > f2c.0
-+
-+
-+install::
-+	-@mkdir -p ${DESTDIR}${PREFIX}/bin
-+	${BSD_INSTALL_PROGRAM} ./src/f2c ${DESTDIR}${PREFIX}/bin
-+	-@mkdir -p ${DESTDIR}${PREFIX}/lib
-+	@cd libI77 && ${MAKE} install LIBDIR=${DESTDIR}${PREFIX}/lib
-+	@cd libF77 && ${MAKE} install LIBDIR=${DESTDIR}${PREFIX}/lib
-+	-@mkdir -p ${DESTDIR}${PREFIX}/include
-+	${BSD_INSTALL_DATA} ./f2c.h ${DESTDIR}${PREFIX}/include
-+	-@mkdir -p ${DESTDIR}${PREFIX}/share/doc/f2c
-+	${BSD_INSTALL_DATA} ./f2c.ps ${DESTDIR}${PREFIX}/share/doc/f2c
-+	${BSD_INSTALL_DATA} ./changes ${DESTDIR}${PREFIX}/share/doc/f2c
-+	${BSD_INSTALL_MAN} ./f2c.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-+	${BSD_INSTALL_MAN} ./f2c.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
diff --git a/lang/f2c/patches/patch-ab b/lang/f2c/patches/patch-ab
deleted file mode 100644
index f172161cd22..00000000000
--- a/lang/f2c/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2002/03/05 18:29:49 dmcmahill Exp $
-
-Obey CC and CFLAGS
-
-Don't do additional checksums of the source (gets thrown 
-off by our patches, plus we already have files/md5)
-
---- src/makefile.orig	Wed Feb 25 08:18:04 1998
-+++ src/makefile	Tue Mar  5 13:09:23 2002
-@@ -2,6 +2,6 @@
- 
- .SUFFIXES: .c .o
--CC = cc
--CFLAGS = -O
-+#CC = cc
-+#CFLAGS = -O2
- SHELL = /bin/sh
- YACC = yacc
-@@ -25,5 +25,5 @@
- OBJECTS = $(OBJECTSd) $(MALLOC)
- 
--all: xsum.out f2c
-+all: f2c
- 
- f2c: $(OBJECTS)
diff --git a/lang/f2c/patches/patch-ae b/lang/f2c/patches/patch-ae
deleted file mode 100644
index fb0c6f98008..00000000000
--- a/lang/f2c/patches/patch-ae
+++ /dev/null
@@ -1,100 +0,0 @@
-$NetBSD: patch-ae,v 1.10 2005/01/28 23:37:42 dmcmahill Exp $
-
---- libF77/makefile.orig	Tue Sep 14 18:38:32 2004
-+++ libF77/makefile
-@@ -1,7 +1,4 @@
--.SUFFIXES: .c .o
--CC = cc
--SHELL = /bin/sh
--CFLAGS = -O
-+.SUFFIXES: .c .lo
- 
- # If your system lacks onexit() and you are not using an
- # ANSI C compiler, then you should add -DNO_ONEXIT to CFLAGS,
-@@ -12,11 +9,10 @@ CFLAGS = -O
- # "CFLAGS =" line to
- # CFLAGS = -O -Donexit=on_exit
- 
--# compile, then strip unnecessary symbols
--.c.o:
--	$(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c
--	ld -r -x -o $*.xxx $*.o
--	mv $*.xxx $*.o
-+# compile
-+.c.lo:
-+	${LIBTOOL} --mode=compile $(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c
-+
- ## Under Solaris (and other systems that do not understand ld -x),
- ## omit -x in the ld line above.
- ## If your system does not have the ld command, comment out
-@@ -41,12 +37,12 @@ INT =	i_abs.o i_dim.o i_dnnt.o i_indx.o 
- HALF =	h_abs.o h_dim.o h_dnnt.o h_indx.o h_len.o h_mod.o  h_nint.o h_sign.o
- CMP =	l_ge.o l_gt.o l_le.o l_lt.o hl_ge.o hl_gt.o hl_le.o hl_lt.o
- EFL =	ef1asc_.o ef1cmc_.o
--CHAR =	F77_aloc.o s_cat.o s_cmp.o s_copy.o
-+CHAR =	s_cat.o s_cmp.o s_copy.o
- F90BIT = lbitbits.o lbitshft.o
- QINT =	pow_qq.o qbitbits.o qbitshft.o
- TIME =	dtime_.o etime_.o
- 
--all: signal1.h libF77.a
-+all: signal1.h libF77.la
- 
- # You may need to adjust signal1.h suitably for your system...
- signal1.h: signal1.h0
-@@ -59,45 +55,26 @@ signal1.h: signal1.h0
- # For INTEGER*8 support (which requires system-dependent adjustments to
- # f2c.h), add $(QINT) to the libf2c.a dependency list below...
- 
--libF77.a : $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
-+OBJS = $(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
- 	$(HALF) $(CMP) $(EFL) $(CHAR) $(F90BIT) $(TIME)
--	ar r libF77.a $?
--	ranlib libF77.a || true
-+
-+LTOBJS = ${OBJS:.o=.lo}
-+
-+libF77.la : $(LTOBJS)
-+	${LIBTOOL} --mode=link ${CC} -o $@ ${LTOBJS} ${LDFLAGS} -rpath ${LIBDIR} -version-info ${F2CMAJOR}:${F2CMINOR}
- 
- ### If your system lacks ranlib, you don't need it; see README.
- 
--Version.o: Version.c
--	$(CC) -c Version.c
-+Version.lo: Version.c
-+	${LIBTOOL} --mode=compile $(CC) ${CFLAGS} -c Version.c
- 
- # To compile with C++, first "make f2c.h"
- f2c.h: f2ch.add
- 	cat /usr/include/f2c.h f2ch.add >f2c.h
- 
--install:	libF77.a
--	mv libF77.a $(LIBDIR)/libF77.a
--	ranlib $(LIBDIR)/libF77.a || true
-+install:	libF77.la
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libF77.la ${LIBDIR}
- 
- clean:
- 	rm -f libF77.a *.o
- 
--check:
--	xsum F77_aloc.c Notice README Version.c abort_.c c_abs.c c_cos.c \
--	c_div.c c_exp.c c_log.c c_sin.c c_sqrt.c cabs.c d_abs.c d_acos.c \
--	d_asin.c d_atan.c d_atn2.c d_cnjg.c d_cos.c d_cosh.c d_dim.c \
--	d_exp.c d_imag.c d_int.c d_lg10.c d_log.c d_mod.c d_nint.c \
--	d_prod.c d_sign.c d_sin.c d_sinh.c d_sqrt.c d_tan.c d_tanh.c \
--	derf_.c derfc_.c dtime_.c \
--	ef1asc_.c ef1cmc_.c erf_.c erfc_.c etime_.c exit_.c f2ch.add \
--	getarg_.c getenv_.c h_abs.c h_dim.c h_dnnt.c h_indx.c h_len.c \
--	h_mod.c h_nint.c h_sign.c hl_ge.c hl_gt.c hl_le.c hl_lt.c \
--	i_abs.c i_dim.c i_dnnt.c i_indx.c i_len.c i_mod.c i_nint.c \
--	i_sign.c iargc_.c l_ge.c l_gt.c l_le.c l_lt.c lbitbits.c lbitshft.c \
--	main.c makefile pow_ci.c pow_dd.c pow_di.c pow_hh.c pow_ii.c \
--	pow_qq.c pow_ri.c pow_zi.c pow_zz.c qbitbits.c qbitshft.c \
--	r_abs.c r_acos.c r_asin.c r_atan.c r_atn2.c \
--	r_cnjg.c r_cos.c r_cosh.c r_dim.c r_exp.c r_imag.c r_int.c r_lg10.c \
--	r_log.c r_mod.c r_nint.c r_sign.c r_sin.c r_sinh.c r_sqrt.c \
--	r_tan.c r_tanh.c s_cat.c s_cmp.c s_copy.c \
--	s_paus.c s_rnge.c s_stop.c sig_die.c signal1.h0 signal_.c system_.c \
--	z_abs.c z_cos.c z_div.c z_exp.c z_log.c z_sin.c z_sqrt.c >zap
--	cmp zap libF77.xsum && rm zap || diff libF77.xsum zap
diff --git a/lang/f2c/patches/patch-af b/lang/f2c/patches/patch-af
deleted file mode 100644
index 4c93f9d296f..00000000000
--- a/lang/f2c/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.5 2004/09/15 12:27:26 dmcmahill Exp $
-
---- libI77/lwrite.c.orig	Wed Sep 15 12:00:47 2004
-+++ libI77/lwrite.c
-@@ -248,7 +248,7 @@ l_write(ftnint *number, char *ptr, ftnle
- 	double y,z;
- 	real *xx;
- 	doublereal *yy;
--	for(i=0;i< *number; i++)
-+	for(i=0;i< (int)*number; i++)
- 	{
- 		switch((int)type)
- 		{
diff --git a/lang/f2c/patches/patch-ag b/lang/f2c/patches/patch-ag
deleted file mode 100644
index 8c8db36171d..00000000000
--- a/lang/f2c/patches/patch-ag
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-ag,v 1.10 2005/01/28 23:37:42 dmcmahill Exp $
-
---- libI77/makefile.orig	Tue Sep 14 17:11:44 2004
-+++ libI77/makefile
-@@ -1,13 +1,11 @@
--.SUFFIXES: .c .o
--CC = cc
--CFLAGS = -O
--SHELL = /bin/sh
--
--# compile, then strip unnecessary symbols
--.c.o:
--	$(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c
--	ld -r -x -o $*.xxx $*.o
--	mv $*.xxx $*.o
-+all: libI77.la
-+
-+.SUFFIXES: .c .lo
-+
-+# compile
-+.c.lo:
-+	${LIBTOOL} --mode=compile $(CC) -c -DSkip_f2c_Undefs $(CFLAGS) $*.c
-+
- ## Under Solaris (and other systems that do not understand ld -x),
- ## omit -x in the ld line above.
- ## If your system does not have the ld command, comment out
-@@ -17,18 +15,18 @@ OBJ =	Version.o backspace.o close.o dfe.
- 	fmt.o fmtlib.o ftell_.o iio.o ilnw.o inquire.o lread.o lwrite.o \
- 	open.o rdfmt.o rewind.o rsfe.o rsli.o rsne.o sfe.o sue.o typesize.o \
- 	uio.o util.o wref.o wrtfmt.o wsfe.o wsle.o wsne.o xwsne.o
--libI77.a:	$(OBJ)
--		ar r libI77.a $?
--		ranlib libI77.a || true
-+LTOBJ=	${OBJ:.o=.lo}
-+
-+libI77.la:	$(LTOBJ)
-+	${LIBTOOL} --mode=link ${CC} ${CFLAGS} -o $@ ${LTOBJ} ${LDFLAGS} -rpath ${LIBDIR} -version-info ${F2CMAJOR}:${F2CMINOR}
- 
- ### If your system lacks ranlib, you don't need it; see README.
- 
--install:	libI77.a
--	cp libI77.a $(LIBDIR)/libI77.a
--	ranlib $(LIBDIR)/libI77.a || true
-+install:	libI77.la
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libI77.la ${LIBDIR}
- 
--Version.o: Version.c
--	$(CC) -c Version.c
-+Version.lo: Version.c
-+	${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -c Version.c
- 
- # To compile with C++, first "make f2c.h"
- f2c.h: f2ch.add
-@@ -94,11 +92,3 @@ xwsne.o:	fio.h
- xwsne.o:	lio.h
- xwsne.o:	fmt.h
- 
--check:
--	xsum Notice README Version.c backspace.c close.c dfe.c dolio.c \
--	due.c endfile.c err.c f2ch.add fio.h fmt.c fmt.h fmtlib.c fp.h \
--	ftell_.c iio.c ilnw.c inquire.c lio.h lread.c lwrite.c makefile \
--	open.c rawio.h rdfmt.c rewind.c rsfe.c rsli.c rsne.c sfe.c sue.c \
--	typesize.c uio.c util.c wref.c wrtfmt.c wsfe.c wsle.c wsne.c \
--	xwsne.c >zap
--	cmp zap libI77.xsum && rm zap || diff libI77.xsum zap
diff --git a/lang/f2c/patches/patch-ai b/lang/f2c/patches/patch-ai
deleted file mode 100644
index ccc512e8a0a..00000000000
--- a/lang/f2c/patches/patch-ai
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ai,v 1.6 2009/06/25 14:22:08 dmcmahill Exp $
-
-required to make 
-sizeof(integer) == sizeof(real)
-and
-sizeof(logical) == sizeof(real)
-(per f2c/readme)
-
---- f2c.h.orig	Tue Sep  7 13:46:24 1999
-+++ f2c.h	Tue Dec  7 18:08:26 1999
-@@ -8,5 +8,9 @@
- #define F2C_INCLUDE
- 
-+#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__sparcv8) || defined(__sparcv9)
-+typedef int integer;
-+#else
- typedef long int integer;
-+#endif
- typedef unsigned long int uinteger;
- typedef char *address;
-@@ -16,5 +20,9 @@
- typedef struct { real r, i; } complex;
- typedef struct { doublereal r, i; } doublecomplex;
-+#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__sparcv8) || defined(__sparcv9)
-+typedef int logical;
-+#else
- typedef long int logical;
-+#endif
- typedef short int shortlogical;
- typedef char logical1;
diff --git a/lang/f2c/patches/patch-aj b/lang/f2c/patches/patch-aj
deleted file mode 100644
index e8e708a1656..00000000000
--- a/lang/f2c/patches/patch-aj
+++ /dev/null
@@ -1,121 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2001/04/07 12:43:49 dmcmahill Exp $
-
-does a sanity check of the settings in f2c.h  If these settings
-are wrong, a message is printed asking that the package maintainer
-be contacted.
-
---- /dev/null	Wed Jan 13 02:06:04 1999
-+++ chktypes.c	Wed Jan 13 18:12:34 1999
-@@ -0,0 +1,112 @@
-+#include <stdio.h>
-+#include <string.h>
-+#include "f2c.h"
-+
-+int main(int argc, char *argv[])
-+{
-+
-+  int err=0;
-+  int pok=0;
-+
-+
-+  if(argc > 1)
-+    {
-+      if(strncmp(argv[1],"-v",2)==0)
-+	{
-+	  pok=1;
-+	}
-+    }
-+  if(sizeof(doublecomplex) == 2*sizeof(doublereal))
-+    {
-+      if(pok)
-+	printf("sizeof(doublecomplex) = 2*sizeof(doublereal) = %d\n",sizeof(doublecomplex));
-+    }
-+  else
-+    {
-+      printf("ERROR:\tsizeof(doublecomplex) \t= %d\n\t2*sizeof(doublereal) \t= %d\n",
-+	     sizeof(doublecomplex),2*sizeof(doublereal));
-+      err=1;
-+    }
-+
-+
-+  if(sizeof(doublereal) == sizeof(complex))
-+    {
-+      if(pok)
-+	printf("sizeof(doublereal)    = sizeof(complex)      = %d\n",sizeof(doublereal));
-+    }
-+  else
-+    {
-+      printf("ERROR:\tsizeof(doublereal) \t= %d\n\tsizeof(complex) \t= %d\n",
-+	     sizeof(doublereal),sizeof(complex));
-+      err=1;
-+    }
-+
-+
-+  if(sizeof(doublereal) == 2*sizeof(real))
-+    {
-+      if(pok)
-+	printf("sizeof(doublereal)    = 2*sizeof(real)       = %d\n",sizeof(doublereal));
-+    }
-+  else
-+    {
-+      printf("ERROR:\tsizeof(doublereal) \t= %d\n\t2*sizeof(real)\t = %d\n",
-+	     sizeof(doublereal),2*sizeof(real));
-+      err=1;
-+    }
-+
-+  if(sizeof(real) == sizeof(integer))
-+    {
-+      if(pok)
-+	printf("sizeof(real)          = sizeof(integer)      = %d\n",sizeof(real));
-+    }
-+  else
-+    {
-+      printf("ERROR:\tsizeof(real) \t= %d\n\tsizeof(integer) \t= %d\n",
-+	     sizeof(real),sizeof(integer));
-+      err=1;
-+    }
-+
-+  if(sizeof(real) == sizeof(logical))
-+    {
-+      if(pok)
-+	printf("sizeof(real)          = sizeof(logical)      = %d\n",sizeof(real));
-+    }
-+  else
-+    {
-+      printf("ERROR:\tsizeof(real) \t= %d\n\tsizeof(logical) \t= %d\n",
-+	     sizeof(real),sizeof(logical));
-+      err=1;
-+    }
-+
-+  if(sizeof(real) == 2*sizeof(shortint))
-+    {
-+      if(pok)
-+	printf("sizeof(real)          = 2*sizeof(shortint)   = %d\n",sizeof(real));
-+    }
-+  else
-+    {
-+      printf("ERROR:\tsizeof(real) \t= %d\n\t2*sizeof() \t= %d\n",
-+	     sizeof(real),2*sizeof(shortint));
-+      err=1;
-+    }
-+
-+  if(pok)
-+    {
-+      printf("\n\n-------------------\n");
-+      printf("sizeof(short)  = %d\n",sizeof(short));
-+      printf("sizeof(int)    = %d\n",sizeof(int));
-+      printf("sizeof(float)  = %d\n",sizeof(float));
-+      printf("sizeof(long)   = %d\n",sizeof(long));
-+      printf("sizeof(double) = %d\n",sizeof(double));
-+      printf("\n\n-------------------\n");
-+    }
-+
-+  if(err)
-+    {
-+      printf("The header file f2c.h has the wrong typedef's for your machine\n");
-+      printf("architecture.  Please contact the package maintainer.\n");
-+    }
-+
-+  return(err);
-+}
-+
diff --git a/lang/f2c/patches/patch-ak b/lang/f2c/patches/patch-ak
deleted file mode 100644
index 48485114a9a..00000000000
--- a/lang/f2c/patches/patch-ak
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/01/28 23:37:42 dmcmahill Exp $
-
---- src/sysdep.c.orig	2000-07-04 22:54:54.000000000 +0000
-+++ src/sysdep.c
-@@ -22,6 +22,7 @@ use or performance of this software.
- ****************************************************************/
- #include "defs.h"
- #include "usignal.h"
-+#include <stdlib.h>
- 
- char binread[] = "rb", textread[] = "r";
- char binwrite[] = "wb", textwrite[] = "w";
-@@ -95,8 +96,10 @@ Un_link_all(int cdelete)
- {
- 	if (!debugflag) {
- 		unlink(c_functions);
-+		unlink(initbname);
- 		unlink(initfname);
- 		unlink(p1_file);
-+		unlink(p1_bakfile);
- 		unlink(sortfname);
- 		unlink(blkdfname);
- 		if (cdelete && coutput)
-@@ -118,6 +121,15 @@ set_tmp_names(Void)
- 	p1_file = blkdfname + k;
- 	p1_bakfile = p1_file + k;
- 	sortfname = p1_bakfile + k;
-+#if !defined(MSDOS)
-+	sprintf(c_functions, "%s/f2c_func_XXXXXX", tmpdir);
-+	sprintf(initfname,   "%s/f2c_rc_XXXXXX", tmpdir);
-+	sprintf(initbname,   "%s/f2c_rc.b_XXXXXX", tmpdir);
-+	sprintf(blkdfname,   "%s/f2c_blkd_XXXXXX", tmpdir);
-+	sprintf(p1_file,     "%s/f2c_p1f_XXXXXX", tmpdir);
-+	sprintf(p1_bakfile,  "%s/f2c_p1fb_XXXXXX", tmpdir);
-+	sprintf(sortfname,   "%s/f2c_sort_XXXXXX", tmpdir);
-+#endif
- 	{
- #ifdef MSDOS
- 	char buf[64], *s, *t;
-@@ -156,16 +168,21 @@ set_tmp_names(Void)
- 	sprintf(p1_file, "%s%sp1f", t, f2c);
- 	sprintf(p1_bakfile, "%s%sp1fb", t, f2c);
- 	sprintf(sortfname, "%s%ssort", t, f2c);
-+	sprintf(initbname, "%s.b", initfname);
- #else
--	long pid = getpid();
--	sprintf(c_functions, "%s/f2c%ld_func", tmpdir, pid);
--	sprintf(initfname, "%s/f2c%ld_rd", tmpdir, pid);
--	sprintf(blkdfname, "%s/f2c%ld_blkd", tmpdir, pid);
--	sprintf(p1_file, "%s/f2c%ld_p1f", tmpdir, pid);
--	sprintf(p1_bakfile, "%s/f2c%ld_p1fb", tmpdir, pid);
--	sprintf(sortfname, "%s/f2c%ld_sort", tmpdir, pid);
-+
-+	if (mkstemp(c_functions) == -1
-+	    || mkstemp(initfname) == -1
-+	    || mkstemp(initbname) == -1
-+	    || mkstemp(blkdfname) == -1
-+	    || mkstemp(p1_file) == -1
-+	    || mkstemp(p1_bakfile) == -1
-+	    || mkstemp(sortfname) == -1) {
-+	  fprintf(stderr, "Cannot create temporary files\n");
-+	  Un_link_all(0);
-+	  exit(1);
-+	}
- #endif
--	sprintf(initbname, "%s.b", initfname);
- 	}
- 	if (debugflag)
- 		fprintf(diagfile, "%s %s %s %s %s %s\n", c_functions,