From: Nigel Metheringham Date: Fri, 13 Nov 2009 12:18:35 +0000 (+0000) Subject: Removed NetBSD3 support as no longer needed. Fixes: #908 X-Git-Tag: exim-4_70~1 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/9bf3d68ffa00457501303619e881bca55a1e3630 Removed NetBSD3 support as no longer needed. Fixes: #908 --- diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 0d6e81fac..5babd1e7e 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.591 2009/11/12 13:02:16 nm4 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.592 2009/11/13 12:18:35 nm4 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -153,7 +153,9 @@ NM/35 Bugzilla 39: Base64 decode bug fixes NM/36 Bugzilla 909: Correct connect() call in dcc code -NM/36 Bugzilla 910: Correct issue with relaxed/simple handling +NM/37 Bugzilla 910: Correct issue with relaxed/simple handling + +NM/38 Bugzilla 908: Removed NetBSD3 support as no longer needed Exim version 4.69 diff --git a/src/OS/Makefile-NetBSD3 b/src/OS/Makefile-NetBSD3 deleted file mode 100644 index 68ca52a8b..000000000 --- a/src/OS/Makefile-NetBSD3 +++ /dev/null @@ -1,27 +0,0 @@ -# $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 deleted file mode 100644 index 3e72a09da..000000000 --- a/src/OS/os.h-NetBSD3 +++ /dev/null @@ -1,17 +0,0 @@ -/* $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 b4662bb0d..7894de640 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.5 2006/03/16 14:00:50 ph10 Exp $ +# $Cambridge: exim/src/scripts/os-type,v 1.6 2009/11/13 12:18:35 nm4 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,11 +83,7 @@ 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;; +NetBSD*) os=NetBSD;; openbsd*) os=OpenBSD;; osf1) os=OSF1;; qnx*) os=QNX;;