===================================================================
RCS file: /cvs/mandoc/configure.local.example,v
retrieving revision 1.14.2.6
retrieving revision 1.14.2.9
diff -u -p -r1.14.2.6 -r1.14.2.9
--- mandoc/configure.local.example	2017/02/16 16:21:04	1.14.2.6
+++ mandoc/configure.local.example	2017/03/04 16:44:43	1.14.2.9
@@ -1,4 +1,4 @@
-# $Id: configure.local.example,v 1.14.2.6 2017/02/16 16:21:04 schwarze Exp $
+# $Id: configure.local.example,v 1.14.2.9 2017/03/04 16:44:43 schwarze Exp $
 #
 # Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
 #
@@ -72,7 +72,7 @@ MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/lo
 # If you do not want uname(3) to be called but instead want a fixed
 # string to be used, use the following line:
 
-OSNAME="OpenBSD 5.9"
+OSNAME="OpenBSD 6.0"
 
 # The following installation directories are used.
 # It is possible to set only one or a few of these variables,
@@ -87,6 +87,13 @@ INCLUDEDIR="${PREFIX}/include/mandoc"
 LIBDIR="${PREFIX}/lib/mandoc"
 MANDIR="${PREFIX}/man"
 
+# If BINDIR and SBINDIR are not subdirectories of the same parent
+# directory or if the basename(1) of BINDIR differs from "bin",
+# the relative path from SBINDIR to BINDIR is also needed.
+# The default is:
+
+BIN_FROM_SBIN="../bin"
+
 # The man(1) utility needs to know where the manuals reside.
 # We know of two ways to tell it: via manpath(1) or man.conf(5).
 # The latter is used by OpenBSD and NetBSD, the former by most
@@ -174,13 +181,6 @@ INSTALL_DATA="${INSTALL} -m 0444"
 
 # --- user settings related to database support ------------------------
 
-# By default, building makewhatis(8) and apropos(1) is enabled.
-# To disable it, for example to avoid the dependency on SQLite3,
-# use the following line.  It that case, the remaining settings
-# in this section are irrelevant.
-
-BUILD_DB=0
-
 # Autoconfiguration tries the following linker flags to find the
 # SQLite3 library installed on your system.  If none of these work,
 # set the following variable to specify the required linker flags.
@@ -222,7 +222,6 @@ HOMEBREWDIR="${PREFIX}/Cellar"
 
 # By default, building man.cgi(8) is disabled.  To enable it, copy
 # cgi.h.example to cgi.h, edit it, and use the following line.
-# Obviously, this requires that BUILD_DB is enabled, too.
 
 BUILD_CGI=1
 
@@ -299,6 +298,5 @@ HAVE_STRTONUM=0
 HAVE_VASPRINTF=0
 HAVE_WCHAR=0
 
-HAVE_SQLITE3=0
 HAVE_SQLITE3_ERRSTR=0
 HAVE_OHASH=0