Update of ftnchek to 3.1.1

Some new features in version 3.1:

  1. Block structure of the program is now kept track of, and proper
     nesting of blocks is checked.

  2. New check for modification of a DO index-variable within the
     range of the loop.

  3. New option -style to allow extra-picky warnings about obsolescent
     or old-fashioned programming constructions.

  4. Limited support for attribute-based type declarations (using ::).
     See the manual for limitations on the accepted syntax.  Note that
     this new feature should be seen as a first step toward full
     support for Fortran 90 type declarations, but it is not there
     yet.  The level of support may be sufficient for novice
     programmers, but it is not yet ready for serious use.

  5. Some implementation changes were made for faster execution. The
     improvement in speed is greatest for small and medium-sized
     programs, which are now processed about 2 times faster.


Bugs fixed in patch 1:

    1. Erroneously reported "Block not closed when END statement
       encountered" at end of an unnamed block data subprogram.

    2. Under -pretty=embedded-space, warned of embedded space between
       slashes in
         COMMON /   / X, Y, Z

5 files changed, 62 insertions, 46 deletions

diff --git a/devel/ftnchek/Makefile b/devel/ftnchek/Makefile
index de77609352d..efea056fae2 100644
--- a/devel/ftnchek/Makefile
+++ b/devel/ftnchek/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2001/04/25 23:24:45 jtb Exp $
+# $NetBSD: Makefile,v 1.7 2001/06/17 14:27:27 jtb Exp $
 
-DISTNAME=	ftnchek-3.0.4
+DISTNAME=	ftnchek-3.1.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=devel/lang/fortran/}
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.dsm.fordham.edu/~ftnchek
+HOMEPAGE=	http://www.dsm.fordham.edu/~ftnchek/
 COMMENT=	Static analyzer for Fortran programs
 
 GNU_CONFIGURE=	yes
diff --git a/devel/ftnchek/distinfo b/devel/ftnchek/distinfo
index d58fb017aea..fab3ae3588c 100644
--- a/devel/ftnchek/distinfo
+++ b/devel/ftnchek/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/04/25 23:24:45 jtb Exp $
+$NetBSD: distinfo,v 1.4 2001/06/17 14:27:27 jtb Exp $
 
-SHA1 (ftnchek-3.0.4.tar.gz) = 30fbed8860ececf00c6860c3ab39a50921a0b8eb
-Size (ftnchek-3.0.4.tar.gz) = 839084 bytes
-SHA1 (patch-aa) = c0594e830575602b70e26385c3b3eba3e99577df
+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
diff --git a/devel/ftnchek/patches/patch-aa b/devel/ftnchek/patches/patch-aa
index 493e4126930..182a8c571a9 100644
--- a/devel/ftnchek/patches/patch-aa
+++ b/devel/ftnchek/patches/patch-aa
@@ -1,29 +1,21 @@
-$NetBSD: patch-aa,v 1.2 2001/03/15 23:48:23 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2001/06/17 14:27:28 jtb Exp $
 
---- configure.orig	Mon Mar  5 18:56:11 2001
+--- configure.orig	Sun Jun 17 03:12:36 2001
 +++ configure
-@@ -2510,6 +2510,8 @@
+@@ -2569,6 +2569,7 @@
      else
-       OS_FLAGS="-O2";
+       OPT="-O2";
      fi;;
-+  netbsd*)
-+    ;;
++  netbsd*) ;;
    next*)
-     OS_FLAGS="-O2";;
+     OPT="-O2";;
  
-@@ -2574,13 +2576,13 @@
+@@ -2635,7 +2636,7 @@
  fi
  
  
--CFLAGS="-DUNIX $OS_FLAGS $PROTOFLAG \$(OPTIONS)"
-+CFLAGS="$CFLAGS -DUNIX $OS_FLAGS $PROTOFLAG \$(OPTIONS)"
+-CFLAGS="-DUNIX \$(OPT) $OS_FLAGS $PROTOFLAG \$(OPTIONS)"
++CFLAGS="$CFLAGS -DUNIX \$(OPT) $OS_FLAGS $PROTOFLAG \$(OPTIONS)"
  echo "$ac_t""Compile command is $CC $CFLAGS" 1>&6
