3 files changed, 50 insertions, 1 deletions
diff --git a/src/OS/Makefile-NetBSD3 b/src/OS/Makefile-NetBSD3
new file mode 100644
index 000000000..68ca52a8b
--- /dev/null
+++ b/src/OS/Makefile-NetBSD3
@@ -0,0 +1,27 @@
+# $Cambridge: exim/src/OS/Makefile-NetBSD3,v 1.1 2006/03/16 14:00:50 ph10 Exp $
+
+# Exim: OS-specific make file for NetBSD (ELF object format)
+
+CHOWN_COMMAND=/usr/sbin/chown
+CFLAGS=-O
+
+HAVE_SA_LEN=YES
+HAVE_IPV6=YES
+LIBS=-lcrypt -lm -lutil
+
+X11=/usr/X11R6
+XINCLUDE=-I$(X11)/include
+XLFLAGS=-L$(X11)/lib
+X11_LD_LIB=$(X11)/lib
+
+EXIWHAT_PS_ARG=-ax
+EXIWHAT_EGREP_ARG='/exim( |$$)'
+EXIWHAT_KILL_SIGNAL=-USR1
+
+# NetBSD always ships with Berkeley DB
+USE_DB=yes
+
+# NetBSD ELF linker needs a -R flag.
+XLFLAGS+=-Wl,-R$(X11)/lib/
+
+# End
diff --git a/src/OS/os.h-NetBSD3 b/src/OS/os.h-NetBSD3
new file mode 100644
index 000000000..3e72a09da
--- /dev/null
+++ b/src/OS/os.h-NetBSD3
@@ -0,0 +1,17 @@
+/* $Cambridge: exim/src/OS/os.h-NetBSD3,v 1.1 2006/03/16 14:00:50 ph10 Exp $
+
+/* Exim: OS-specific C header file for NetBSD */
+
+#define HAVE_BSD_GETLOADAVG
+#define HAVE_SETCLASSCONTEXT
+#define HAVE_MMAP
+#define HAVE_SYS_MOUNT_H
+#define HAVE_SYS_STATVFS_H
+#define SIOCGIFCONF_GIVES_ADDR
+
+typedef struct flock flock_t;
+
+#define os_strsignal strsignal
+#define OS_STRSIGNAL
+
+/* End */
diff --git a/src/scripts/os-type b/src/scripts/os-type
index 8fe574d93..b4662bb0d 100755
--- a/src/scripts/os-type
+++ b/src/scripts/os-type
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Cambridge: exim/src/scripts/os-type,v 1.4 2005/06/27 10:40:14 ph10 Exp $
+# $Cambridge: exim/src/scripts/os-type,v 1.5 2006/03/16 14:00:50 ph10 Exp $
 
 # Shell script to determine the operating system type. Some of the heuristics
 # herein have accumulated over the years and may not strictly be needed now,
@@ -83,6 +83,11 @@ linux)      os=Linux;;
 linux-*)    os=Linux;;
 Linux-*)    os=Linux;;
 netbsd*)    os=NetBSD;;
+NetBSD*)    version=`uname -r`
+            case "$version" in
+            3.*) os=NetBSD3;;
+            *)   os=NetBSD;;
+            esac;;
 openbsd*)   os=OpenBSD;;
 osf1)       os=OSF1;;
 qnx*)       os=QNX;;