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.

16 files changed, 324 insertions, 509 deletions

diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 911c5f464e5..07a73f47fc3 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2009/10/31 19:15:44 asau Exp $
+# $NetBSD: Makefile,v 1.47 2009/11/22 12:52:53 asau Exp $
 
-DISTNAME=	f2c-20001205
-PKGREVISION=	12
+DISTNAME=	f2c-20090411
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -24,47 +23,37 @@ COMMENT=	Fortran to C compiler including a script to emulate f77
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-# Many failures - this is *very* far from safe.
-MAKE_JOBS_SAFE=		no
-
 CONFLICTS=	egcs-current-19980608
 
-F2CMAJOR=	0
-F2CMINOR=	0
-MAKE_ENV+=	F2CMAJOR=${F2CMAJOR:Q} F2CMINOR=${F2CMINOR:Q}
-MAKE_ENV+=	LIBOWN=${LIBOWN:Q} LIBGRP=${LIBGRP:Q}
-MAKE_ENV+=	AWK=${AWK:Q}
-MAKE_ENV+=	ECHO=${ECHO:Q}
 WRKSRC=		${WRKDIR}/f2c
 USE_LIBTOOL=	yes
-USE_TOOLS+=	gunzip
+USE_TOOLS+=	unzip
+
+USE_BSD_MAKEFILE=	yes
+MAKE_FLAGS=	LIBF2CSRCDIR='$$(.CURDIR)/libf2c' MKLTARCHIVE=yes
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
+INSTALLATION_DIRS=	bin lib include share/doc/f2c ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
+INSTALL_MAKE_FLAGS=	BINDIR=$(PREFIX)/bin LIBDIR=$(PREFIX)/lib
 
-# work around a problem gunzipping 00lastchange.gz with
-# some versions of zlib found on NetBSD and also Gentoo
 post-extract:
 	@${RM} ${WRKSRC}/index.html
