- (dtucker) [mdoc2man.awk] Teach it to deal with $Mdocdate tags that

   OpenBSD's cvs now adds.

2 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c5c0c9dde..bbba954f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,8 @@
      Yields around a 12-16% end-to-end speedup for arcfour256/hmac-md5
      patch from markus@ tested dtucker@ and myself, ok markus@ and me (I'm
      committing at his request)
+ - (dtucker) [mdoc2man.awk] Teach it to deal with $Mdocdate tags that
+   OpenBSD's cvs now adds.
 
 20070520
  - (dtucker) OpenBSD CVS Sync
@@ -2967,4 +2969,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4676 2007/06/05 08:30:18 dtucker Exp $
+$Id: ChangeLog,v 1.4677 2007/06/05 09:16:59 dtucker Exp $
diff --git a/mdoc2man.awk b/mdoc2man.awk
index d6eaf4601..5f46aa140 100644
--- a/mdoc2man.awk
+++ b/mdoc2man.awk
@@ -1,6 +1,9 @@
 #!/usr/bin/awk
 #
+# $Id: mdoc2man.awk,v 1.6 2007/06/05 09:16:59 dtucker Exp $
+#
 # Version history:
+#  v4+ Adapted for OpenSSH Portable (see cvs Id and history)
 #  v3, I put the program under a proper license
 #      Dan Nelson <dnelson@allantgroup.com> added .An, .Aq and fixed a typo
 #  v2, fixed to work on GNU awk --posix and MacOS X
@@ -135,6 +138,12 @@ function add(str) {
         nospace=0
     }
     if(match(words[w],"^Dd$")) {
+      if(match(words[w+1],"^\\$Mdocdate:$")) {
+        w++;
+        if(match(words[w+4],"^\\$$")) {
+          words[w+4] = ""
+        }
+      }
       date=wtail()
       next
     } else if(match(words[w],"^Dt$")) {