adjust database file name and version number to what was committed

diff --git a/regress/usr.bin/mandoc/db/out/all.derr b/regress/usr.bin/mandoc/db/out/all.derr
index 038d00f..fb31576 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/all.derr
+++ b/regress/usr.bin/mandoc/db/out/all.derr
@@ -57,7 +57,7 @@ dbm_dump: dbm_map(badimagic.db): Bad initial magic 3a7d0cdc (expected 3a7d0cdb)
 dbm_dump: badimagic.db: Inappropriate file type or format
 
 >>> badversion
-dbm_dump: dbm_map(badversion.db): Bad version number 1 (expected 0)
+dbm_dump: dbm_map(badversion.db): Bad version number 2 (expected 1)
 dbm_dump: badversion.db: Inappropriate file type or format
 
 >>> badmacrosp

diff --git a/regress/usr.bin/mandoc/db/out/empty.dout b/regress/usr.bin/mandoc/db/out/empty.dout
index 7d23b88..cfd3169 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/empty.dout
+++ b/regress/usr.bin/mandoc/db/out/empty.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x00000014
 end offset    0x00000138
 page count    0

diff --git a/regress/usr.bin/mandoc/db/out/fn.dout b/regress/usr.bin/mandoc/db/out/fn.dout
index 64e2513..9daa753 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/fn.dout
+++ b/regress/usr.bin/mandoc/db/out/fn.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x00000078
 end offset    0x0000022c
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/in.dout b/regress/usr.bin/mandoc/db/out/in.dout
index 8825646..04b4e5a 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/in.dout
+++ b/regress/usr.bin/mandoc/db/out/in.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x0000005c
 end offset    0x000001ac
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/onepage.dout b/regress/usr.bin/mandoc/db/out/onepage.dout
index 0a85603..e8296ab 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/onepage.dout
+++ b/regress/usr.bin/mandoc/db/out/onepage.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x0000004c
 end offset    0x00000170
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/padfentry.dout b/regress/usr.bin/mandoc/db/out/padfentry.dout
index ec1650e..89a5a7c 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/padfentry.dout
+++ b/regress/usr.bin/mandoc/db/out/padfentry.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x0000004c
 end offset    0x000001b8
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/padfmagic.dout b/regress/usr.bin/mandoc/db/out/padfmagic.dout
index 6fc7ca3..ecd7485 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/padfmagic.dout
+++ b/regress/usr.bin/mandoc/db/out/padfmagic.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x00000014
 end offset    0x0000013c
 page count    0

diff --git a/regress/usr.bin/mandoc/db/out/padfpage.dout b/regress/usr.bin/mandoc/db/out/padfpage.dout
index 13f5f5b..8a355e8 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/padfpage.dout
+++ b/regress/usr.bin/mandoc/db/out/padfpage.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x0000008c
 end offset    0x000001b0
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/padientry.dout b/regress/usr.bin/mandoc/db/out/padientry.dout
index 9ad24cd..8802c27 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/padientry.dout
+++ b/regress/usr.bin/mandoc/db/out/padientry.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x0000004c
 end offset    0x000001b8
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/padimacro.dout b/regress/usr.bin/mandoc/db/out/padimacro.dout
index 6fc7ca3..ecd7485 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/padimacro.dout
+++ b/regress/usr.bin/mandoc/db/out/padimacro.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x00000014
 end offset    0x0000013c
 page count    0

diff --git a/regress/usr.bin/mandoc/db/out/padipage.dout b/regress/usr.bin/mandoc/db/out/padipage.dout
index fb6d463..e4d058a 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/padipage.dout
+++ b/regress/usr.bin/mandoc/db/out/padipage.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x0000008c
 end offset    0x000001b0
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/padmacros.dout b/regress/usr.bin/mandoc/db/out/padmacros.dout
index 3be52de..ca7cb85 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/padmacros.dout
+++ b/regress/usr.bin/mandoc/db/out/padmacros.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x0000004c
 end offset    0x00000170
 page count    0

diff --git a/regress/usr.bin/mandoc/db/out/padmentry.dout b/regress/usr.bin/mandoc/db/out/padmentry.dout
index 72ab1ef..3a8b117 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/padmentry.dout
+++ b/regress/usr.bin/mandoc/db/out/padmentry.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x0000004c
 end offset    0x000001b8
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/padmmacro.dout b/regress/usr.bin/mandoc/db/out/padmmacro.dout
index 6fc7ca3..ecd7485 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/padmmacro.dout
+++ b/regress/usr.bin/mandoc/db/out/padmmacro.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x00000014
 end offset    0x0000013c
 page count    0

