$NetBSD: patch-af,v 1.1.1.1 2002/01/21 11:56:17 pooka Exp $ --- include/unixconf.h.orig Sun Jun 24 18:57:16 2001 +++ include/unixconf.h @@ -19,25 +19,25 @@ */ /* define exactly one of the following four choices */ -/* #define BSD 1 */ /* define for 4.n BSD */ +#define BSD 1 /* define for 4.n BSD */ /* also for relatives like SunOS 4.x, DG/UX, and */ /* older versions of Linux */ /* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */ /* Use BSD for < v3.0 */ /* "ULTRIX" not to be confused with "ultrix" */ -#define SYSV /* define for System V, Solaris 2.x, newer versions */ +/* #define SYSV /* define for System V, Solaris 2.x, newer versions */ /* of Linux */ /* #define HPUX */ /* Hewlett-Packard's Unix, version 6.5 or higher */ /* use SYSV for < v6.5 */ /* define any of the following that are appropriate */ -#define SVR4 /* use in addition to SYSV for System V Release 4 */ +/* #define SVR4 /* use in addition to SYSV for System V Release 4 */ /* including Solaris 2+ */ #define NETWORK /* if running on a networked system */ /* e.g. Suns sharing a playground through NFS */ /* #define SUNOS4 */ /* SunOS 4.x */ -#define LINUX /* Another Unix clone */ +/* #define LINUX */ /* Another Unix clone */ /* #define CYGWIN32 */ /* Unix on Win32 -- use with case sensitive defines */ /* #define GENIX */ /* Yet Another Unix Clone */ /* #define HISX */ /* Bull Unix for XPS Machines */ @@ -47,7 +47,7 @@ * job control (note that AIX is SYSV otherwise) * Also define this for AIX 3.2 */ -#define TERMINFO /* uses terminfo rather than termcap */ +/* #define TERMINFO /* uses terminfo rather than termcap */ /* Should be defined for most SYSV, SVR4 (including * Solaris 2+), HPUX, and Linux systems. In * particular, it should NOT be defined for the UNIXPC @@ -168,11 +168,15 @@ #ifdef MAIL # if defined(BSD) || defined(ULTRIX) +# ifdef __NetBSD__ +#define DEF_MAILREADER "/usr/bin/mail" +# else # ifdef AMS #define AMS_MAILBOX "/Mailbox" # else #define DEF_MAILREADER "/usr/ucb/Mail" -# endif +# endif +# endif #else # if defined(SYSV) || defined(DGUX) || defined(HPUX) # if defined(M_XENIX) || defined(__FreeBSD__)