Update to 2.3:

* Mon Dec 25 2006 Eric S. Raymond - 2.3-1
- Work around a bug in db2man.xsl.  Implement Markus Hoenicka's
  requested behavior for multiple-file conversions. Implement
  translation of groff extended .cc and .c2 requests.  Ignore
  the .TA macro that occurs duplicatively with .ta in X.org
  manual pages.  Cope with unresolved .Sx refererences in mdoc.
  Handle .Ex and .Ee.  Cope with X consortium macro preamble better.
  .RS/.RE is now fully handled, no more spurious warnings.

* Sat Jan 15 2005 Eric S. Raymond - 2.2-1
- Have manlifter create subdirectories and the xslfragment
  only in batch mode.  Use current list indent on block start/end.

3 files changed, 21 insertions, 22 deletions

diff --git a/textproc/doclifter/Makefile b/textproc/doclifter/Makefile
index 963675ffa5e..bf2e048d8b5 100644
--- a/textproc/doclifter/Makefile
+++ b/textproc/doclifter/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2006/03/11 04:43:28 reed Exp $
+# $NetBSD: Makefile,v 1.17 2007/01/15 23:40:46 wiz Exp $
 #
 
-DISTNAME=	doclifter-2.1
-PKGREVISION=	1
+DISTNAME=	doclifter-2.3
 CATEGORIES=	textproc
 MASTER_SITES=	http://catb.org/~esr/doclifter/
 
diff --git a/textproc/doclifter/distinfo b/textproc/doclifter/distinfo
index 595218c70b7..87362e74886 100644
--- a/textproc/doclifter/distinfo
+++ b/textproc/doclifter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2005/03/23 21:47:52 wiz Exp $
+$NetBSD: distinfo,v 1.12 2007/01/15 23:40:46 wiz Exp $
 
-SHA1 (doclifter-2.1.tar.gz) = 48f17f364a40d1a2a7f4af74757ecedcc86d8b0d
-RMD160 (doclifter-2.1.tar.gz) = df3152740f1b1fb3ad6e369e2e216c573e554f96
-Size (doclifter-2.1.tar.gz) = 126847 bytes
-SHA1 (patch-aa) = 59761aa1058d4417c788d25133416a91473828c7
+SHA1 (doclifter-2.3.tar.gz) = 8ca55df65eb16958bc774abb3dc3d5929f5fa444
+RMD160 (doclifter-2.3.tar.gz) = c1e18770260f40e74ad3b842ab09a92ed6f36646
+Size (doclifter-2.3.tar.gz) = 132537 bytes
+SHA1 (patch-aa) = ef13eca669f2b57ca559d631e6067ba290a25bd1
diff --git a/textproc/doclifter/patches/patch-aa b/textproc/doclifter/patches/patch-aa
index 076fc0bf964..725b650e882 100644
--- a/textproc/doclifter/patches/patch-aa
+++ b/textproc/doclifter/patches/patch-aa
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/03/28 18:50:02 wiz Exp $
---- manlifter.orig	Fri Dec 24 23:44:11 2004
-+++ manlifter	Sun Jan  9 14:06:09 2005
-@@ -300,7 +300,8 @@
+$NetBSD: patch-aa,v 1.3 2007/01/15 23:40:46 wiz Exp $
+
+--- manlifter.orig	2006-12-25 07:43:35.000000000 +0000
++++ manlifter
+@@ -316,7 +316,8 @@ def massrun(files, options):
      signal.signal(signal.SIGUSR2, report)
      signal.signal(signal.SIGHUP, bailout)
      signal.signal(signal.SIGINT, bailout)
@@ -11,7 +12,7 @@ $NetBSD: patch-aa,v 1.2 2005/03/28 18:50:02 wiz Exp $
      signal.signal(signal.SIGTERM, bailout)
      print "%Test started", time.ctime(), "\n"
      try:
-@@ -557,22 +558,18 @@
+@@ -584,22 +585,17 @@ def doclifter_driver(options, arguments)
          fp.close()
  
  if __name__ == "__main__":
@@ -21,7 +22,7 @@ $NetBSD: patch-aa,v 1.2 2005/03/28 18:50:02 wiz Exp $
 -        if os.path.exists(where):
 -            break
 -    else:
--        sys.stderr.write("manlifter: can't find doclifter!")
+-        sys.stderr.write("manlifter: can't find doclifter!\n")
 -        sys.exit(1)
 -    # Import it, so we can modify it while the test is running without
 -    # screwing up the results
@@ -31,16 +32,15 @@ $NetBSD: patch-aa,v 1.2 2005/03/28 18:50:02 wiz Exp $
 -        os.system("cp %s doclifter_test%s.py" % (where, os.getpid()))
 -        exec 'import doclifter_test%s' % os.getpid()
 -        exec "doclifter=doclifter_test%s" % os.getpid()
-+        try:
-+            doclifter = imp.load_module('doclifter', fp, '@@BIN_PATH@@/doclifter', ('.py', 'U', 1))
-+        except ImportError:
-+            sys.stderr.write("manlifter: can't find doclifter!")
-+            sys.exit(1)
++	try:
++	    doclifter = imp.load_module('doclifter', fp, '@@BIN_PATH@@/doclifter', ('.py', 'U', 1))
++	except ImportError:
++	    sys.stderr.write("manlifter: can't find doclifter!")
++	    sys.exit(1)
      finally:
 -        os.system("rm -f doclifter_test%s.py*" % os.getpid())
-+       if fp:
-+            fp.close()
-+
++	if fp:
++	    fp.close()
      # Gather options
      (options, arguments) = getopt.getopt(sys.argv[1:], "d:ef:hI:p:qs:Sv")
      # Do the real work