diff --git a/regress/usr.bin/mandoc/db/out/padmpage.dout b/regress/usr.bin/mandoc/db/out/padmpage.dout
index 6d34167..df89ebf 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/padmpage.dout
+++ b/regress/usr.bin/mandoc/db/out/padmpage.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x000000cc
 end offset    0x000001f0
 page count    2

diff --git a/regress/usr.bin/mandoc/db/out/sh.dout b/regress/usr.bin/mandoc/db/out/sh.dout
index 3de71bb..b77aaa7 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/sh.dout
+++ b/regress/usr.bin/mandoc/db/out/sh.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x00000064
 end offset    0x000001c0
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/so.dout b/regress/usr.bin/mandoc/db/out/so.dout
index b392e68..b59d8d8 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/so.dout
+++ b/regress/usr.bin/mandoc/db/out/so.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x00000060
 end offset    0x00000184
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/so_rev.dout b/regress/usr.bin/mandoc/db/out/so_rev.dout
index b392e68..b59d8d8 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/so_rev.dout
+++ b/regress/usr.bin/mandoc/db/out/so_rev.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x00000060
 end offset    0x00000184
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/sortnames.dout b/regress/usr.bin/mandoc/db/out/sortnames.dout
index 375f8d4..845c239 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/sortnames.dout
+++ b/regress/usr.bin/mandoc/db/out/sortnames.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x0000008c
 end offset    0x000001b0
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/sortpages.dout b/regress/usr.bin/mandoc/db/out/sortpages.dout
index 8d5e2fc..cbcf1d6 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/sortpages.dout
+++ b/regress/usr.bin/mandoc/db/out/sortpages.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x00000088
 end offset    0x000001ac
 page count    2

diff --git a/regress/usr.bin/mandoc/db/out/sortpages_rev.dout b/regress/usr.bin/mandoc/db/out/sortpages_rev.dout
index 8d5e2fc..cbcf1d6 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/sortpages_rev.dout
+++ b/regress/usr.bin/mandoc/db/out/sortpages_rev.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x00000088
 end offset    0x000001ac
 page count    2

diff --git a/regress/usr.bin/mandoc/db/out/threemacros.dout b/regress/usr.bin/mandoc/db/out/threemacros.dout
index 8e157bd..d948193 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/threemacros.dout
+++ b/regress/usr.bin/mandoc/db/out/threemacros.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x0000004c
 end offset    0x000001b8
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/threepages.dout b/regress/usr.bin/mandoc/db/out/threepages.dout
index 0f07bed..f47a5e7 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/threepages.dout
+++ b/regress/usr.bin/mandoc/db/out/threepages.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x000000cc
 end offset    0x000001f0
 page count    3

diff --git a/regress/usr.bin/mandoc/db/out/twoarch.dout b/regress/usr.bin/mandoc/db/out/twoarch.dout
index f0ae0ef..4313b26 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/twoarch.dout
+++ b/regress/usr.bin/mandoc/db/out/twoarch.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x00000070
 end offset    0x00000194
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/twopages.dout b/regress/usr.bin/mandoc/db/out/twopages.dout
index ea84a9c..ab6736f 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/twopages.dout
+++ b/regress/usr.bin/mandoc/db/out/twopages.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x0000008c
 end offset    0x000001b0
 page count    2

diff --git a/regress/usr.bin/mandoc/db/out/twosect.dout b/regress/usr.bin/mandoc/db/out/twosect.dout
index b503eec..829bcf6 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/twosect.dout
+++ b/regress/usr.bin/mandoc/db/out/twosect.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x0000005c
 end offset    0x00000180
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/va.dout b/regress/usr.bin/mandoc/db/out/va.dout
index 5f858e5..03da04d 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/va.dout
+++ b/regress/usr.bin/mandoc/db/out/va.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x0000006c
 end offset    0x00000250
 page count    1

diff --git a/regress/usr.bin/mandoc/db/out/xr.dout b/regress/usr.bin/mandoc/db/out/xr.dout
index ff57052..1d92c3f 100644 (file)
--- a/regress/usr.bin/mandoc/db/out/xr.dout
+++ b/regress/usr.bin/mandoc/db/out/xr.dout
@@ -1,5 +1,5 @@
 initial magic 0x3a7d0cdb
-version       0x00000000
+version       0x00000001
 macros offset 0x00000064
 end offset    0x000001b8
 page count    1

