From 80b71dc43a588b5879ad99a37f9735c03407464d Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Fri, 11 Jan 2002 22:56:52 +0000
Subject: [PATCH] Last fix to make NetBSD compile and install

---
 ChangeLog             |  5 +++--
 script/installinit.sh | 14 +++++++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3fa69f3b..663cd984 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4254,10 +4254,11 @@ v0.33.19        26-Oct-2001
 		The sourcetree has now a new subdirectory called unix. Here
 		are all the system specific programs such as mbpasswd,
 		mblogin and mbuseradd.
+		Started NetBSD port. Not working yet but does compile.
 
 	SETUP.sh
 		Better grep to check for excisting usernames like bbs, mbse.
-		Prepared for the NetBSD port.
+		Ported to NetBSD.
 
 	libcommon.a:
 		When adding seenby entries, the zone number is copied from the
@@ -4400,7 +4401,7 @@ v0.33.19        26-Oct-2001
 		time + random dial delay time. Needed for mbtask.
 
 	mbout:
-		Fixes for Sparc systems.
+		Fixes for Linux Sparc systems.
 		The node query now displays the system open times (Txx) flags.
 		The node query now also displays the CM,MO flags etc.
 
diff --git a/script/installinit.sh b/script/installinit.sh
index b5bdb0ff..cf01f5eb 100644
--- a/script/installinit.sh
+++ b/script/installinit.sh
@@ -121,9 +121,13 @@ fi
 if [ "$OSTYPE" = "FreeBSD" ]; then
     DISTNAME="FreeBSD"
     DISTVERS=`uname -r`
-    DISTVERS=${DISTVERS:0:3}
     PW="pw "
 fi
+if [ "$OSTYPE" = "NetBSD" ]; then
+    DISTNAME="NetBSD"
+    DISTVERS=`uname -r`
+fi
+
 
 
 log "+" "Distribution $OSTYPE $DISTNAME $DISTVERS"
@@ -572,16 +576,16 @@ fi
 
 #--------------------------------------------------------------------------
 #
-#  Adding scripts for FreeBSD
+#  Adding scripts for FreeBSD and NetBSD
 #
 #
-if [ "$DISTNAME" = "FreeBSD" ]; then
+if [ "$DISTNAME" = "FreeBSD" ] || [ "$DISTNAME" = "NetBSD" ]; then
     #
     # FreeBSD init
     #
     DISTINIT="$MBSE_ROOT/etc/rc"
-    echo "Adding FreeBSD style MBSE BBS start/stop scripts"
-    log "+" "Adding FreeBSD style MBSE BBS start/stop scripts"
+    echo "Adding $DISTNAME style MBSE BBS start/stop scripts"
+    log "+" "Adding $DISTNAME style MBSE BBS start/stop scripts"
     if [ -f /etc/rc.local ]; then
 	if [ "`grep MBSE /etc/rc.local`" = "" ]; then
 	    log "+" "Adding $MBSE_ROOT/etc/rc to existing /etc/rc.local"