Update to version 3.1.2.

Changes made from patch level 1 to patch level 2:

1. Fixed bug in -makedcls option that allowed a buffer overflow when
   module names exceed 20 characters.

2. Minor changes to source code to clean it up and make it compatible
   with C++.

3. Fixed bug that caused crash when number of statement labels in a
   subprogram exceeded 2000.

4. Fixed bug that could cause access violation on some systems, if
   program contains variable names starting with AA or AB.

5. Fixed bug in handling a labeled END DO statement that matches a
   DO statement that doesn't use a label.

6. Changed license from "BSD"-like to "MIT."

4 files changed, 83 insertions, 22 deletions

diff --git a/devel/ftnchek/Makefile b/devel/ftnchek/Makefile
index efea056fae2..8947b451dea 100644
--- a/devel/ftnchek/Makefile
+++ b/devel/ftnchek/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2001/06/17 14:27:27 jtb Exp $
+# $NetBSD: Makefile,v 1.8 2002/05/03 22:47:15 jtb Exp $
 
-DISTNAME=	ftnchek-3.1.1
+DISTNAME=	ftnchek-3.1.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=devel/lang/fortran/}
 
diff --git a/devel/ftnchek/distinfo b/devel/ftnchek/distinfo
index fab3ae3588c..d679a47abdb 100644
--- a/devel/ftnchek/distinfo
+++ b/devel/ftnchek/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/06/17 14:27:27 jtb Exp $
+$NetBSD: distinfo,v 1.5 2002/05/03 22:47:15 jtb Exp $
 
-SHA1 (ftnchek-3.1.1.tar.gz) = 0a334e6152e8220628b4d439903c54916215f9f7
-Size (ftnchek-3.1.1.tar.gz) = 886004 bytes
-SHA1 (patch-aa) = 2548f10786c1e6ea3412d8b0b01da67bd5d16504
-SHA1 (patch-ab) = 428d0f981e593f520aad738ce0a76dcbec23e7c4
+SHA1 (ftnchek-3.1.2.tar.gz) = b9744dace4c88e713ce7e3c11afcf46aa9885fe7
+Size (ftnchek-3.1.2.tar.gz) = 901656 bytes
+SHA1 (patch-aa) = 087278e131418a87bedc0330b3c5cae094854094
+SHA1 (patch-ab) = 443cff97fb33b68f552911c009a328b359e23315
diff --git a/devel/ftnchek/patches/patch-aa b/devel/ftnchek/patches/patch-aa
index 182a8c571a9..aff9a77c533 100644
--- a/devel/ftnchek/patches/patch-aa
+++ b/devel/ftnchek/patches/patch-aa
@@ -1,16 +1,41 @@
-$NetBSD: patch-aa,v 1.3 2001/06/17 14:27:28 jtb Exp $
-
---- configure.orig	Sun Jun 17 03:12:36 2001
-+++ configure
-@@ -2569,6 +2569,7 @@
-     else
+--- configure.orig	Tue Nov 13 02:32:40 2001
++++ configure	Mon Apr 29 11:09:02 2002
+@@ -2731,6 +2731,7 @@
+     if test -n "$GCC"; then
        OPT="-O2";
      fi;;
 +  netbsd*) ;;
    next*)
      OPT="-O2";;
  