-	@for f in ${WRKSRC}/*.gz ; do \
-		if ${TEST} "$$f" = "${WRKSRC}/00lastchange.gz" ; then \
-			${ECHO} "Skipping $$f" ; \
-		else \
-			${GUNZIP_CMD} $$f ; \
-		fi ; \
-	done
-	@mv ${WRKSRC}/libf77 ${WRKSRC}/libf77.sh
-	@mv ${WRKSRC}/libi77 ${WRKSRC}/libi77.sh
-	@cd ${WRKSRC} ; ${SH} libf77.sh ; ${SH} libi77.sh
+	@cd ${WRKSRC}; ${RM} -f libf77 libi77		# subsumed by libf2c...
+	@cd ${WRKSRC}; unzip -d libf2c libf2c.zip
+	@cd ${WRKSRC}; ${MKDIR} libF77 libI77		# ...but we recreate them for compatibility
+	@${CP} ${FILESDIR:Q}/libf77.mk ${WRKSRC}/libF77/Makefile
+	@${CP} ${FILESDIR:Q}/libi77.mk ${WRKSRC}/libI77/Makefile
+	@${CP} ${FILESDIR:Q}/f2c.mk ${WRKSRC}/src/Makefile
+	@${CP} ${FILESDIR:Q}/libtool.mk ${WRKSRC}/libtool.mk
+	@${CP} ${FILESDIR:Q}/main.mk ${WRKSRC}/Makefile
+	@${CP} ${FILESDIR:Q}/f2c-f77.in ${WRKSRC}/src
+	@${CP} ${FILESDIR:Q}/chktypes.c ${WRKSRC}
 	@${RM} ${WRKSRC}/src/index.html
 	@mv ${WRKSRC}/src/.depend  ${WRKSRC}/src/depend.orig
-	@${GUNZIP_CMD} ${WRKSRC}/src/*.gz
+	@mv ${WRKSRC}/src/f2c.1 ${WRKSRC}/src/f2c.1.orig
 
 do-configure:
 	@cd ${WRKSRC} && ${CC} -o chktypes chktypes.c
 	${WRKSRC}/chktypes -v
-	@${CP} -f ${WRKSRC}/libF77/signal1.h0 ${WRKSRC}/libF77/signal1.h
-	@${CP} -f ${WRKSRC}/f2c.h ${WRKSRC}/libF77/f2c.h
-	@${CP} -f ${WRKSRC}/f2c.h ${WRKSRC}/libI77/f2c.h
 
 # Handle f2c-f77 script:
 post-build:
@@ -75,6 +64,11 @@ post-build:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/f2c-f77 ${DESTDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/f2c.1t ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/f2c.1
+	${INSTALL_DATA} ${WRKSRC}/f2c.1  ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/f2c.0
+.for f in changes f2c.ps f2c.pdf
+	${INSTALL_DATA} ${WRKSRC}/$f ${DESTDIR}${PREFIX}/share/doc/f2c/$f
+.endfor
 
 .include "../../mk/bsd.prefs.mk"
 MAKE_ENV+=	MACHINE_ARCH=${MACHINE_ARCH:Q}
diff --git a/lang/f2c/distinfo b/lang/f2c/distinfo
index aae5a6ce586..b0b74468f0c 100644
--- a/lang/f2c/distinfo
+++ b/lang/f2c/distinfo
@@ -1,14 +1,6 @@
-$NetBSD: distinfo,v 1.20 2009/10/31 19:15:44 asau Exp $
+$NetBSD: distinfo,v 1.21 2009/11/22 12:52:53 asau Exp $
 
-SHA1 (f2c-20001205.tar.gz) = f3cc1653eb962fee45d850df50890fc53448a17f
-RMD160 (f2c-20001205.tar.gz) = b376105c33ca53df46cab458082b26dbc9a53762
-Size (f2c-20001205.tar.gz) = 988607 bytes
-SHA1 (patch-aa) = 075f40a648a25ed42625a1868a9baa3f93411009
-SHA1 (patch-ab) = 97c676fa452daa674e11348412ccb26d38a7baa4
+SHA1 (f2c-20090411.tar.gz) = 949e832b84aaa912a99471a95c6fd449898d50e0
+RMD160 (f2c-20090411.tar.gz) = e86ff3de4564267a57f508a5a68e81af2b1a9468
+Size (f2c-20090411.tar.gz) = 1045385 bytes
 SHA1 (patch-ad) = 7f204a45891e3632589ea8fb0e4e379a0a792dea
-SHA1 (patch-ae) = f17254cab1449273ca44e652ed2f1a586a9a3e19
-SHA1 (patch-af) = fe24139c21862e85c576118166b7deab8e421572
-SHA1 (patch-ag) = 08d145e598ea5d376cee34ec42c7a98cae80668d
-SHA1 (patch-ai) = d8c1f731c18394e0953b6128d0bd597986ab910f
-SHA1 (patch-aj) = c58361fbbfc06e033b2a47e1d1e370716c4b185c
-SHA1 (patch-ak) = 5d95d88cb7118ee7b1047db24880cbd49a782807
diff --git a/lang/f2c/files/chktypes.c b/lang/f2c/files/chktypes.c
new file mode 100644
index 00000000000..a4bdf3ce8e8
--- /dev/null
+++ b/lang/f2c/files/chktypes.c
@@ -0,0 +1,118 @@
+/* $NetBSD: chktypes.c,v 1.1 2009/11/22 12:52:54 asau 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.
+*/
+
+#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/files/f2c.mk b/lang/f2c/files/f2c.mk
new file mode 100644
index 00000000000..fc8a82521c3
--- /dev/null
+++ b/lang/f2c/files/f2c.mk
@@ -0,0 +1,60 @@
+# Makefile for f2c, a Fortran 77 to C converter
+
+PROG=	f2c
+MAN=	f2c.1
+SRCS=	main.c init.c gram.y lex.c proc.c equiv.c data.c format.c \
+	expr.c exec.c intr.c io.c misc.c error.c mem.c names.c \
+	output.c p1output.c pread.c put.c putpcc.c vax.c formatdata.c \
+	parse_args.c niceprintf.c cds.c sysdep.c version.c $(MALLOC)
+
+F2CSRCDIR=	$(.CURDIR)/../distrib/src
+.PATH:	$(F2CSRCDIR)
+
+# To use the malloc whose source accompanies the f2c source,
+# add malloc.c to the right-hand side of the "MALLOC =" line,
+# so it becomes
+#	MALLOC = malloc.c
+# This gives faster execution on some systems, but some other
+# systems do not tolerate replacement of the system's malloc.
+MALLOC=		# empty
+
+# In case yacc is broken, a correctly functioning gram.c is distributed
+# (derived with a Unix variant of the yacc from plan9).
+
+# There should be 4 shift/reduce conflicts:
+gram.y:	gram.head gram.dcl gram.expr gram.exec gram.io tokdefs.h
+	( sed "s/#define/%token/" < $(.ALLSRC:M*tokdefs.h) ; \
+		cat $(.ALLSRC:M*gram.head) \
+		    $(.ALLSRC:M*gram.dcl) \
+		    $(.ALLSRC:M*gram.expr) \
+		    $(.ALLSRC:M*gram.exec) \
+		    $(.ALLSRC:M*gram.io) ) > $@
+CLEANFILES+=	gram.y
+
+DPADD=	defs.h ftypes.h defines.h machdefs.h sysdep.h
+
+CPPFLAGS=	-I.		# generated files
+CPPFLAGS+=	-I$(F2CSRCDIR)	# grammar
+
+# tokdefs.h: tokens
+# 	grep -n . <tokens | sed "s/\([^:]*\):\(.*\)/#define \2 \1/" >tokdefs.h
+
+DPSRCS+=	sysdep.hd
+
+sysdep.hd:
+	echo '/*OK*/' > $@	# stub
+# sysdep.hd:
+# 	if $(CC) sysdeptest.c; then echo '/*OK*/' > sysdep.hd;\
+# 	elif $(CC) -DNO_MKDTEMP sysdeptest.c; then echo '#define NO_MKDTEMP' >sysdep.hd;\
+# 	else echo '#define NO_MKDTEMP' >sysdep.hd; echo '#define NO_MKSTEMP' >>sysdep.hd; fi
+# 	rm -f a.out
+
+CLEANFILES+=	sysdep.hd # sysdep.hd tokdefs.h f2c.t
+
+.NOPATH:	f2c.1
+f2c.1: f2c.1t
+	sed -e 's!/usr!${PREFIX}!g' -e 's!lib/libc.a!usr/lib/libc.a!g' $> > $@
+
+CLEANFILES+=	f2c.1
+
+.include "bsd.prog.mk"
diff --git a/lang/f2c/files/libf77.mk b/lang/f2c/files/libf77.mk
new file mode 100644
index 00000000000..7065167e32d
--- /dev/null
+++ b/lang/f2c/files/libf77.mk
@@ -0,0 +1,53 @@
+LIB=	F77
+SHLIB_MAJOR=	0
+SHLIB_MINOR=	0
+
+.include "bsd.init.mk"
+.PATH:	$(LIBF2CSRCDIR)
+
+SRCS=	$(MISC) $(POW) $(CX) $(DCX) $(REAL) $(DBL) $(INT) \
+	$(HALF) $(CMP) $(EFL) $(CHAR) $(F90BIT) $(TIME)
+DPSRCS=		f2c.h signal1.h
+
+CPPFLAGS=	-I.	# for generated include files
+CPPFLAGS+=	-DSkip_f2c_Undefs
+
+MISC =	f77_aloc.c f77vers.c main.c s_rnge.c abort_.c getarg_.c iargc_.c \
+	getenv_.c signal_.c s_stop.c s_paus.c system_.c cabs.c \
+	derf_.c derfc_.c erf_.c erfc_.c sig_die.c exit_.c
+POW =	pow_ci.c pow_dd.c pow_di.c pow_hh.c pow_ii.c  pow_ri.c pow_zi.c pow_zz.c
+CX =	c_abs.c c_cos.c c_div.c c_exp.c c_log.c c_sin.c c_sqrt.c
+DCX =	z_abs.c z_cos.c z_div.c z_exp.c z_log.c z_sin.c z_sqrt.c
+REAL =	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
+DBL =	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
+INT =	i_abs.c i_dim.c i_dnnt.c i_indx.c i_len.c i_mod.c i_nint.c i_sign.c
+HALF =	h_abs.c h_dim.c h_dnnt.c h_indx.c h_len.c h_mod.c  h_nint.c h_sign.c
+CMP =	l_ge.c l_gt.c l_le.c l_lt.c hl_ge.c hl_gt.c hl_le.c hl_lt.c
+EFL =	ef1asc_.c ef1cmc_.c
+CHAR =	s_cat.c s_cmp.c s_copy.c
+F90BIT = lbitbits.c lbitshft.c
+QINT =	pow_qq.c qbitbits.c qbitshft.c
+TIME =	dtime_.c etime_.c
+
+
+f2c.h:	f2c.h0;		cp $> $@
+signal1.h: signal1.h0;	cp $> $@
+
+CLEANFILES=	$(DPSRCS)
+
+INCS=	f2c.h
+install:	incinstall
+
+.if defined(MKLTARCHIVE) && !empty(MKLTARCHIVE:M[Yy][Ee][Ss])
+.include "../libtool.mk"
+.include "bsd.inc.mk"
+.else
+.include "bsd.lib.mk"
+.endif
diff --git a/lang/f2c/files/libi77.mk b/lang/f2c/files/libi77.mk
new file mode 100644
index 00000000000..2888890a265
--- /dev/null
+++ b/lang/f2c/files/libi77.mk
@@ -0,0 +1,34 @@
+LIB=	I77
+SHLIB_MAJOR=	0
+SHLIB_MINOR=	0
+
+.include "bsd.init.mk"
+.PATH:	$(LIBF2CSRCDIR)
+
+SRCS =	backspac.c close.c dfe.c dolio.c due.c endfile.c err.c \
+	fmt.c fmtlib.c ftell_.c iio.c ilnw.c inquire.c lread.c lwrite.c \
+	open.c 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
+SRCS+=	i77vers.c	# previously known as "Version.c"
+# Previously there was "backspace.c" instead of "backspac.c".
+
+DPSRCS=		f2c.h sysdep1.h
+
+CPPFLAGS=	-I.	# for generated include files
+
+f2c.h:	f2c.h0;		cp $> $@
+sysdep1.h: sysdep1.h0;	cp $> $@
+
+CLEANFILES=	$(DPSRCS)
+
+CPPFLAGS+=	-DNO_My_ctype
+CPPFLAGS+=	-DSkip_f2c_Undefs
+
+i77vers.lo: i77vers.c
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $(.ALLSRC:M*.c)
+
+.if defined(MKLTARCHIVE) && !empty(MKLTARCHIVE:M[Yy][Ee][Ss])
+.include "../libtool.mk"
+.else
+.include "bsd.lib.mk"
+.endif
diff --git a/lang/f2c/files/libtool.mk b/lang/f2c/files/libtool.mk
new file mode 100644
index 00000000000..8b3177bb22f
--- /dev/null
+++ b/lang/f2c/files/libtool.mk
@@ -0,0 +1,28 @@
+# building library using libtool, simplified
+
+.include <bsd.init.mk>
+
+OBJS+=		$(SRCS:.c=.o)
+LTOBJS+=	$(SRCS:.c=.lo)
+
+.SUFFIXES:	.c .lo
+.c.lo:
+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+lib$(LIB).la:	$(LTOBJS)
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(LTOBJS) $(LDFLAGS) -rpath $(LIBDIR) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR)
+
+$(LTOBJS):	$(DPSRCS)
+
+all:		lib$(LIB).la
+
+install:	lib$(LIB).la
+	$(LIBTOOL) --mode=install $(INSTALL_FILE) -o $(LIBOWN) -g $(LIBGRP) -m $(LIBMODE) \
+		lib$(LIB).la $(DESTDIR)$(LIBDIR)
+
+clean cleandir:
+	rm -f $(CLEANFILES)
+	rm -f lib$(LIB).la $(LTOBJS) $(OBJS)
+	rm -rf .libs
+
+LIBTOOL?=	libtool
+LIBDIR?=	/usr/local/lib	# required
diff --git a/lang/f2c/files/main.mk b/lang/f2c/files/main.mk
new file mode 100644
index 00000000000..fb476b0563e
--- /dev/null
+++ b/lang/f2c/files/main.mk
@@ -0,0 +1,3 @@
+SUBDIR=	libF77 libI77 src
+
+.include <bsd.subdir.mk>
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,