Update to version 3.2.2.

Here are the new features in version 3.2:

   1.  New option -mkhtml to generate HTML documentation files from
       the source code.  Thanks go to Mark McVeigh for contributing
       this feature.

   2.  I/O unit usage information is now provided under the -symtab
       option.  A table is printed listing each I/O unit by name
       and/or number, together with the opera- tions performed on it.

   3.  A single large project file, created by concatenating a number
       of separately produced project files, can be input for use as a
       library project file.

   4.  Combined type declarations and data-statement-like
       initializers, as in INTEGER N / 100 / are accepted.

   5.  Fixed a bug that caused ftnchek to crash if a parameter is
       declared with the same name as the subprogram containing it.
       New error message for same.

   6.  Fixed a bug in checking type agreement between variables and
       their initial values in Fortran 90-style declarations with
       initializers, as in INTEGER :: N=100.

   7.  New error message when an internal file is a constant rather
       than a variable.  Some compilers permit this for READ
       operations, but it is prohibited by the F90 Standard.

5 files changed, 36 insertions, 54 deletions

diff --git a/devel/ftnchek/Makefile b/devel/ftnchek/Makefile
index c623209c769..d0153d172a2 100644
--- a/devel/ftnchek/Makefile
+++ b/devel/ftnchek/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2003/06/02 01:20:50 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/06/29 22:24:32 jtb Exp $
 
-DISTNAME=	ftnchek-3.1.2
+DISTNAME=	ftnchek-3.2.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=devel/lang/fortran/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@netbsd.org
 HOMEPAGE=	http://www.dsm.fordham.edu/~ftnchek/
@@ -10,6 +11,7 @@ COMMENT=	Static analyzer for Fortran programs
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--libdir=${PREFIX}/libexec
+CONFIGURE_ARGS+=--disable-submodel
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp
diff --git a/devel/ftnchek/PLIST b/devel/ftnchek/PLIST
index e291759fb2d..2d1f7b83558 100644
--- a/devel/ftnchek/PLIST
+++ b/devel/ftnchek/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:18 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/06/29 22:24:33 jtb Exp $
 bin/dcl2inc
 bin/ftnchek
 libexec/ftnchek/dcl2inc.awk
@@ -46,6 +46,7 @@ share/doc/ftnchek/html/lbAP.html
 share/doc/ftnchek/html/library.html
 share/doc/ftnchek/html/list.html
 share/doc/ftnchek/html/makedcls.html
+share/doc/ftnchek/html/mkhtml.html
 share/doc/ftnchek/html/novice.html
 share/doc/ftnchek/html/output.html
 share/doc/ftnchek/html/pointersize.html
diff --git a/devel/ftnchek/distinfo b/devel/ftnchek/distinfo
index d679a47abdb..0f49c558577 100644
--- a/devel/ftnchek/distinfo
+++ b/devel/ftnchek/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/05/03 22:47:15 jtb Exp $
+$NetBSD: distinfo,v 1.6 2003/06/29 22:24:33 jtb Exp $
 
-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
+SHA1 (ftnchek-3.2.2.tar.bz2) = af1ed68d8270d464bf52cd5c415bada22d50ed21
+Size (ftnchek-3.2.2.tar.bz2) = 745015 bytes
+SHA1 (patch-aa) = 585621cbeb2a240cd44d35ebc04904db656f31b3
+SHA1 (patch-ab) = 83af96a60c977fa25a1e423ae17cc61e56be3d84
diff --git a/devel/ftnchek/patches/patch-aa b/devel/ftnchek/patches/patch-aa
index 0f9d18b8606..17ace45a915 100644
--- a/devel/ftnchek/patches/patch-aa
+++ b/devel/ftnchek/patches/patch-aa
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2002/05/20 17:41:05 cjep Exp $
---- configure.orig	Tue Nov 13 02:32:40 2001
-+++ configure	Mon Apr 29 11:09:02 2002
-@@ -2731,6 +2731,7 @@
+$NetBSD: patch-aa,v 1.6 2003/06/29 22:24:33 jtb Exp $
+
+--- configure.orig
++++ configure
+@@ -5816,6 +5806,7 @@
      if test -n "$GCC"; then
        OPT="-O2";
      fi;;
@@ -9,39 +10,12 @@ $NetBSD: patch-aa,v 1.5 2002/05/20 17:41:05 cjep Exp $
    next*)
      OPT="-O2";;
  
-@@ -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 @@
+@@ -5931,7 +5922,7 @@
  fi
  
  
 -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
- echo "$ac_t""\$(OPT) is $OPT" 1>&6
- echo "$ac_t""\$(OPTIONS) is for optional defines, normally blank" 1>&6
+ echo "$as_me:$LINENO: result: Compile command is $CC $CFLAGS" >&5
+ echo "${ECHO_T}Compile command is $CC $CFLAGS" >&6
+ echo "$as_me:$LINENO: result: \$(OPT) is $OPT" >&5
diff --git a/devel/ftnchek/patches/patch-ab b/devel/ftnchek/patches/patch-ab
index 4ead5a8cb46..fa55f366649 100644
--- a/devel/ftnchek/patches/patch-ab
+++ b/devel/ftnchek/patches/patch-ab
@@ -1,10 +1,12 @@
-$NetBSD: patch-ab,v 1.3 2002/05/20 17:41:05 cjep Exp $
---- Makefile.in.orig	Sat Nov  3 00:49:25 2001
-+++ Makefile.in	Mon Apr 29 11:14:13 2002
-@@ -436,30 +436,19 @@
+$NetBSD: patch-ab,v 1.4 2003/06/29 22:24:33 jtb Exp $
+
+--- Makefile.in.orig
++++ Makefile.in
+@@ -461,31 +461,17 @@
  install:	install-exe @INSTALL_MAN@ install-lisp
  
  install-exe:	ftnchek$(EXE) dcl2inc$(CMD)
+-	-$(RM) $(bindir)/ftnchek$(EXE)
 -	-$(MKDIR) -p $(bindir)
 -	$(CP) ftnchek$(EXE) $(bindir)
 -	-$(STRIP) $(bindir)/ftnchek$(EXE)
@@ -15,7 +17,6 @@ $NetBSD: patch-ab,v 1.3 2002/05/20 17:41:05 cjep Exp $
 -	$(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)
@@ -25,7 +26,7 @@ $NetBSD: patch-ab,v 1.3 2002/05/20 17:41:05 cjep Exp $
  # 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)
+-	-$(MKDIR) -p $(mandir)/man1
 -	$(CP) dcl2inc.man $(mandir)/man1/dcl2inc$(manext)
 -	-$(RM) $(mandir)/cat1/dcl2inc$(manext)
 -	$(CHMOD) 644 $(mandir)/man1/dcl2inc$(manext)
@@ -34,22 +35,26 @@ $NetBSD: patch-ab,v 1.3 2002/05/20 17:41:05 cjep Exp $
 -	$(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.
+@@ -528,23 +514,8 @@
+ #  The emacs lisp file will be installed only if lispdir exists.  It will
+ #  be byte-compiled if emacs is present.
  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"; \
+-	     if test -x "$(EMACS)" ; \
+-	     then \
+-	       $(EMACS) -batch -f batch-byte-compile $(lispdir)/ftnchek.el ; \
+-	     else \
+-	       echo "If desired, use emacs to byte-compile $(lispdir)/ftnchek.el"; \
+-	     fi \
 -	  fi \
 -	else \
 -	  echo "$(lispdir) does not exist -- ftnchek.el not installed." ; \