- if test $GCC; then
- echo "$ac_t""If you prefer using cc, setenv CC cc; rm config.cache and re-run" 1>&6
- fi
- 
--LDFLAGS=
-+
- 
- 
- EXE=
+ echo "$ac_t""\$(OPT) is $OPT" 1>&6
+ echo "$ac_t""\$(OPTIONS) is for optional defines, normally blank" 1>&6
diff --git a/devel/ftnchek/patches/patch-ab b/devel/ftnchek/patches/patch-ab
new file mode 100644
index 00000000000..5049c423379
--- /dev/null
+++ b/devel/ftnchek/patches/patch-ab
@@ -0,0 +1,26 @@
+$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 @@
+ #  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:
+-	@if test -d "$(lispdir)" ; \
+-	then \
+-	  echo $(CP) ftnchek.el $(lispdir)/ftnchek.el ; \
+-	  if $(CP) ftnchek.el $(lispdir)/ftnchek.el ; \
+-	  then \
+-	     echo "If desired, use emacs to byte-compile $(lispdir)/ftnchek.el"; \
+-	  fi \
+-	else \
+-	  echo "$(lispdir) does not exist -- ftnchek.el not installed." ; \
+-	  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"
+ 
+ # Remove everything that the install target installed.
+ uninstall:
diff --git a/devel/ftnchek/pkg/PLIST b/devel/ftnchek/pkg/PLIST
index d1a9bb222f4..e55f050f54e 100644
--- a/devel/ftnchek/pkg/PLIST
+++ b/devel/ftnchek/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/12/08 21:00:57 jtb Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/06/17 14:27:28 jtb Exp $
 bin/dcl2inc
 bin/ftnchek
 libexec/ftnchek/dcl2inc.awk
@@ -30,6 +30,19 @@ share/doc/ftnchek/html/identifier-chars.html
 share/doc/ftnchek/html/include.html
 share/doc/ftnchek/html/index.html
 share/doc/ftnchek/html/intrinsic.html
+share/doc/ftnchek/html/lbAD.html
+share/doc/ftnchek/html/lbAE.html
+share/doc/ftnchek/html/lbAF.html
+share/doc/ftnchek/html/lbAG.html
+share/doc/ftnchek/html/lbAH.html
+share/doc/ftnchek/html/lbAI.html
+share/doc/ftnchek/html/lbAJ.html
+share/doc/ftnchek/html/lbAK.html
+share/doc/ftnchek/html/lbAL.html
+share/doc/ftnchek/html/lbAM.html
+share/doc/ftnchek/html/lbAN.html
+share/doc/ftnchek/html/lbAO.html
+share/doc/ftnchek/html/lbAP.html
 share/doc/ftnchek/html/library.html
 share/doc/ftnchek/html/list.html
 share/doc/ftnchek/html/makedcls.html
@@ -43,24 +56,10 @@ share/doc/ftnchek/html/pure.html
 share/doc/ftnchek/html/quiet.html
 share/doc/ftnchek/html/reference.html
 share/doc/ftnchek/html/resources.html
-share/doc/ftnchek/html/sect0.html
-share/doc/ftnchek/html/sect1.html
-share/doc/ftnchek/html/sect10.html
-share/doc/ftnchek/html/sect11.html
-share/doc/ftnchek/html/sect12.html
-share/doc/ftnchek/html/sect13.html
-share/doc/ftnchek/html/sect14.html
-share/doc/ftnchek/html/sect2.html
-share/doc/ftnchek/html/sect3.html
-share/doc/ftnchek/html/sect4.html
-share/doc/ftnchek/html/sect5.html
-share/doc/ftnchek/html/sect6.html
-share/doc/ftnchek/html/sect7.html
-share/doc/ftnchek/html/sect8.html
-share/doc/ftnchek/html/sect9.html
 share/doc/ftnchek/html/sixchar.html
 share/doc/ftnchek/html/sort.html
 share/doc/ftnchek/html/source.html
+share/doc/ftnchek/html/style.html
 share/doc/ftnchek/html/symtab.html
 share/doc/ftnchek/html/toc.html
 share/doc/ftnchek/html/truncation.html
@@ -72,9 +71,7 @@ share/doc/ftnchek/html/wordsize.html
 share/doc/ftnchek/html/wrap.html
 share/doc/ftnchek/macro-doc.txt
 share/emacs/site-lisp/ftnchek.el
-@dirrm libexec/ftnchek
+@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
 @dirrm share/doc/ftnchek/html
 @dirrm share/doc/ftnchek
-@unexec rmdir %D/share/emacs/site-lisp 2>/dev/null || true
-@unexec rmdir %D/share/emacs 2>/dev/null || true
-@unexec rmdir %D/share 2>/dev/null || true
+@dirrm libexec/ftnchek