contrib: remove HAVE_BSD for darwin targets

HAVE_DARWIN_OS always has the priority over HAVE_BSD. We only need
one of them. HAVE_BSD will be for other BSD variants.

contrib/bootstrap

@@ -267,7 +267,7 @@ OS="${HOST#*-}" # strip architecture
 MAKE=make
 case "${OS}" in
 	*-darwin*)
-		add_make_enabled "HAVE_DARWIN_OS" "HAVE_BSD"
+		add_make_enabled "HAVE_DARWIN_OS"
 		if test -z "$BUILDFORIOS"
 		then
 			check_macosx_sdk

contrib/src/basu/rules.mak

@@ -13,10 +13,8 @@ endif
 endif
 
 ifdef HAVE_BSD
-ifndef HAVE_DARWIN_OS
 PKGS += basu
 endif
-endif
 
 endif # libsystemd
 endif # libelogind

contrib/src/gcrypt/rules.mak

@@ -54,11 +54,10 @@ endif
 ifeq ($(ARCH), x86_64)
 GCRYPT_CONF += ac_cv_sys_symbol_underscore=yes
 endif
-else
+endif
 ifdef HAVE_BSD
 GCRYPT_CONF += --disable-asm --disable-aesni-support
 endif
-endif
 ifdef HAVE_ANDROID
 ifeq ($(ANDROID_ABI), x86)
 GCRYPT_CONF += ac_cv_sys_symbol_underscore=no

contrib/src/live555/rules.mak

@@ -35,11 +35,10 @@ LIVE_EXTRA_CFLAGS += -DNO_GETIFADDRS=1
 endif
 ifdef HAVE_DARWIN_OS
 LIVE_TARGET := macosx-bigsur
-else
+endif
 ifdef HAVE_BSD
 LIVE_TARGET := freebsd
 endif
-endif
 ifdef HAVE_SOLARIS
 ifeq ($(ARCH),x86_64)
 LIVE_TARGET := solaris-64bit