--- Configure.orig	2020-12-27 02:27:04.000000000 +1100
+++ Configure	2021-07-07 10:20:25.683047000 +1000
@@ -3463,6 +3463,8 @@
 		bsd386) osname=bsd386
 			osvers=`$uname -r`
 			;;
+		bsdsunix) osname=bsdsunix
+			osvers="$3" ;;
 		cygwin*) osname=cygwin
 			osvers="$3"
 			;;
@@ -3484,8 +3486,6 @@
 		dynixptx*) osname=dynixptx
 			osvers=`echo "$4"|sed 's/^v//'`
 			;;
-		freebsd) osname=freebsd
-			osvers="$3" ;;
 		genix)	osname=genix ;;
 		gnu)	osname=gnu
 			osvers="$3" ;;
@@ -3585,6 +3585,7 @@
 			;;
 		$2) case "$osname" in
 			*isc*) ;;
+			*bsdsunix*) ;;
 			*freebsd*) ;;
 			svr*)
 				: svr4.x or possibly later
@@ -3876,7 +3877,10 @@
 . ./posthint.sh
 
 : who configured the system
-cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1`
+case "$cf_time" in
+"")
+	cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1` ;;
+esac
 case "$cf_by" in
 "")
 	cf_by=`(logname) 2>/dev/null`
@@ -5061,7 +5065,7 @@
 : Now check and see which directories actually exist, avoiding duplicates
 for xxx in $dlist
 do
-    if $test -d $xxx; then
+    if $test -d $xxx || [ $xxx = $prefix/lib ]; then
 		case " $libpth " in
 		*" $xxx "*) ;;
 		*) libpth="$libpth $xxx";;
@@ -8822,7 +8826,7 @@
 	solaris)
 		xxx="-R $shrpdir"
 		;;
-	freebsd|minix|mirbsd|netbsd|openbsd|interix|dragonfly|bitrig)
+	bsdsunix|freebsd|minix|mirbsd|netbsd|openbsd|interix|dragonfly|bitrig)
 		xxx="-Wl,-R$shrpdir"
 		;;
 	bsdos|linux|irix*|dec_osf|gnu*|haiku)
@@ -9605,8 +9609,7 @@
 
 : determine where add-on public executable scripts go
 case "$sitescript" in
-'')	dflt=$siteprefix/script
-	$test -d $dflt || dflt=$sitebin ;;
+'')	dflt=$sitebin ;;
 *)  dflt="$sitescript" ;;
 esac
 fn=d~+
@@ -16397,7 +16400,7 @@
 *"$undef"*) h_msg=false;;
 esac
 case "$osname" in
-freebsd)
+bsdsunix|freebsd)
     case "`ipcs 2>&1`" in
     "SVID messages"*"not configured"*)
 	echo "Your $osname does not have the msg*(2) configured." >&4
@@ -17065,7 +17068,7 @@
 elif $test "X$d_readlink" = Xdefine; then
         : NetBSD first as /proc/self is a symlink to /proc/curproc,
         : and it feels more tidy to avoid an extra level of symlink
-	set NetBSD /proc/curproc/exe Linux /proc/self/exe FreeBSD /proc/curproc/file Solaris /proc/self/path/a.out
+	set NetBSD /proc/curproc/exe Linux /proc/self/exe FreeBSD /proc/curproc/file Solaris /proc/self/path/a.out BSDSUniX /proc/curproc/file
 	while test $# -gt 0; do
 	    type=$1; try=$2
 	    shift; shift
@@ -17492,7 +17495,7 @@
 *"$undef"*) h_sem=false;;
 esac
 case "$osname" in
-freebsd)
+bsdsunix|freebsd)
     case "`ipcs 2>&1`" in
     "SVID messages"*"not configured"*)
 	echo "Your $osname does not have the sem*(2) configured." >&4
@@ -18356,7 +18359,7 @@
 *"$undef"*) h_shm=false;;
 esac
 case "$osname" in
-freebsd)
+bsdsunix|freebsd)
     case "`ipcs 2>&1`" in
     "SVID shared memory"*"not configured"*)
 	echo "Your $osname does not have the shm*(2) configured." >&4
@@ -23024,7 +23027,7 @@
 AMD64 amd64 amiga AMIGAOS AMIX ansi ANSI_C_SOURCE apollo arch_ppc
 arch_pwr ardent ARM ARM32 atarist att386 att3b
 BeOS BIG_ENDIAN BIT_MSF BSD bsd bsd43 bsd4_2 BSD4_3 bsd4_3 bsd4_4
-BSDCOMPAT bsdi BSD_4_3 BSD_4_4 BSD_NET2 BSD_TIME BSD_TYPES bull
+BSDCOMPAT BSDSUniX bsdi BSD_4_3 BSD_4_4 BSD_NET2 BSD_TIME BSD_TYPES bull
 byteorder byte_order
 c cadmus clang clipper CMU COFF COMPILER_VERSION concurrent
 convex cpu CRAY cray CRAYMPP ctix CX_UX CYGWIN