blocklist: Rename blacklist to blocklist

Follow up upstream rename from blacklist to blocklist.

- Old names and rc scripts are still valid, but emitting an ugly warning
- Old firewall rules and anchor names should work, but emitting an ugly
  warning
- Old MK_BLACKLIST* knobs are wired to the new ones

Although care has been taken not to break current configurations, this
is a large patch containing mostly duplicated code.  If issues arise, it
will be swiftly reverted.

Reviewed by:	ivy (pkgbase)
Approved by:	emaste (mentor)
MFC after:	2 days
Relnotes:	yes

lib/Makefile

@@ -163,6 +163,7 @@ SUBDIR_DEPEND_virtual_oss= libsamplerate
 
 SUBDIR.${MK_BEARSSL}+=	libbearssl libsecureboot
 SUBDIR.${MK_BLACKLIST}+=libblacklist
+SUBDIR.${MK_BLOCKLIST}+=libblocklist
 SUBDIR.${MK_BLUETOOTH}+=libbluetooth libsdp
 SUBDIR.${MK_BSNMP}+=	libbsnmp
 

lib/libblacklist/Makefile

@@ -1,6 +1,6 @@
 BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist
 
-.PATH: ${BLOCKLIST_DIR}/lib ${BLOCKLIST_DIR}/include
+.PATH: ${BLOCKLIST_DIR}/lib ${BLOCKLIST_DIR}/include ${BLOCKLIST_DIR}/port
 
 PACKAGE=	blocklist
 LIB=	blacklist
@@ -13,17 +13,19 @@ CFLAGS.clang+=-Wno-thread-safety-analysis
 CFLAGS+=-I${BLOCKLIST_DIR}/include -I${BLOCKLIST_DIR}/port \
 	-D_REENTRANT -DHAVE_CONFIG_H -DHAVE_DB_H -DHAVE_LIBUTIL_H \
 	-DHAVE_CLOCK_GETTIME -DHAVE_FGETLN -DHAVE_GETPROGNAME \
-	-DHAVE_STRLCAT -DHAVE_STRLCPY -DHAVE_STRUCT_SOCKADDR_SA_LEN
+	-DHAVE_STRLCAT -DHAVE_STRLCPY -DHAVE_STRUCT_SOCKADDR_SA_LEN \
+	-DHAVE_SYS_CDEFS_H
 
-SRCS=	bl.c blacklist.c
+SRCS=	old_bl.c blacklist.c vsyslog_r.c
 INCS=	blacklist.h
-MAN=	libblacklist.3
+MAN=	libblocklist.3
 
-MLINKS=	libblacklist.3 blacklist_open.3		\
-	libblacklist.3 blacklist_close.3	\
-	libblacklist.3 blacklist.3		\
-	libblacklist.3 blacklist_r.3		\
-	libblacklist.3 blacklist_sa.3		\
-	libblacklist.3 blacklist_sa_r.3
+MLINKS+=libblocklist.3 libblacklist.3		\
+	libblocklist.3 blacklist_open.3		\
+	libblocklist.3 blacklist_close.3	\
+	libblocklist.3 blacklist.3		\
+	libblocklist.3 blacklist_r.3		\
+	libblocklist.3 blacklist_sa.3		\
+	libblocklist.3 blacklist_sa_r.3
 
 .include <bsd.lib.mk>

lib/libblocklist/Makefile

@@ -0,0 +1,30 @@
+BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist
+
+.PATH: ${BLOCKLIST_DIR}/lib ${BLOCKLIST_DIR}/include ${BLOCKLIST_DIR}/port
+
+PACKAGE=	blocklist
+LIB=	blocklist
+SHLIB_MAJOR= 0
+
+LIBADD+= pthread
+
+CFLAGS.clang+=-Wno-thread-safety-analysis
+
+CFLAGS+=-I${BLOCKLIST_DIR}/include -I${BLOCKLIST_DIR}/port \
+	-D_REENTRANT -DHAVE_CONFIG_H -DHAVE_DB_H -DHAVE_LIBUTIL_H \
+	-DHAVE_CLOCK_GETTIME -DHAVE_FGETLN -DHAVE_GETPROGNAME \
+	-DHAVE_STRLCAT -DHAVE_STRLCPY -DHAVE_STRUCT_SOCKADDR_SA_LEN \
+	-DHAVE_SYS_CDEFS_H
+
+SRCS=	bl.c blocklist.c vsyslog_r.c
+INCS=	blocklist.h
+MAN=	libblocklist.3
+
+MLINKS=	libblocklist.3 blocklist_open.3		\
+	libblocklist.3 blocklist_close.3	\
+	libblocklist.3 blocklist.3		\
+	libblocklist.3 blocklist_r.3		\
+	libblocklist.3 blocklist_sa.3		\
+	libblocklist.3 blocklist_sa_r.3
+
+.include <bsd.lib.mk>

lib/libblocklist/Makefile.depend

@@ -0,0 +1,16 @@
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/libc \
+	lib/libcompiler_rt \
+	lib/libthr \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif

lib/libsysdecode/Makefile.depend

@@ -38,7 +38,7 @@ DIRDEPS = \
 	lib/libarchive \
 	lib/libbe \
 	lib/libbegemot \
-	lib/libblacklist \
+	lib/libblocklist \
 	lib/libblocksruntime \
 	lib/libbluetooth \
 	lib/libbsddialog \