upgrade to 3.21. ok'ed by tsarna@netbsd.org (maintainer).

--
Changes and new features introduced in Version 3.14 [released March 1999]

    Bug fixes
    "lout -PDF" now available as alternative to "lout -Z"
    Cross referencing list items yields just the raw item number now

Changes and new features introduced in Version 3.15 [May 1999]

    Bug fixes
    @FootNoteFormat option for controlling format of footnotes
    @TheoremFormat option for controlling format of theorems (etc.)
    @ListOuterGap setup file option for space before and after lists
    Standardized and improved "slides" package, incl. new setup file options
      (NB please send me @Word&&lecture and @Word&&overhead in your language)
    Faster database reading (uses more memory though); prevent with -M
    @DoubleLine symbol in diagrams for drawing a double line
    -l and -L flags for selecting collation order (see lout -u)

Changes and new features introduced in Version 3.16 [28 May 1999]

    Bug fixes
    Optimal paragraph breaking weights adjusted yet again (sigh)

Changes and new features introduced in Version 3.17 [13 September 1999]

    Bug fixes
    @AtEnd option for @Book and @Report (unnumbered back cover page)
    @Abbreviations symbol in books (like @Introduction but for abbreviations)
    @Euro symbol added for getting a European Currency symbol
    Document OBJECT struct declaration in externs.h (for gurus only)

Changes and new features introduced in Version 3.18 [26 February 2000]

    Bug fixes (more than usual, somehow)
    New @CurrYUnit and @CurrZUnit symbols (expert users)
    @Diag enhancement:  node types, similar to row types in @Tbl
    @Diag enhancement:  new features for drawing syntax diagrams
    Portuguese (thanks to Jose Roberto B. de A. Monteiro)
    Slight change to @Tbl spec (affects aligned columns)
    Replaced c2lout with prg2lout (computer program formatting)
    @Outline symbol for printing words in outline rather than filled
    A few extra @Eq symbols:  filledcircle, small, trieq

Changes and new features introduced in Version 3.19 [9 March 2000]

    Bug fixes
    Four @HeaderComponent symbols for running headers (expert users)
    Running headers in multi-page tables
    Running headers in indexes
    Two extra @Eq symbols:  triangleup, triangledown

Changes and new features introduced in Version 3.20 [8 April 2000]

    Bug fixes (including the internal error that was dumping core recently)
    Multi-line style changes (@I, @Colour etc.) now work in lines @Break mode
    @Perl symbol for Perl programming language formatting (includes Pod)

Changes and new features introduced in Version 3.21 [10 May 2000]

    Bug fixes (including an old problem of bits lost from programs in tables)
    Refinements to @Perl symbol for Perl programming language formatting
    Program texts can now be formatted with line numbers added
    -V now tells about PDF compression and whether debug output is available
    "Page body margins" for indenting of page body wrt headers and footers
    Margin notes code updated to work as desired with the new page body margins
    @PageEnclose symbol generalizes @PageBox (enclose each page in anything)
    Robustness wrt Linux strcoll() improved (tab characters no longer compared)
    "Abstract" word in tech reports now centred again by default
    Lout now builds composite characters - see Expert's Guide, under @Font

    *** IMPORTANT: ONE CHANGE THAT IS NOT UPWARDLY COMPATIBLE ***

    If you are using your own setup file, then it is likely to contain the
    line "@SysInclude { fontdefs }".  There is no longer a fontdefs file,
    there is now a fontdefs database, so you need to replace this line with
    "@SysDatabase @FontDef { fontdefs }".

5 files changed, 21 insertions, 39 deletions

diff --git a/textproc/lout/Makefile b/textproc/lout/Makefile
index 7b86caf8120..b98a9be9966 100644
--- a/textproc/lout/Makefile
+++ b/textproc/lout/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2000/02/05 07:00:59 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/16 02:13:23 itojun Exp $
 #
 
-DISTNAME=	lout-3.13
+DISTNAME=	lout-3.21
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.cs.usyd.edu.au/jeff/lout/
 
diff --git a/textproc/lout/files/md5 b/textproc/lout/files/md5
index 56e763a4fb9..22835668e8f 100644
--- a/textproc/lout/files/md5
+++ b/textproc/lout/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/04/15 17:43:39 tsarna Exp $
+$NetBSD: md5,v 1.3 2000/06/16 02:13:24 itojun Exp $
 