diff --git a/regress/usr.bin/mandoc/db/run/Makefile b/regress/usr.bin/mandoc/db/run/Makefile
index 2b3d90e..b88ef54 100644 (file)
--- a/regress/usr.bin/mandoc/db/run/Makefile
+++ b/regress/usr.bin/mandoc/db/run/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2016/07/30 10:56:13 schwarze Exp $
+# $OpenBSD: Makefile,v 1.2 2016/08/04 09:18:53 schwarze Exp $
 #
 # Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
 #
@@ -100,7 +100,7 @@ empty.db empty.mout empty.merr:
        @makewhatis man
        @if man -kM man something > empty.mout 2> empty.merr; \
                then false; else test $$? -eq 5; fi
-       @mv man/mandoc.new.db empty.db
+       @mv man/mandoc.db empty.db
        @rmdir man
 
 onepage.db onepage.mout: ${.CURDIR}/../man/empty.1
@@ -110,7 +110,7 @@ onepage.db onepage.mout: ${.CURDIR}/../man/empty.1
        @cp ${.CURDIR}/../man/empty.1 man/man1/
        @makewhatis man
        @man -kM man title > onepage.mout
-       @mv man/mandoc.new.db onepage.db
+       @mv man/mandoc.db onepage.db
        @rm -rf man
 
 twopages.db twopages.mout: ${.CURDIR}/../man/empty.1
@@ -122,7 +122,7 @@ twopages.db twopages.mout: ${.CURDIR}/../man/empty.1
        @(echo "> second"; man -wM man second | sed 's#.*/man/##'; \
          echo "> empty"; man -wM man empty | sed 's#.*/man/##') \
          > twopages.mout
-       @mv man/mandoc.new.db twopages.db
+       @mv man/mandoc.db twopages.db
        @rm -rf man
 
 threepages.db threepages.mout: ${.CURDIR}/../man/empty.1
@@ -136,7 +136,7 @@ threepages.db threepages.mout: ${.CURDIR}/../man/empty.1
          echo "> third"; man -wM man third | sed 's#.*/man/##'; \
          echo "> empty"; man -wM man empty | sed 's#.*/man/##') \
          > threepages.mout
-       @mv man/mandoc.new.db threepages.db
+       @mv man/mandoc.db threepages.db
        @rm -rf man
 
 threemacros.db threemacros.mout: ${.CURDIR}/../man/empty.1
@@ -148,7 +148,7 @@ threemacros.db threemacros.mout: ${.CURDIR}/../man/empty.1
        @makewhatis man
        @(echo "> Xr=one"; man -kwM man Xr=one | sed 's#.*/man/##'; \
          echo "> Xr~^t"; man -kM man -O Xr Xr~^t;) > threemacros.mout
-       @mv man/mandoc.new.db threemacros.db
+       @mv man/mandoc.db threemacros.db
        @rm -rf man
 
 sortpages.db sortpages.mout: makeinodes ${.CURDIR}/../man/empty.1
@@ -160,7 +160,7 @@ sortpages.db sortpages.mout: makeinodes ${.CURDIR}/../man/empty.1
        @mv man/man1/2 man/man1/two.1
        @makewhatis man
        @man -kM man Nm=empty > sortpages.mout
-       @mv man/mandoc.new.db sortpages.db
+       @mv man/mandoc.db sortpages.db
        @rm -rf man
 
 sortpages_rev.db sortpages_rev.mout: makeinodes ${.CURDIR}/../man/empty.1
@@ -172,7 +172,7 @@ sortpages_rev.db sortpages_rev.mout: makeinodes ${.CURDIR}/../man/empty.1
        @mv man/man1/1 man/man1/two.1
        @makewhatis man
        @man -kM man Nm=empty > sortpages_rev.mout
-       @mv man/mandoc.new.db sortpages_rev.db
+       @mv man/mandoc.db sortpages_rev.db
        @rm -rf man
 
 so.db so.mout: makeinodes ${.CURDIR}/../man/empty.1
@@ -184,7 +184,7 @@ so.db so.mout: makeinodes ${.CURDIR}/../man/empty.1
        @mv man/man1/2 man/man1/two.1
        @makewhatis man
        @man -wM man two | sed 's#.*/man/##' > so.mout
-       @mv man/mandoc.new.db so.db
+       @mv man/mandoc.db so.db
        @rm -rf man
 
 so_rev.db so_rev.mout: makeinodes ${.CURDIR}/../man/empty.1
