$NetBSD: patch-af,v 1.1 1999/12/24 22:30:01 pooka Exp $

--- include/unixconf.h.orig	Sat Dec 11 07:20:51 1999
+++ include/unixconf.h	Thu Dec 23 22:14:04 1999
@@ -19,20 +19,20 @@
  */
 
 /* 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 */
@@ -45,7 +45,7 @@
 /* #define AIX_31 */	/* In AIX 3.1 (IBM RS/6000) use BSD ioctl's to gain
 			 * 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
@@ -160,11 +160,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)
 #  ifdef M_XENIX
@@ -185,7 +189,6 @@
 #endif	/* MAIL */
 
 
-
 #ifdef COMPRESS
 /* Some implementations of compress need a 'quiet' option.
  * If you've got one of these versions, put -q here.
@@ -211,7 +214,7 @@
 # endif
 #endif /* _AUX_SOURCE */
 
-#if defined(LINUX) || defined(bsdi)
+#if defined(LINUX) || defined(bsdi) || defined(__NetBSD__)
 # ifndef POSIX_TYPES
 #  define POSIX_TYPES
 # endif
@@ -272,7 +275,7 @@
 #endif
 
 #if defined(BSD) || defined(ULTRIX)
-# if !defined(DGUX) && !defined(SUNOS4)
+# if !defined(DGUX) && !defined(SUNOS4) && !defined(__NetBSD__)
 #define memcpy(d, s, n)		bcopy(s, d, n)
 #define memcmp(s1, s2, n)	bcmp(s2, s1, n)
 # endif
