Rename libohash to libopenbsd.

libopenbsd is an internal library which
to bring in compatibility stuff from OpenBSD.
This will allow us to bring in more
OpenBSD utilities into the FreeBSD base system.

We similarly use libnetbsd for bringing in stuff from NetBSD.

Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D4078

13 files changed, 16 insertions, 16 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index 275b8a343e71..681884c9ef64 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1367,10 +1367,10 @@ _sed=		usr.bin/sed
 .endif
 
 .if ${BOOTSTRAPPING} < 1000002
-_libohash=	lib/libohash
+_libopenbsd=	lib/libopenbsd
 _m4=		usr.bin/m4
 
-${_bt}-usr.bin/m4: ${_bt}-lib/libohash
+${_bt}-usr.bin/m4: ${_bt}-lib/libopenbsd
 .endif
 
 .if ${BOOTSTRAPPING} < 1000026
@@ -1443,10 +1443,10 @@ _kerberos5_bootstrap_tools= \
 .endif
 
 .if ${MK_MANDOCDB} != "no"
-_libohash?=	lib/libohash
+_libopenbsd?=	lib/libopenbsd
 _makewhatis=	lib/libsqlite3 \
 		usr.bin/mandoc
-${_bt}-usr.bin/mandoc: ${_bt}-lib/libohash ${_bt}-lib/libsqlite3
+${_bt}-usr.bin/mandoc: ${_bt}-lib/libopenbsd ${_bt}-lib/libsqlite3
 .else
 _makewhatis=usr.bin/makewhatis
 .endif
@@ -1469,7 +1469,7 @@ bootstrap-tools: .PHONY
     ${_awk} \
     ${_cat} \
     usr.bin/lorder \
-    ${_libohash} \
+    ${_libopenbsd} \
     ${_makewhatis} \
     usr.bin/rpcgen \
     ${_sed} \
diff --git a/lib/Makefile b/lib/Makefile
index a3321af9aed0..38003b8fec67 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -75,7 +75,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libnetgraph} \
 	${_libngatm} \
 	libnv \
-	libohash \
+	libopenbsd \
 	libopie \
 	libpam \
 	libpcap \
diff --git a/lib/libohash/Makefile b/lib/libopenbsd/Makefile
index 198093e289b0..33b9ff0874cb 100644
--- a/lib/libohash/Makefile
+++ b/lib/libopenbsd/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LIB=	ohash
+LIB=	openbsd
 SRCS=	ohash.c
 INTERNALLIB=
 
diff --git a/lib/libohash/Makefile.depend b/lib/libopenbsd/Makefile.depend
index 18be76b0cb6f..18be76b0cb6f 100644
--- a/lib/libohash/Makefile.depend
+++ b/lib/libopenbsd/Makefile.depend
diff --git a/lib/libohash/ohash.c b/lib/libopenbsd/ohash.c
index 3a0f5dde449c..3a0f5dde449c 100644
--- a/lib/libohash/ohash.c
+++ b/lib/libopenbsd/ohash.c
diff --git a/lib/libohash/ohash.h b/lib/libopenbsd/ohash.h
index ff21c8599ead..ff21c8599ead 100644
--- a/lib/libohash/ohash.h
+++ b/lib/libopenbsd/ohash.h
diff --git a/lib/libohash/ohash_init.3 b/lib/libopenbsd/ohash_init.3
index 184c4e389b24..184c4e389b24 100644
--- a/lib/libohash/ohash_init.3
+++ b/lib/libopenbsd/ohash_init.3
diff --git a/lib/libohash/ohash_interval.3 b/lib/libopenbsd/ohash_interval.3
index 3809c34e3c0f..3809c34e3c0f 100644
--- a/lib/libohash/ohash_interval.3
+++ b/lib/libopenbsd/ohash_interval.3
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index 06e451bdfa22..542a9e4bb2de 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -39,7 +39,7 @@ _INTERNALLIBS=	\
 		netbsd \
 		ntp \
 		ntpevent \
-		ohash \
+		openbsd \
 		opts \
 		parse \
 		readline \
@@ -313,8 +313,8 @@ LIBELFTC?=	${LIBELFTCDIR}/libelftc.a
 LIBREADLINEDIR=	${ROOTOBJDIR}/gnu/lib/libreadline/readline
 LIBREADLINE?=	${LIBREADLINEDIR}/libreadline.a
 
-LIBOHASHDIR=	${ROOTOBJDIR}/lib/libohash
-LIBOHASH?=	${LIBOHASHDIR}/libohash.a
+LIBOPENBSDDIR=	${ROOTOBJDIR}/lib/libopenbsd
+LIBOPENBSD?=	${LIBOPENBSDDIR}/libopenbsd.a
 
 LIBSMDIR=	${ROOTOBJDIR}/lib/libsm
 LIBSM?=		${LIBSMDIR}/libsm.a
diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile
index d9550758f9b9..55118773b579 100644
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@@ -7,8 +7,8 @@
 .include <src.opts.mk>
 
 PROG=	m4
-CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/../../lib/libohash
-LIBADD=	y l m ohash
+CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/../../lib/libopenbsd
+LIBADD=	y l m openbsd
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
diff --git a/usr.bin/m4/Makefile.depend b/usr.bin/m4/Makefile.depend
index f5fa771b92e1..8ccf846f0ced 100644
--- a/usr.bin/m4/Makefile.depend
+++ b/usr.bin/m4/Makefile.depend
@@ -9,7 +9,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	lib/libohash \
+	lib/libopenbsd \
 	lib/liby \
 	lib/msun \
 	usr.bin/lex/lib \
diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
index faa46ed3bdc8..9160dc0b58f8 100644
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -82,8 +82,8 @@ SRCS+=	${DB_SRCS}
 
 WARNS?=	2
 CFLAGS+= -DHAVE_CONFIG_H \
-	 -I${.CURDIR}/../../lib/libohash/ \
+	 -I${.CURDIR}/../../lib/libopenbsd/ \
 	 -I${.CURDIR}/../../contrib/sqlite3
-LIBADD=	ohash sqlite3 z
+LIBADD=	openbsd sqlite3 z
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/mandoc/Makefile.depend b/usr.bin/mandoc/Makefile.depend
index e3848e3fa54f..7c705f5b3c99 100644
--- a/usr.bin/mandoc/Makefile.depend
+++ b/usr.bin/mandoc/Makefile.depend
@@ -9,7 +9,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
-	lib/libohash \
+	lib/libopenbsd \
 	lib/libsqlite3 \
 	lib/libthr \
 	lib/libz \