-MD5 (lout-3.13.tar.gz) = 9aed1178d8006a55097d0fa2b5782a22
+MD5 (lout-3.21.tar.gz) = 468f6dafb5a535b1fe63d36a9f31d5d5
diff --git a/textproc/lout/files/patch-sum b/textproc/lout/files/patch-sum
index 692fec55a1d..1c1318a0819 100644
--- a/textproc/lout/files/patch-sum
+++ b/textproc/lout/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.2 1999/09/28 13:16:59 simonb Exp $
+$NetBSD: patch-sum,v 1.3 2000/06/16 02:13:24 itojun Exp $
 
-MD5 (patch-aa) = 49bafd524553467260e1f3b8c0c75962
+MD5 (patch-aa) = 22dca56e7027affda3975ac5e3c41860
diff --git a/textproc/lout/patches/patch-aa b/textproc/lout/patches/patch-aa
index ab2bf383a4c..08634d17bf5 100644
--- a/textproc/lout/patches/patch-aa
+++ b/textproc/lout/patches/patch-aa
@@ -1,54 +1,36 @@
-$NetBSD: patch-aa,v 1.2 1999/09/28 13:15:03 simonb Exp $
+$NetBSD: patch-aa,v 1.3 2000/06/16 02:13:24 itojun Exp $
 
---- makefile.orig	Fri Feb  5 10:13:30 1999
-+++ makefile	Tue Sep 28 17:36:53 1999
-@@ -248,14 +248,14 @@
- DBFIX   = 0
- 
+--- makefile.orig	Wed May 10 19:32:45 2000
++++ makefile	Fri Jun 16 10:41:38 2000
+@@ -255,8 +255,8 @@
  USESTAT = 1
 -SAFEDFT = 0
 +SAFEDFT = 1
  
- COLLATE	= 1
- 
--BINDIR	= /usr/staff/jeff/bin
--LIBDIR	= /usr/staff/jeff/lout.lib
--DOCDIR	= /usr/staff/jeff/lout.doc
--MANDIR	= /usr/staff/jeff/lout.man
+-BINDIR	= /export/home/6monthspace/jeff/bin
+-LIBDIR	= /export/home/6monthspace/jeff/lout.lib
+-DOCDIR	= /export/home/6monthspace/jeff/lout.doc
+-MANDIR	= /export/home/6monthspace/jeff/lout.man
 +BINDIR	= @PREFIX@/bin
 +LIBDIR	= @PREFIX@/share/lout
 +DOCDIR	= @PREFIX@/share/doc/lout
 +MANDIR	= @PREFIX@/man/man1
  
- LIBFONT = font
- LIBMAPS = maps
-@@ -271,8 +271,8 @@
- LOC_FR	= fr
- LOC_DE	= de
+@@ -278,4 +278,4 @@
  
 -PDF_COMPRESSION	= 0
 -ZLIB		=
 +PDF_COMPRESSION	= 1
 +ZLIB		= -lz
  ZLIBPATH	=
- 
- CC	= gcc
-@@ -299,7 +299,7 @@
- 	  -DCHAR_OUT=$(CHAROUT)					\
- 	  -DLOCALE_ON=$(USELOC)					\
+@@ -307,3 +307,3 @@
  	  -DASSERT_ON=1 $(COPTS)				\
 -	  -DDEBUG_ON=1  -g					\
 +	  -DDEBUG_ON=1  -g -O2					\
  	  -DPDF_COMPRESSION=$(PDF_COMPRESSION)			\
- 	  $(ZLIBPATH)
- 
-@@ -309,6 +309,9 @@
- 	  z25.o z26.o z27.o z28.o z29.o z30.o z31.o z32.o	\
- 	  z33.o z34.o z35.o z36.o z37.o z38.o z39.o z40.o	\
+@@ -317,2 +317,5 @@
  	  z41.o z42.o z43.o z44.o z45.o z46.o z47.o z48.o
 +
-+all: lout c2lout
++all: lout prg2lout
 +allinstall: install installman installdoc
  
- lout:	$(OBJS)
- 	$(CC) -o lout $(OBJS) $(ZLIB) -lm
diff --git a/textproc/lout/pkg/PLIST.pre b/textproc/lout/pkg/PLIST.pre
index 95c9869d95c..ec60674c8d1 100644
--- a/textproc/lout/pkg/PLIST.pre
+++ b/textproc/lout/pkg/PLIST.pre
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.pre,v 1.2 1998/11/12 23:51:12 frueauf Exp $
+@comment $NetBSD: PLIST.pre,v 1.3 2000/06/16 02:13:24 itojun Exp $
 bin/lout
-bin/c2lout
+bin/prg2lout
 man/man1/lout.1
-man/man1/c2lout.1
+man/man1/prg2lout.1