diff -urhN ../exim-3.35/OS/Makefile-NetBSDDebian ./OS/Makefile-NetBSDDebian
--- ../exim-3.35/OS/Makefile-NetBSDDebian	Thu Jan  1 00:00:00 1970
+++ ./OS/Makefile-NetBSDDebian	Thu May  9 19:08:22 2002
@@ -0,0 +1,23 @@
+# Exim: OS-specific make file for Linux. This is for modern Linuxes,
+# which use libc6.
+
+BASENAME_COMMAND=look_for_it
+
+CFLAGS = -O2 -g -Wall
+
+DBMLIB = -ldb
+USE_DB = yes
+
+LIBS = -lcrypt -lpam
+LIBRESOLV = -lresolv
+
+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_ARG=-USR1
+
+# End
diff -urhN ../exim-3.35/OS/os.h-Linux ./OS/os.h-Linux
--- ../exim-3.35/OS/os.h-Linux	Thu May  9 21:47:45 2002
+++ ./OS/os.h-Linux	Thu May  9 19:07:08 2002
@@ -23,3 +23,8 @@
 extern struct ip_address_item *os_find_running_interfaces_linux(void);
 
 /* End */
+
+/* Fudge added because this Linux doesn't appear to have a definition
+for ip_options in /usr/include/linux/ip.h. */
+
+#define ip_options options
diff -urhN ../exim-3.35/OS/os.h-NetBSDDebian ./OS/os.h-NetBSDDebian
--- ../exim-3.35/OS/os.h-NetBSDDebian	Thu Jan  1 00:00:00 1970
+++ ./OS/os.h-NetBSDDebian	Thu May  9 19:09:13 2002
@@ -0,0 +1,13 @@
+/* Exim: OS-specific C header file for NetBSD */
+
+#define HAVE_BSD_GETLOADAVG
+#define HAVE_MMAP
+#define HAVE_SYS_MOUNT_H
+#define SIOCGIFCONF_GIVES_ADDR
+
+typedef struct flock flock_t;
+
+#define os_strsignal strsignal
+#define OS_STRSIGNAL
+
+/* End */
diff -urhN ../exim-3.35/debian/editme-diff ./debian/editme-diff
--- ../exim-3.35/debian/editme-diff	Thu May  9 21:47:48 2002
+++ ./debian/editme-diff	Thu May  9 20:29:04 2002
@@ -1,5 +1,5 @@
---- src/EDITME	Wed Dec 19 11:50:26 2001
-+++ Local/Makefile	Sat Jan 19 13:37:44 2002
+--- src/EDITME	Tue Feb 19 10:10:41 2002
++++ Local/Makefile	Thu May  9 19:22:19 2002
 @@ -74,8 +74,8 @@
  # for processing log files. If you haven't got Perl, Exim will still build and
  # run; you just won't be able to run those utilities.
@@ -84,10 +84,9 @@
 -
 -# LOOKUP_CDB=yes
 -# LOOKUP_DNSDB=yes
--# LOOKUP_LDAP=yes
 +LOOKUP_CDB=yes
 +LOOKUP_DNSDB=yes
-+LOOKUP_LDAP=yes
+ # LOOKUP_LDAP=yes
  # LOOKUP_MYSQL=yes
 -# LOOKUP_NIS=yes
 +LOOKUP_NIS=yes
@@ -99,7 +98,7 @@
  
  # LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
 -# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq
-+LOOKUP_LIBS=-lldap -llber
++LOOKUP_LIBS=
  
  # If you have set LDAP=yes, you should set LDAP_LIB_TYPE to indicate which LDAP
  # library you have. Unfortunately, though most of their functions are the
diff -urhN ../exim-3.35/debian/rules ./debian/rules
--- ../exim-3.35/debian/rules	Thu May  9 21:47:48 2002
+++ ./debian/rules	Thu May  9 20:36:25 2002
@@ -16,13 +16,13 @@
 	patch -o Local/Makefile src/EDITME debian/editme-diff
 	# This cp can be replaced with a patch like the one above if needed
 	cp exim_monitor/EDITME Local/eximon.conf
-	$(MAKE)
+	EXIM_OSTYPE=NetBSDDebian $(MAKE)
 	touch build
 
 clean:
 	$(checkdir)
 	-rm -f build
-	-( test -d build-`scripts/os-type`-`scripts/arch-type` && $(MAKE) clean)
+	-( test -d build-`scripts/os-type`-`scripts/arch-type` && EXIM_OSTYPE=NetBSDDebian $(MAKE) clean)
 	-rm -rf build-`scripts/os-type`-`scripts/arch-type`
 	-rm -rf Local
 	-rm -rf util/convert4r3 util/exi* util/transport-filter.pl
@@ -54,7 +54,7 @@
 	install -d debian/tmp/etc/cron.d
 	install -d debian/tmp/etc/ppp/ip-up.d
 	# Make install does most stuff for us
-	$(MAKE) inst_conf=`pwd`/debian/tmp/usr/share/doc/exim/example.conf \
+	EXIM_OSTYPE=NetBSDDebian $(MAKE) inst_conf=`pwd`/debian/tmp/usr/share/doc/exim/example.conf \
                 inst_dest=`pwd`/debian/tmp/usr/sbin install
 	# But eximon wants to go in a different package
 	mv debian/tmp/usr/sbin/eximon* .
diff -urhN ../exim-3.35/exim_monitor/em_TextPop.c ./exim_monitor/em_TextPop.c
--- ../exim-3.35/exim_monitor/em_TextPop.c	Tue Feb 19 10:10:46 2002
+++ ./exim_monitor/em_TextPop.c	Thu May  9 19:14:25 2002
@@ -71,7 +71,9 @@
 #include <X11/Xos.h>		/* for O_RDONLY */
 #include <errno.h>
 
+#ifndef __NetBSD__
 extern int errno, sys_nerr;
+#endif
 /* extern char* sys_errlist[]; */
 
 #define DISMISS_NAME  ("cancel")