@@ -196,7 +196,7 @@ so_rev.db so_rev.mout: makeinodes ${.CURDIR}/../man/empty.1
        @mv man/man1/1 man/man1/two.1
        @makewhatis man
        @man -wM man two | sed 's#.*/man/##' > so_rev.mout
-       @mv man/mandoc.new.db so_rev.db
+       @mv man/mandoc.db so_rev.db
        @rm -rf man
 
 sortnames.db sortnames.mout: ${.CURDIR}/../man/sortnames.1
@@ -206,7 +206,7 @@ sortnames.db sortnames.mout: ${.CURDIR}/../man/sortnames.1
        @ln man/man1/sortnames.1 man/man1/link.1
        @makewhatis man
        @man -kM man Nm=onlysyn > sortnames.mout
-       @mv man/mandoc.new.db sortnames.db
+       @mv man/mandoc.db sortnames.db
        @rm -rf man
 
 twosect.db twosect.mout: ${.CURDIR}/../man/empty.1
@@ -217,7 +217,7 @@ twosect.db twosect.mout: ${.CURDIR}/../man/empty.1
        @ln man/man1/empty.1 man/man8/empty.8
        @makewhatis man
        @man -kM man -s 1 title > twosect.mout
-       @mv man/mandoc.new.db twosect.db
+       @mv man/mandoc.db twosect.db
        @rm -rf man
 
 twoarch.db twoarch.mout: ${.CURDIR}/../man/empty.1
@@ -228,7 +228,7 @@ twoarch.db twoarch.mout: ${.CURDIR}/../man/empty.1
        @ln man/man1/i386/empty.1 man/man1/amd64/empty.1
        @makewhatis man
        @man -kM man -S i386 title > twoarch.mout
-       @mv man/mandoc.new.db twoarch.db
+       @mv man/mandoc.db twoarch.db
        @rm -rf man
 
 fn.db fn.mout: ${.CURDIR}/../man/fn.3
@@ -243,7 +243,7 @@ fn.db fn.mout: ${.CURDIR}/../man/fn.3
          echo "> fo_func"; man -kwM man Fn=fo_func | sed 's#.*/man/##'; \
          echo "> fo_arg";  man -kwM man Fa=fo_arg  | sed 's#.*/man/##') \
          > fn.mout
-       @mv man/mandoc.new.db fn.db
+       @mv man/mandoc.db fn.db
        @rm -rf man
 
 in.db in.mout: ${.CURDIR}/../man/in.3
@@ -254,7 +254,7 @@ in.db in.mout: ${.CURDIR}/../man/in.3
        @(echo "> In"; man -kwM man In=in.h | sed 's#.*/man/##'; \
          echo "> Fd"; man -kwM man In=fd.h | sed 's#.*/man/##') \
          > in.mout
-       @mv man/mandoc.new.db in.db
+       @mv man/mandoc.db in.db
        @rm -rf man
 
 va.db va.mout: ${.CURDIR}/../man/va.3
@@ -268,7 +268,7 @@ va.db va.mout: ${.CURDIR}/../man/va.3
          echo "> t2"; man -kwM man Vt='struct vt_two' | sed 's#.*/man/##'; \
          echo "> a2"; man -kwM man Va='int va_two'  | sed 's#.*/man/##') \
          > va.mout
-       @mv man/mandoc.new.db va.db
+       @mv man/mandoc.db va.db
        @rm -rf man
 
 sh.db sh.mout: ${.CURDIR}/../man/sh.1
@@ -279,7 +279,7 @@ sh.db sh.mout: ${.CURDIR}/../man/sh.1
        @(echo "> Sh"; man -kwM man Sh=sh_title | sed 's#.*/man/##'; \
          echo "> Ss"; man -kwM man Ss=ss_title | sed 's#.*/man/##') \
          > sh.mout
-       @mv man/mandoc.new.db sh.db
+       @mv man/mandoc.db sh.db
        @rm -rf man
 
 xr.db xr.mout: ${.CURDIR}/../man/xr.1
@@ -290,7 +290,7 @@ xr.db xr.mout: ${.CURDIR}/../man/xr.1
        @(echo "> bare"; man -kwM man 'Xr~^bare$$' | sed 's#.*/man/##'; \
          echo "> page"; man -kwM man 'Xr=page(1)' | sed 's#.*/man/##') \
          > xr.mout
-       @mv man/mandoc.new.db xr.db
+       @mv man/mandoc.db xr.db
        @rm -rf man
 
 all.mout: ${OUT_TESTS:C/$/.mout/}