-@@ -2635,7 +2636,7 @@
+@@ -2762,26 +2763,6 @@
+     OPT="-O";;
+ esac
+ 
+-if test -n "$GCC"; then
+-  case "$host_cpu" in
+-  i386*)
+-    OPT="$OPT -march=i386"
+-    ;;
+-  i486*)
+-    OPT="$OPT -march=i486"
+-    ;;
+-  i586*)
+-    OPT="$OPT -march=i586"
+-    ;;
+-  i686*)
+-    OPT="$OPT -march=i686"
+-    ;;
+-  k6*)
+-    OPT="$OPT -march=k6"
+-    ;;
+-  esac
+-fi
+-
+ echo $ac_n "checking whether $CC accepts function prototypes""... $ac_c" 1>&6
+ echo "configure:2787: checking whether $CC accepts function prototypes" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC_protos'+set}'`\" = set"; then
+@@ -2817,7 +2798,7 @@
  fi
  
  
diff --git a/devel/ftnchek/patches/patch-ab b/devel/ftnchek/patches/patch-ab
index 5049c423379..2ea62950495 100644
--- a/devel/ftnchek/patches/patch-ab
+++ b/devel/ftnchek/patches/patch-ab
@@ -1,8 +1,45 @@
-$NetBSD: patch-ab,v 1.1 2001/06/17 14:27:28 jtb Exp $
-
---- Makefile.in.orig	Sun Jun 17 03:22:17 2001
-+++ Makefile.in
-@@ -487,18 +487,9 @@
+--- Makefile.in.orig	Sat Nov  3 00:49:25 2001
++++ Makefile.in	Mon Apr 29 11:14:13 2002
+@@ -436,30 +436,19 @@
+ install:	install-exe @INSTALL_MAN@ install-lisp
+ 
+ install-exe:	ftnchek$(EXE) dcl2inc$(CMD)
+-	-$(MKDIR) -p $(bindir)
+-	$(CP) ftnchek$(EXE) $(bindir)
+-	-$(STRIP) $(bindir)/ftnchek$(EXE)
+-	$(CHMOD) 755 $(bindir)/ftnchek$(EXE)
+-	-$(MKDIR) -p $(libdir)
+-	$(CP) dcl2inc.awk $(libdir)/dcl2inc.awk
+-	$(CHMOD) 644 $(libdir)/dcl2inc.awk
+-	$(CP) dcl2inc$(CMD) $(bindir)/dcl2inc$(CMD)
+-	$(CHMOD) 755 $(bindir)/dcl2inc$(CMD)
+-	-$(RM) $(bindir)/fcl2vcg
++	$(BSD_INSTALL_PROGRAM_DIR) $(bindir)
++	$(BSD_INSTALL_PROGRAM) ftnchek$(EXE) $(bindir)
++	$(BSD_INSTALL_DATA_DIR) $(libdir)
++	$(BSD_INSTALL_DATA) dcl2inc.awk $(libdir)
++	$(BSD_INSTALL_SCRIPT) dcl2inc$(CMD) $(bindir)
+ 
+ # Install man pages, taking care to remove old formatted ones, because
+ # many man implentations fail to compare time stamps of raw and
+ # formatted files, and will show out-of-date formatted files.
+ install-man: ftnchek$(manext)
+-	-$(MKDIR) -p $(mandir)
+-	$(CP) dcl2inc.man $(mandir)/man1/dcl2inc$(manext)
+-	-$(RM) $(mandir)/cat1/dcl2inc$(manext)
+-	$(CHMOD) 644 $(mandir)/man1/dcl2inc$(manext)
+-	$(CP) ftnchek$(manext) $(mandir)/man1/ftnchek$(manext)
+-	-$(RM) $(mandir)/cat1/ftnchek$(manext)
+-	$(CHMOD) 644 $(mandir)/man1/ftnchek$(manext)
+-	-$(RM) $(mandir)/man1/fcl2vcg$(manext)
+-	-$(RM) $(mandir)/cat1/fcl2vcg$(manext)
++	$(BSD_INSTALL_MAN_DIR) $(mandir)
++	$(BSD_INSTALL_MAN) dcl2inc.man $(mandir)/man1/dcl2inc$(manext)
++	$(BSD_INSTALL_MAN) ftnchek$(manext) $(mandir)/man1/ftnchek$(manext)
+ 
+ # IRIX uses pre-formatted, packed man pages and nroff is not bundled with it.
+ install-man-sgi: catman
+@@ -502,18 +491,8 @@
  #  The emacs lisp file will be installed only if lispdir exists, since
  #  if it doesn't exist, this machine probably doesn't have emacs.
  install-lisp:
@@ -18,9 +55,8 @@ $NetBSD: patch-ab,v 1.1 2001/06/17 14:27:28 jtb Exp $
 -	  echo "If you want to install ftnchek.el, create $(lispdir)" ; \
 -	  echo "or re-run make install with 'lispdir=path-to-site-lisp'" ; \
 -	fi
-+	-$(MKDIR) -p $(lispdir)
-+	$(CP) ftnchek.el $(lispdir)/ftnchek.el
-+	@echo "If desired, use emacs to byte-compile $(lispdir)/ftnchek.el"
++	$(BSD_INSTALL_DATA_DIR) $(lispdir)
++	$(BSD_INSTALL_DATA) ftnchek.el $(lispdir)
  
  # Remove everything that the install target installed.
  uninstall: