Completely rework how tools/compat is done. Purge all uses/references to

_NETBSD_SOURCE as this makes cross building from older/newer versions of NetBSD harder, not easier (and also makes the resulting tools 'different') Wrap all required code with the inclusion of nbtool_config.h, attempt to only use POSIX code in all places (or when reasonable test w. configure and provide definitions: ala u_int, etc). Reviewed by lukem. Tested on FreeBSD 4.9, Redhat Linux ES3, NetBSD 1.6.2 x86 NetBSD current (x86 and amd64) and Solaris 9. Fixes PR's: PR#17762 PR#25944
2004-06-20 22:20:14 +00:00 · 2004-06-20 22:20:14 +00:00 · b2f782612f
parent fa985b27a7
commit b2f782612f
127 changed files with 1934 additions and 984 deletions
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@ -1,4 +1,4 @@
-/*	$NetBSD: ar_io.c,v 1.40 2004/05/11 17:12:26 christos Exp $	*/
+/*	$NetBSD: ar_io.c,v 1.41 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1992 Keith Muller.
@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)ar_io.c	8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: ar_io.c,v 1.40 2004/05/11 17:12:26 christos Exp $");
+__RCSID("$NetBSD: ar_io.c,v 1.41 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* not lint */

@ -855,8 +855,12 @@ ar_write(char *buf, int bsz)
 		/*
 		 * if file is out of space, handle it like a return of 0
 		 */
-		if ((errno == ENOSPC) || (errno == EFBIG) || (errno == EDQUOT))
+		if ((errno == ENOSPC) || (errno == EFBIG))
 			res = lstrval = 0;
+#ifdef EDQUOT
+		if (errno == EDQUOT)
+			res = lstrval = 0;
+#endif
 		break;
 	case ISTAPE:
 	case ISCHR:
--- a/bin/pax/file_subs.c
+++ b/bin/pax/file_subs.c
@ -1,4 +1,4 @@
-/*	$NetBSD: file_subs.c,v 1.46 2004/05/03 02:22:54 christos Exp $	*/
+/*	$NetBSD: file_subs.c,v 1.47 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1992 Keith Muller.
@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)file_subs.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: file_subs.c,v 1.46 2004/05/03 02:22:54 christos Exp $");
+__RCSID("$NetBSD: file_subs.c,v 1.47 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* not lint */

@ -731,7 +731,7 @@ set_ftime(char *fnm, time_t mtime, time_t atime, int frc)
 		 * set. We get the current values of the times if we need them.
 		 */
 		if (lstat(fnm, &sb) == 0) {
-#ifdef BSD4_4
+#if BSD4_4 && !HAVE_NBTOOL_CONFIG_H
 			if (!patime)
 				TIMESPEC_TO_TIMEVAL(&tv[0], &sb.st_atimespec);
 			if (!pmtime)
--- a/bin/pax/ftree.c
+++ b/bin/pax/ftree.c
@ -1,4 +1,4 @@
-/*	$NetBSD: ftree.c,v 1.30 2004/06/19 02:27:00 christos Exp $	*/
+/*	$NetBSD: ftree.c,v 1.31 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1992 Keith Muller.
@ -78,7 +78,7 @@
 #if 0
 static char sccsid[] = "@(#)ftree.c	8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: ftree.c,v 1.30 2004/06/19 02:27:00 christos Exp $");
+__RCSID("$NetBSD: ftree.c,v 1.31 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* not lint */

@ -522,7 +522,7 @@ next_file(ARCHD *arcn)
 			statbuf.st_flags = ftnode->st_flags;
 #endif
 		if (ftnode->flags & F_TIME)
-#ifdef BSD4_4
+#if BSD4_4 && !HAVE_NBTOOL_CONFIG_H
 			statbuf.st_mtimespec = ftnode->st_mtimespec;
 #else
 			statbuf.st_mtime = ftnode->st_mtimespec.tv_sec;
@ -726,6 +726,7 @@ next_file(ARCHD *arcn)
 			arcn->ln_name[cnt] = '\0';
 			arcn->ln_nlen = cnt;
 			break;
+#ifdef S_IFSOCK
 		case S_IFSOCK:
 			/*
 			 * under BSD storing a socket is senseless but we will
@ -734,6 +735,7 @@ next_file(ARCHD *arcn)
 			 */
 			arcn->type = PAX_SCK;
 			break;
+#endif
 		case S_IFIFO:
 			arcn->type = PAX_FIF;
 			break;
--- a/bin/pax/getoldopt.c
+++ b/bin/pax/getoldopt.c
@ -1,4 +1,4 @@
-/*	$NetBSD: getoldopt.c,v 1.19 2003/10/27 00:12:41 lukem Exp $	*/
+/*	$NetBSD: getoldopt.c,v 1.20 2004/06/20 22:20:14 jmc Exp $	*/

 /*
 * Plug-compatible replacement for getopt() for parsing tar-like
@ -15,10 +15,14 @@

 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: getoldopt.c,v 1.19 2003/10/27 00:12:41 lukem Exp $");
+__RCSID("$NetBSD: getoldopt.c,v 1.20 2004/06/20 22:20:14 jmc Exp $");
 #endif /* not lint */

+#if HAVE_NBTOOL_CONFIG_H
+#include "compat_getopt.h"
+#else
 #include <getopt.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@ -1,4 +1,4 @@
-/*	$NetBSD: options.c,v 1.75 2004/06/19 02:27:00 christos Exp $	*/
+/*	$NetBSD: options.c,v 1.76 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1992 Keith Muller.
@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: options.c,v 1.75 2004/06/19 02:27:00 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.76 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* not lint */

@ -53,7 +53,11 @@ __RCSID("$NetBSD: options.c,v 1.75 2004/06/19 02:27:00 christos Exp $");
 #include <sys/param.h>
 #include <ctype.h>
 #include <errno.h>
+#if HAVE_NBTOOL_CONFIG_H
+#include "compat_getopt.h"
+#else
 #include <getopt.h>
+#endif
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/bin/pax/pax.c
+++ b/bin/pax/pax.c
@ -1,4 +1,4 @@
-/*	$NetBSD: pax.c,v 1.34 2004/05/11 17:12:26 christos Exp $	*/
+/*	$NetBSD: pax.c,v 1.35 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1992 Keith Muller.
@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
 #if 0
 static char sccsid[] = "@(#)pax.c	8.2 (Berkeley) 4/18/94";
 #else
-__RCSID("$NetBSD: pax.c,v 1.34 2004/05/11 17:12:26 christos Exp $");
+__RCSID("$NetBSD: pax.c,v 1.35 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* not lint */

@ -337,9 +337,11 @@ sig_cleanup(int which_sig)
 	 * will clearly see the message on a line by itself.
 	 */
 	vflag = vfpart = 1;
+#ifdef SIGXCPU
 	if (which_sig == SIGXCPU)
 		tty_warn(0, "CPU time limit reached, cleaning up.");
 	else
+#endif
 		tty_warn(0, "Signal caught, cleaning up.");

 	/* delete any open temporary file */
@ -416,11 +418,23 @@ gen_init(void)
 	 */
 	if ((sigemptyset(&s_mask) < 0) || (sigaddset(&s_mask, SIGTERM) < 0) ||
 	    (sigaddset(&s_mask,SIGINT) < 0)||(sigaddset(&s_mask,SIGHUP) < 0) ||
-	    (sigaddset(&s_mask,SIGPIPE) < 0)||(sigaddset(&s_mask,SIGQUIT)<0) ||
-	    (sigaddset(&s_mask,SIGXCPU) < 0)||(sigaddset(&s_mask,SIGXFSZ)<0)) {
+	    (sigaddset(&s_mask,SIGPIPE) < 0)||(sigaddset(&s_mask,SIGQUIT)<0)){
 		tty_warn(1, "Unable to set up signal mask");
 		return(-1);
 	}
+#ifdef SIGXCPU
+	if (sigaddset(&s_mask,SIGXCPU) < 0) {
+		tty_warn(1, "Unable to set up signal mask");
+		return(-1);
+	}
+#endif
+#ifdef SIGXFSZ
+	if (sigaddset(&s_mask,SIGXFSZ) < 0) {
+		tty_warn(1, "Unable to set up signal mask");
+		return(-1);
+	}
+#endif
+
 	memset(&n_hand, 0, sizeof n_hand);
 	n_hand.sa_mask = s_mask;
 	n_hand.sa_flags = 0;
@ -446,15 +460,19 @@ gen_init(void)
 	    (sigaction(SIGQUIT, &o_hand, &o_hand) < 0))
 		goto out;

+#ifdef SIGXCPU
 	if ((sigaction(SIGXCPU, &n_hand, &o_hand) < 0) &&
 	    (o_hand.sa_handler == SIG_IGN) &&
 	    (sigaction(SIGXCPU, &o_hand, &o_hand) < 0))
 		goto out;
-
+#endif
 	n_hand.sa_handler = SIG_IGN;
-	if ((sigaction(SIGPIPE, &n_hand, &o_hand) < 0) ||
-	    (sigaction(SIGXFSZ, &n_hand, &o_hand) < 0))
+	if (sigaction(SIGPIPE, &n_hand, &o_hand) < 0)
 		goto out;
+#ifdef SIGXFSZ
+	if (sigaction(SIGXFSZ, &n_hand, &o_hand) < 0)
+		goto out;
+#endif
 	return(0);

    out:
--- a/include/getopt.h
+++ b/include/getopt.h
@ -1,4 +1,4 @@
-/*	$NetBSD: getopt.h,v 1.5 2003/04/28 23:16:13 bjh21 Exp $	*/
+/*	$NetBSD: getopt.h,v 1.6 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -46,7 +46,7 @@
 /*
 * Gnu like getopt_long() and BSD4.4 getsubopt()/optreset extensions
 */
-#if defined(_NETBSD_SOURCE)
+#if defined(_NETBSD_SOURCE) || defined(HAVE_NBTOOL_CONFIG_H)
 #define no_argument        0
 #define required_argument  1
 #define optional_argument  2
@ -64,7 +64,9 @@ struct option {
 	/* if flag not NULL, value to set *flag to; else return value */
 	int val;
 };
+#endif

+#if defined(_NETBSD_SOURCE)
 __BEGIN_DECLS
 int getopt_long __P((int, char * const *, const char *,
    const struct option *, int *));
--- a/include/glob.h
+++ b/include/glob.h
@ -1,4 +1,4 @@
-/*	$NetBSD: glob.h,v 1.17 2003/08/07 09:44:10 agc Exp $	*/
+/*	$NetBSD: glob.h,v 1.18 2004/06/20 22:20:14 jmc Exp $	*/

 /*
 * Copyright (c) 1989, 1993
@ -81,7 +81,7 @@ typedef struct {
 #define	GLOB_NOMATCH	(-3)	/* No match, and GLOB_NOCHECK was not set. */
 #define	GLOB_NOSYS	(-4)	/* Implementation does not support function. */

-#if defined(_NETBSD_SOURCE)
+#if defined(_NETBSD_SOURCE) || defined(HAVE_NBTOOL_CONFIG_H)
 #define	GLOB_ALTDIRFUNC	0x0040	/* Use alternately specified directory funcs. */
 #define	GLOB_BRACE	0x0080	/* Expand braces ala csh. */
 #define	GLOB_MAGCHAR	0x0100	/* Pattern had globbing characters. */
--- a/include/pwd.h
+++ b/include/pwd.h
@ -1,4 +1,4 @@
-/*	$NetBSD: pwd.h,v 1.32 2003/10/13 15:36:33 agc Exp $	*/
+/*	$NetBSD: pwd.h,v 1.33 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1989, 1993
@ -68,7 +68,7 @@
 #include <sys/featuretest.h>
 #include <sys/types.h>

-#if defined(_NETBSD_SOURCE)
+#if defined(_NETBSD_SOURCE) || defined(HAVE_NBTOOL_CONFIG_H)
 #define	_PATH_PASSWD		"/etc/passwd"
 #define	_PATH_MASTERPASSWD	"/etc/master.passwd"
 #define	_PATH_MASTERPASSWD_LOCK	"/etc/ptmp"
--- a/lib/libc/db/btree/bt_conv.c
+++ b/lib/libc/db/btree/bt_conv.c
@ -1,4 +1,4 @@
-/*	$NetBSD: bt_conv.c,v 1.10 2003/08/07 16:42:40 agc Exp $	*/
+/*	$NetBSD: bt_conv.c,v 1.11 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1990, 1993, 1994
@ -32,12 +32,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)bt_conv.c	8.5 (Berkeley) 8/17/94";
 #else
-__RCSID("$NetBSD: bt_conv.c,v 1.10 2003/08/07 16:42:40 agc Exp $");
+__RCSID("$NetBSD: bt_conv.c,v 1.11 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */

--- a/lib/libc/db/btree/bt_debug.c
+++ b/lib/libc/db/btree/bt_debug.c
@ -1,4 +1,4 @@
-/*	$NetBSD: bt_debug.c,v 1.10 2003/08/07 16:42:40 agc Exp $	*/
+/*	$NetBSD: bt_debug.c,v 1.11 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1990, 1993, 1994
@ -32,12 +32,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)bt_debug.c	8.5 (Berkeley) 8/17/94";
 #else
-__RCSID("$NetBSD: bt_debug.c,v 1.10 2003/08/07 16:42:40 agc Exp $");
+__RCSID("$NetBSD: bt_debug.c,v 1.11 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */

--- a/lib/libc/db/btree/bt_utils.c
+++ b/lib/libc/db/btree/bt_utils.c
@ -1,4 +1,4 @@
-/*	$NetBSD: bt_utils.c,v 1.9 2003/08/07 16:42:41 agc Exp $	*/
+/*	$NetBSD: bt_utils.c,v 1.10 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1990, 1993, 1994
@ -32,12 +32,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)bt_utils.c	8.8 (Berkeley) 7/20/94";
 #else
-__RCSID("$NetBSD: bt_utils.c,v 1.9 2003/08/07 16:42:41 agc Exp $");
+__RCSID("$NetBSD: bt_utils.c,v 1.10 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */

--- a/lib/libc/db/hash/hash_bigkey.c
+++ b/lib/libc/db/hash/hash_bigkey.c
@ -1,4 +1,4 @@
-/*	$NetBSD: hash_bigkey.c,v 1.17 2003/08/07 16:42:42 agc Exp $	*/
+/*	$NetBSD: hash_bigkey.c,v 1.18 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1990, 1993, 1994
@ -32,12 +32,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94";
 #else
-__RCSID("$NetBSD: hash_bigkey.c,v 1.17 2003/08/07 16:42:42 agc Exp $");
+__RCSID("$NetBSD: hash_bigkey.c,v 1.18 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */

--- a/lib/libc/db/hash/hash_buf.c
+++ b/lib/libc/db/hash/hash_buf.c
@ -1,4 +1,4 @@
-/*	$NetBSD: hash_buf.c,v 1.10 2003/08/07 16:42:42 agc Exp $	*/
+/*	$NetBSD: hash_buf.c,v 1.11 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1990, 1993, 1994
@ -32,12 +32,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)hash_buf.c	8.5 (Berkeley) 7/15/94";
 #else
-__RCSID("$NetBSD: hash_buf.c,v 1.10 2003/08/07 16:42:42 agc Exp $");
+__RCSID("$NetBSD: hash_buf.c,v 1.11 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */

--- a/lib/libc/db/hash/hash_func.c
+++ b/lib/libc/db/hash/hash_func.c
@ -1,4 +1,4 @@
-/*	$NetBSD: hash_func.c,v 1.9 2003/08/07 16:42:42 agc Exp $	*/
+/*	$NetBSD: hash_func.c,v 1.10 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1990, 1993
@ -32,12 +32,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)hash_func.c	8.2 (Berkeley) 2/21/94";
 #else
-__RCSID("$NetBSD: hash_func.c,v 1.9 2003/08/07 16:42:42 agc Exp $");
+__RCSID("$NetBSD: hash_func.c,v 1.10 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */

--- a/lib/libc/db/hash/hash_log2.c
+++ b/lib/libc/db/hash/hash_log2.c
@ -1,4 +1,4 @@
-/*	$NetBSD: hash_log2.c,v 1.8 2003/08/07 16:42:42 agc Exp $	*/
+/*	$NetBSD: hash_log2.c,v 1.9 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1990, 1993, 1994
@ -32,12 +32,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)hash_log2.c	8.2 (Berkeley) 5/31/94";
 #else
-__RCSID("$NetBSD: hash_log2.c,v 1.8 2003/08/07 16:42:42 agc Exp $");
+__RCSID("$NetBSD: hash_log2.c,v 1.9 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */

--- a/lib/libc/db/recno/rec_utils.c
+++ b/lib/libc/db/recno/rec_utils.c
@ -1,4 +1,4 @@
-/*	$NetBSD: rec_utils.c,v 1.9 2003/08/07 16:42:44 agc Exp $	*/
+/*	$NetBSD: rec_utils.c,v 1.10 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1990, 1993, 1994
@ -29,12 +29,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rec_utils.c	8.6 (Berkeley) 7/16/94";
 #else
-__RCSID("$NetBSD: rec_utils.c,v 1.9 2003/08/07 16:42:44 agc Exp $");
+__RCSID("$NetBSD: rec_utils.c,v 1.10 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */

--- a/lib/libc/gen/__fts13.c
+++ b/lib/libc/gen/__fts13.c
@ -1,4 +1,4 @@
-/*	$NetBSD: __fts13.c,v 1.42 2003/10/27 00:12:42 lukem Exp $	*/
+/*	$NetBSD: __fts13.c,v 1.43 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1990, 1993, 1994
@ -29,12 +29,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #else
-__RCSID("$NetBSD: __fts13.c,v 1.42 2003/10/27 00:12:42 lukem Exp $");
+__RCSID("$NetBSD: __fts13.c,v 1.43 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */

--- a/lib/libc/gen/pwcache.c
+++ b/lib/libc/gen/pwcache.c
@ -1,4 +1,4 @@
-/*	$NetBSD: pwcache.c,v 1.28 2004/06/18 20:34:58 thorpej Exp $	*/
+/*	$NetBSD: pwcache.c,v 1.29 2004/06/20 22:20:14 jmc Exp $	*/

 /*-
 * Copyright (c) 1992 Keith Muller.
@ -81,7 +81,7 @@
 #if 0
 static char sccsid[] = "@(#)cache.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: pwcache.c,v 1.28 2004/06/18 20:34:58 thorpej Exp $");
+__RCSID("$NetBSD: pwcache.c,v 1.29 2004/06/20 22:20:14 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */

@ -111,7 +111,7 @@ __weak_alias(pwcache_userdb,_pwcache_userdb)
 __weak_alias(pwcache_groupdb,_pwcache_groupdb)
 #endif

-#if !HAVE_PWCACHE_USERDB
+#if !HAVE_PWCACHE_USERDB || HAVE_NBTOOL_CONFIG_H
 #include "pwcache.h"

 /*
--- a/lib/libc/stdio/fparseln.c
+++ b/lib/libc/stdio/fparseln.c
@ -1,4 +1,4 @@
-/*	$NetBSD: fparseln.c,v 1.4 2004/05/11 17:31:04 drochner Exp $	*/
+/*	$NetBSD: fparseln.c,v 1.5 2004/06/20 22:20:15 jmc Exp $	*/

 /*
 * Copyright (c) 1997 Christos Zoulas.  All rights reserved.
@ -31,7 +31,7 @@

 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fparseln.c,v 1.4 2004/05/11 17:31:04 drochner Exp $");
+__RCSID("$NetBSD: fparseln.c,v 1.5 2004/06/20 22:20:15 jmc Exp $");
 #endif /* LIBC_SCCS and not lint */

 #include "namespace.h"
@ -56,7 +56,7 @@ __weak_alias(fparseln,_fparseln)
 #define FUNLOCKFILE(fp)
 #endif

-#ifdef _REENTRANT
+#if defined(_REENTRANT) && !HAVE_NBTOOL_CONFIG_H
 #define __fgetln(f, l) __fgetstr(f, l, '\n')
 #else
 #define __fgetln(f, l) fgetln(f, l)
--- a/lib/libc/stdlib/getopt_long.c
+++ b/lib/libc/stdlib/getopt_long.c
@ -1,4 +1,4 @@
-/*	$NetBSD: getopt_long.c,v 1.16 2003/10/27 00:12:42 lukem Exp $	*/
+/*	$NetBSD: getopt_long.c,v 1.17 2004/06/20 22:20:15 jmc Exp $	*/

 /*-
 * Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -36,9 +36,13 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getopt_long.c,v 1.16 2003/10/27 00:12:42 lukem Exp $");
+__RCSID("$NetBSD: getopt_long.c,v 1.17 2004/06/20 22:20:15 jmc Exp $");
 #endif /* LIBC_SCCS and not lint */

 #include "namespace.h"
@ -46,7 +50,11 @@ __RCSID("$NetBSD: getopt_long.c,v 1.16 2003/10/27 00:12:42 lukem Exp $");
 #include <assert.h>
 #include <err.h>
 #include <errno.h>
+#if HAVE_NBTOOL_CONFIG_H
+#include "compat_getopt.h"
+#else
 #include <getopt.h>
+#endif
 #include <stdlib.h>
 #include <string.h>

--- a/lib/libc/string/strmode.c
+++ b/lib/libc/string/strmode.c
@ -1,4 +1,4 @@
-/*	$NetBSD: strmode.c,v 1.15 2003/08/07 16:43:51 agc Exp $	*/
+/*	$NetBSD: strmode.c,v 1.16 2004/06/20 22:20:15 jmc Exp $	*/

 /*-
 * Copyright (c) 1990, 1993
@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)strmode.c	8.3 (Berkeley) 8/15/94";
 #else
-__RCSID("$NetBSD: strmode.c,v 1.15 2003/08/07 16:43:51 agc Exp $");
+__RCSID("$NetBSD: strmode.c,v 1.16 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */

@ -80,9 +80,11 @@ strmode(mode, p)
 	case S_IFLNK:			/* symbolic link */
 		*p++ = 'l';
 		break;
+#ifdef S_IFSOCK
 	case S_IFSOCK:			/* socket */
 		*p++ = 's';
 		break;
+#endif
 #ifdef S_IFIFO
 	case S_IFIFO:			/* fifo */
 		*p++ = 'p';
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@ -1,4 +1,4 @@
-/*	$NetBSD: mknod.c,v 1.33 2004/06/17 23:15:07 christos Exp $	*/
+/*	$NetBSD: mknod.c,v 1.34 2004/06/20 22:20:15 jmc Exp $	*/

 /*-
 * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@ -43,13 +43,13 @@
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1998 The NetBSD Foundation, Inc.  All rights reserved.\n");
-__RCSID("$NetBSD: mknod.c,v 1.33 2004/06/17 23:15:07 christos Exp $");
+__RCSID("$NetBSD: mknod.c,v 1.34 2004/06/20 22:20:15 jmc Exp $");
 #endif /* not lint */

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
-#ifdef __NetBSD__
+#if !HAVE_NBTOOL_CONFIG_H
 #include <sys/sysctl.h>
 #endif

--- a/share/mk/bsd.hostprog.mk
+++ b/share/mk/bsd.hostprog.mk
@ -1,4 +1,4 @@
-#	$NetBSD: bsd.hostprog.mk,v 1.43 2004/06/10 00:29:58 lukem Exp $
+#	$NetBSD: bsd.hostprog.mk,v 1.44 2004/06/20 22:20:15 jmc Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94

 .include <bsd.init.mk>
@ -112,3 +112,21 @@ lint: ${LOBJS}
 .include <bsd.dep.mk>

 ${TARGETS}:	# ensure existence
+
+# Override YACC/LEX rules so nbtool_config.h can be forced as the 1st include
+.l.c:
+	${_MKTARGET_LEX}
+	${LEX.l} -o${.TARGET} ${.IMPSRC}
+	echo '#if HAVE_NBTOOL_CONFIG_H' > ${.TARGET}.1
+	echo '#include "nbtool_config.h"' >> ${.TARGET}.1
+	echo '#endif' >> ${.TARGET}.1
+	cat ${.TARGET} >> ${.TARGET}.1
+	mv ${.TARGET}.1 ${.TARGET}
+.y.c:
+	${_MKTARGET_YACC}
+	${YACC.y} -o ${.TARGET} ${.IMPSRC}
+	echo '#if HAVE_NBTOOL_CONFIG_H' > ${.TARGET}.1
+	echo '#include "nbtool_config.h"' >> ${.TARGET}.1
+	echo '#endif' >> ${.TARGET}.1
+	cat ${.TARGET} >> ${.TARGET}.1
+	mv ${.TARGET}.1 ${.TARGET}
--- a/tools/compat/Makefile
+++ b/tools/compat/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.30 2004/06/18 20:26:51 thorpej Exp $
+#	$NetBSD: Makefile,v 1.31 2004/06/20 22:20:15 jmc Exp $

 HOSTLIB=	nbcompat

@ -23,11 +23,8 @@ CPPFLAGS+=	-no-cpp-precomp
 # -D_FILE_OFFSET_BITS=64 produces a much more amenable `struct stat', and
 # other file ops, on many systems, without changing function names.

-# -D_NETBSD_SOURCE is necessary for some of the NetBSD headers that we
-# also use on the host system.
-
 CPPFLAGS+=	-I. -I./include -I${.CURDIR} -DHAVE_NBTOOL_CONFIG_H=1 \
-		-D_FILE_OFFSET_BITS=64 -D_NETBSD_SOURCE
+		-D_FILE_OFFSET_BITS=64

 .PATH:		${.CURDIR}/../../lib/libc/gen \
 		${.CURDIR}/../../lib/libc/hash \
--- a/tools/compat/compat_defs.h
+++ b/tools/compat/compat_defs.h
@ -1,4 +1,4 @@
-/*	$NetBSD: compat_defs.h,v 1.38 2004/06/18 20:24:03 thorpej Exp $	*/
+/*	$NetBSD: compat_defs.h,v 1.39 2004/06/20 22:20:15 jmc Exp $	*/

 #ifndef	__NETBSD_COMPAT_DEFS_H__
 #define	__NETBSD_COMPAT_DEFS_H__
@ -15,16 +15,25 @@
 #include <features.h>
 #endif

+/* So _NETBSD_SOURCE doesn't end up defined. Define enough to pull in standard
+   defs. Other platforms may need similiar defines. */
+#ifdef __NetBSD__
+#define _POSIX_SOURCE	1
+#define _POSIX_C_SOURCE	200112L
+#define _XOPEN_SOURCE 600
+#else
 #undef _POSIX_SOURCE
 #undef _POSIX_C_SOURCE
+#endif

 /* System headers needed for (re)definitions below. */

 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/param.h>
-#include <sys/stat.h>
+/* time.h needs to be pulled in first at least on netbsd w/o _NETBSD_SOURCE */
 #include <sys/time.h>
+#include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
@ -32,19 +41,7 @@
 #include <paths.h>
 #include <stdarg.h>
 #include <stdio.h>
-
-/* So extra NetBSD extentions don't get pulled in */
-#ifdef __NetBSD__
-#define _POSIX_C_SOURCE
-#undef _NETBSD_SOURCE
-#endif
-
 #include <stdlib.h>
-
-#ifdef __NetBSD__
-#undef _POSIX_C_SOURCE
-#endif
-
 #include <string.h>

 #if HAVE_SYS_CDEFS_H
@ -137,6 +134,18 @@ typedef int socklen_t;
 typedef unsigned long u_long;
 #endif

+#if !HAVE_U_CHAR
+typedef unsigned char u_char;
+#endif
+
+#if !HAVE_U_INT
+typedef unsigned int u_int;
+#endif
+
+#if !HAVE_U_SHORT
+typedef unsigned short u_short;
+#endif
+
 /* Prototypes for replacement functions. */

 #if !HAVE_ATOLL
@ -169,9 +178,26 @@ char *dirname(char *);
 #if HAVE_DIR_DD_FD
 #define dirfd(dirp) ((dirp)->dd_fd)
 #else
+/*XXX: Very hacky but no other way to bring this into scope w/o defining
+  _NETBSD_SOURCE which we're avoiding. */
+#ifdef __NetBSD__
+struct _dirdesc {
+        int     dd_fd;          /* file descriptor associated with directory */
+	long    dd_loc;         /* offset in current buffer */
+	long    dd_size;        /* amount of data returned by getdents */
+	char    *dd_buf;        /* data buffer */
+	int     dd_len;         /* size of data buffer */
+	off_t   dd_seek;        /* magic cookie returned by getdents */
+	long    dd_rewind;      /* magic cookie for rewinding */
+	int     dd_flags;       /* flags for readdir */
+	void    *dd_lock;       /* lock for concurrent access */
+};
+#define dirfd(dirp)     (((struct _dirdesc *)dirp)->dd_fd)
+#else
 #error cannot figure out how to turn a DIR * into a fd
 #endif
 #endif
+#endif

 #if !HAVE_ERR_H
 void err(int, const char *, ...);
@ -180,7 +206,7 @@ void warn(const char *, ...);
 void warnx(const char *, ...);
 #endif

-#if !HAVE_FGETLN
+#if !HAVE_FGETLN || defined(__NetBSD__)
 char *fgetln(FILE *, size_t *);
 #endif

@ -192,7 +218,7 @@ char *fgetln(FILE *, size_t *);
 int flock(int, int);
 #endif

-#if !HAVE_FPARSELN
+#if !HAVE_FPARSELN || defined(__NetBSD__)
 # define FPARSELN_UNESCESC	0x01
 # define FPARSELN_UNESCCONT	0x02
 # define FPARSELN_UNESCCOMM	0x04
@ -221,16 +247,33 @@ int lchmod(const char *, mode_t);
 int lchown(const char *, uid_t, gid_t);
 #endif

-#if !HAVE_MACHINE_BSWAP_H
-#define bswap16(x)	((((x) << 8) & 0xff00) | (((x) >> 8) & 0x00ff))
+#define __nbcompat_bswap16(x)	((((x) << 8) & 0xff00) | (((x) >> 8) & 0x00ff))

-#define bswap32(x)	((((x) << 24) & 0xff000000) | \
-			 (((x) <<  8) & 0x00ff0000) | \
-			 (((x) >>  8) & 0x0000ff00) | \
-			 (((x) >> 24) & 0x000000ff))
+#define __nbcompat_bswap32(x)	((((x) << 24) & 0xff000000) | \
+				 (((x) <<  8) & 0x00ff0000) | \
+				 (((x) >>  8) & 0x0000ff00) | \
+				 (((x) >> 24) & 0x000000ff))

-#define bswap64(x)	(((u_int64_t)bswap32((x)) << 32) | \
-			 ((u_int64_t)bswap32((x) >> 32)))
+#define __nbcompat_bswap64(x)	(((u_int64_t)bswap32((x)) << 32) | \
+				 ((u_int64_t)bswap32((x) >> 32)))
+
+#if !HAVE_BSWAP16
+#ifdef bswap16
+#undef bswap16
+#endif
+#define bswap16(x)	__nbcompat_bswap16(x)
+#endif
+#if !HAVE_BSWAP32
+#ifdef bswap32
+#undef bswap32
+#endif
+#define bswap32(x)	__nbcompat_bswap32(x)
+#endif
+#if !HAVE_BSWAP64
+#ifdef bswap64
+#undef bswap64
+#endif
+#define bswap64(x)	__nbcompat_bswap64(x)
 #endif

 #if !HAVE_MKSTEMP
@ -257,15 +300,11 @@ int pwcache_userdb(int (*)(int), void (*)(void),
 int gid_from_group(const char *, gid_t *);
 int pwcache_groupdb(int (*)(int), void (*)(void),
 		struct group * (*)(const char *), struct group * (*)(gid_t));
-# if HAVE_USER_FROM_UID
+#endif
 /* Make them use our version */
 #  define user_from_uid __nbcompat_user_from_uid
-# endif
-# if HAVE_GROUP_FROM_GID
 /* Make them use our version */
 #  define group_from_gid __nbcompat_group_from_gid
-# endif
-#endif

 #if !HAVE_PWRITE
 ssize_t pwrite(int, const void *, size_t, off_t);
@ -283,7 +322,7 @@ int setgroupent(int);
 int setpassent(int);
 #endif

-#if !HAVE_SETPROGNAME
+#if !HAVE_SETPROGNAME || defined(__NetBSD__)
 const char *getprogname(void);
 void setprogname(const char *);
 #endif
@ -300,7 +339,7 @@ size_t strlcat(char *, const char *, size_t);
 size_t strlcpy(char *, const char *, size_t);
 #endif

-#if !HAVE_STRSEP
+#if !HAVE_STRSEP || defined(__NetBSD__)
 char *strsep(char **, const char *);
 #endif

@ -486,29 +525,61 @@ int	 cgetustr(char *, const char *, char **);

 /* <sys/endian.h> */

-#ifdef HAVE_SYS_ENDIAN_H
-#include <sys/endian.h>
-#else
 #if WORDS_BIGENDIAN
+#if !HAVE_HTOBE16
 #define htobe16(x)	(x)
+#endif
+#if !HAVE_HTOBE32
 #define htobe32(x)	(x)
+#endif
+#if !HAVE_HTOBE64
 #define htobe64(x)	(x)
+#endif
+#if !HAVE_HTOLE16
 #define htole16(x)	bswap16((u_int16_t)(x))
+#endif
+#if !HAVE_HTOLE32
 #define htole32(x)	bswap32((u_int32_t)(x))
+#endif
+#if !HAVE_HTOLE64
 #define htole64(x)	bswap64((u_int64_t)(x))
+#endif
 #else
+#if !HAVE_HTOBE16
 #define htobe16(x)	bswap16((u_int16_t)(x))
+#endif
+#if !HAVE_HTOBE32
 #define htobe32(x)	bswap32((u_int32_t)(x))
+#endif
+#if !HAVE_HTOBE64
 #define htobe64(x)	bswap64((u_int64_t)(x))
+#endif
+#if !HAVE_HTOLE16
 #define htole16(x)	(x)
+#endif
+#if !HAVE_HTOLE32
 #define htole32(x)	(x)
+#endif
+#if !HAVE_HTOLE64
 #define htole64(x)	(x)
 #endif
+#endif
+#if !HAVE_BE16TOH
 #define be16toh(x)	htobe16(x)
+#endif
+#if !HAVE_BE32TOH
 #define be32toh(x)	htobe32(x)
+#endif
+#if !HAVE_BE64TOH
 #define be64toh(x)	htobe64(x)
+#endif
+#if !HAVE_LE16TOH
 #define le16toh(x)	htole16(x)
+#endif
+#if !HAVE_LE32TOH
 #define le32toh(x)	htole32(x)
+#endif
+#if !HAVE_LE64TOH
 #define le64toh(x)	htole64(x)
 #endif

@ -594,6 +665,19 @@ int	 cgetustr(char *, const char *, char **);
 #endif
 #endif

+/* Protected by _NETBSD_SOURCE otherwise. */
+#if HAVE_STRUCT_STAT_ST_FLAGS && defined(__NetBSD__)
+#define UF_SETTABLE     0x0000ffff
+#define UF_NODUMP       0x00000001
+#define UF_IMMUTABLE    0x00000002
+#define UF_APPEND       0x00000004
+#define UF_OPAQUE       0x00000008
+#define SF_SETTABLE     0xffff0000
+#define SF_ARCHIVED     0x00010000
+#define SF_IMMUTABLE    0x00020000
+#define SF_APPEND       0x00040000
+#endif
+
 /* <sys/syslimits.h> */

 #ifndef LINE_MAX
@ -633,6 +717,26 @@ int	 cgetustr(char *, const char *, char **);

 /* <sys/types.h> */

+#ifdef major
+#undef major
+#endif
+#define major(x)        ((int32_t)((((x) & 0x000fff00) >>  8)))
+
+#ifdef minor
+#undef minor
+#endif
+#define minor(x)        ((int32_t)((((x) & 0xfff00000) >> 12) | \
+                                   (((x) & 0x000000ff) >>  0)))
+#ifdef makedev
+#undef makedev
+#endif
+#define makedev(x,y)    ((dev_t)((((x) <<  8) & 0x000fff00) | \
+			(((y) << 12) & 0xfff00000) | \
+			(((y) <<  0) & 0x000000ff)))
+#ifndef NBBY
+#define NBBY 8
+#endif
+
 #if !HAVE_U_QUAD_T
 /* #define, not typedef, as quad_t exists as a struct on some systems */
 #define quad_t long long
--- a/tools/compat/compat_getopt.h
+++ b/tools/compat/compat_getopt.h
@ -0,0 +1,13 @@
+/*      $NetBSD: compat_getopt.h,v 1.1 2004/06/20 22:20:15 jmc Exp $ */
+
+/* We unconditionally use the NetBSD getopt.h in libnbcompat. */
+
+#if HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+
+#define option __nbcompat_option
+#ifdef _GETOPT_H_
+#undef _GETOPT_H_
+#endif
+#include "../../include/getopt.h"
--- a/tools/compat/configure
+++ b/tools/compat/configure
--- a/tools/compat/configure.ac
+++ b/tools/compat/configure.ac
@ -1,4 +1,4 @@
-#	$NetBSD: configure.ac,v 1.43 2004/06/18 20:07:31 thorpej Exp $
+#	$NetBSD: configure.ac,v 1.44 2004/06/20 22:20:15 jmc Exp $
 #
 # Autoconf definition file for libnbcompat.
 #
@ -7,6 +7,21 @@ AC_INIT([libnbcompat], [noversion], [lib-bug-people@NetBSD.org])
 AC_CONFIG_HEADERS(nbtool_config.h)
 AC_CONFIG_FILES(defs.mk)

+AC_DEFUN([AC_NETBSD],
+[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
+      AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
+      AC_MSG_CHECKING([for NetBSD])
+      AC_EGREP_CPP(yes,
+      [#ifdef __NetBSD__
+	yes
+	#endif
+	],
+	[AC_MSG_RESULT([yes])
+	AC_DEFINE(_POSIX_SOURCE, 1) AC_DEFINE(_POSIX_C_SOURCE, 200112L) AC_DEFINE(_XOPEN_SOURCE, 600)],
+	[AC_MSG_RESULT([no])])
+])# AC_NETBSD
+
+AC_NETBSD
 AC_PATH_PROG(BSHELL, sh, )
 if test x"$BSHELL" = x; then
 	AC_MSG_ERROR([sh must be somewhere on \$PATH])
@ -37,11 +52,11 @@ AC_CHECK_HEADERS(sys/ioctl.h sys/mman.h sys/mtio.h sys/param.h \
 # Find headers that may not be available.
 AC_HEADER_DIRENT
 AC_CHECK_HEADERS(sys/sysmacros.h sys/syslimits.h \
-	features.h malloc.h sys/poll.h stddef.h)
+	getopt.h features.h malloc.h sys/poll.h stddef.h)
 AC_CHECK_HEADERS(machine/bswap.h sys/cdefs.h sys/endian.h sys/featuretest.h \
 	err.h inttypes.h libgen.h paths.h stdint.h util.h,,
 	[test -f include/$ac_header || touch include/$ac_header])
-AC_CHECK_HEADERS(rpc/types.h getopt.h netconfig.h,,
+AC_CHECK_HEADERS(rpc/types.h netconfig.h,,
 	[echo '#include "nbtool_config.h"' >include/$ac_header.new
 	echo '#include "'$srcdir/../../include/$ac_header'"' >>include/$ac_header.new
 	if cmp include/$ac_header.new include/$ac_header >/dev/null 2>&1; then
@ -52,7 +67,7 @@ AC_CHECK_HEADERS(rpc/types.h getopt.h netconfig.h,,

 # Typedefs.
 AC_TYPE_SIZE_T
-AC_CHECK_TYPES([id_t, long long, u_long, u_quad_t])
+AC_CHECK_TYPES([id_t, long long, u_long, u_char, u_short, u_int, u_quad_t])
 AC_CHECK_TYPE(socklen_t, [AC_DEFINE(HAVE_SOCKLEN_T)],,
 [#include <sys/types.h>
 #include <sys/socket.h>])
@ -105,6 +120,14 @@ AC_CHECK_FUNCS(atoll asprintf asnprintf basename devname dirfd dirname \
 	strsuftoll strtoll \
 	user_from_uid vasprintf vasnprintf vsnprintf)

+AC_CHECK_FUNCS([htobe16, htobe32, htobe64, htole16, htole32, htole64, be16toh, be32toh, be64toh, le16toh, le32toh, le64toh],,, [
+#include <sys/types.h>
+])
+
+AC_CHECK_FUNCS([bswap16, bswap32, bswap64],,, [
+#include <machine/bswap.h>
+])
+
 AC_CHECK_DECLS([setgroupent, setpassent],,, [
 #include <sys/types.h>
 #include <grp.h>
--- a/tools/compat/defs.mk.in
+++ b/tools/compat/defs.mk.in
@ -1,4 +1,4 @@
-#	$NetBSD: defs.mk.in,v 1.8 2003/10/27 00:12:43 lukem Exp $
+#	$NetBSD: defs.mk.in,v 1.9 2004/06/20 22:20:15 jmc Exp $

 COMPATOBJ:=	${.PARSEDIR}
 HOSTEXEEXT=	@EXEEXT@
@ -14,7 +14,7 @@ HOST_CPPFLAGS+=	-no-cpp-precomp

 HOST_CPPFLAGS+=	-I${COMPATOBJ} -I${COMPATOBJ}/include \
 		-I${.CURDIR}/../compat -DHAVE_NBTOOL_CONFIG_H=1 \
-		-D_FILE_OFFSET_BITS=64 -D_NETBSD_SOURCE
+		-D_FILE_OFFSET_BITS=64

 DPADD+=		${COMPATOBJ}/libnbcompat.a
 LDADD+=		-L${COMPATOBJ} -lnbcompat @LIBS@
--- a/tools/compat/nbtool_config.h.in
+++ b/tools/compat/nbtool_config.h.in
@ -1,4 +1,4 @@
-/*	$NetBSD: nbtool_config.h.in,v 1.3 2004/06/18 20:07:31 thorpej Exp $	*/
+/*	$NetBSD: nbtool_config.h.in,v 1.4 2004/06/20 22:20:15 jmc Exp $	*/

 #ifndef	__NETBSD_NBTOOL_CONFIG_H__
 #define	__NETBSD_NBTOOL_CONFIG_H__
@ -11,6 +11,7 @@
 #undef HAVE_DIRENT_H
 #undef HAVE_ERR_H
 #undef HAVE_FEATURES_H
+#undef HAVE_GETOPT_H
 #undef HAVE_INTTYPES_H
 #undef HAVE_LIBGEN_H
 #undef HAVE_NDIR_H
@ -34,8 +35,27 @@
 #undef HAVE_SOCKLEN_T
 #undef HAVE_LONG_LONG
 #undef HAVE_U_LONG
+#undef HAVE_U_CHAR
+#undef HAVE_U_INT
+#undef HAVE_U_SHORT
 #undef HAVE_U_QUAD_T

+#undef HAVE_BSWAP16
+#undef HAVE_BSWAP32
+#undef HAVE_BSWAP64
+#undef HAVE_HTOBE16
+#undef HAVE_HTOBE32
+#undef HAVE_HTOBE64
+#undef HAVE_HTOLE16
+#undef HAVE_HTOLE32
+#undef HAVE_HTOLE64
+#undef HAVE_BE16TOH
+#undef HAVE_BE32TOH
+#undef HAVE_BE64TOH
+#undef HAVE_LE16TOH
+#undef HAVE_LE32TOH
+#undef HAVE_LE64TOH
+
 #undef HAVE_DIR_DD_FD
 #undef HAVE_STRUCT_DIRENT_D_NAMLEN
 #undef HAVE_STRUCT_STAT_ST_FLAGS
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@ -1,4 +1,4 @@
-/*	$NetBSD: cksum.c,v 1.19 2003/12/20 23:41:38 kleink Exp $	*/
+/*	$NetBSD: cksum.c,v 1.20 2004/06/20 22:20:15 jmc Exp $	*/

 /*-
 * Copyright (c) 1991, 1993
@ -67,6 +67,10 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__COPYRIGHT) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
@ -77,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
 #if 0
 static char sccsid[] = "@(#)cksum.c	8.2 (Berkeley) 4/28/95";
 #endif
-__RCSID("$NetBSD: cksum.c,v 1.19 2003/12/20 23:41:38 kleink Exp $");
+__RCSID("$NetBSD: cksum.c,v 1.20 2004/06/20 22:20:15 jmc Exp $");
 #endif /* not lint */

 #include <sys/cdefs.h>
--- a/usr.bin/cksum/crc.c
+++ b/usr.bin/cksum/crc.c
@ -1,4 +1,4 @@
-/*	$NetBSD: crc.c,v 1.14 2003/12/20 23:41:38 kleink Exp $	*/
+/*	$NetBSD: crc.c,v 1.15 2004/06/20 22:20:15 jmc Exp $	*/

 /*-
 * Copyright (c) 1991, 1993
@ -32,12 +32,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)crc.c	8.1 (Berkeley) 6/17/93";
 #else
-__RCSID("$NetBSD: crc.c,v 1.14 2003/12/20 23:41:38 kleink Exp $");
+__RCSID("$NetBSD: crc.c,v 1.15 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/cksum/md5.c
+++ b/usr.bin/cksum/md5.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md5.c,v 1.4 2002/03/31 14:43:22 bjh21 Exp $	*/
+/*	$NetBSD: md5.c,v 1.5 2004/06/20 22:20:15 jmc Exp $	*/

 /*
 * MDDRIVER.C - test driver for MD2, MD4 and MD5
@ -17,9 +17,13 @@
 *  documentation and/or software.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: md5.c,v 1.4 2002/03/31 14:43:22 bjh21 Exp $");
+__RCSID("$NetBSD: md5.c,v 1.5 2004/06/20 22:20:15 jmc Exp $");
 #endif /* not lint */

 #include <sys/types.h>
--- a/usr.bin/cksum/print.c
+++ b/usr.bin/cksum/print.c
@ -1,4 +1,4 @@
-/*	$NetBSD: print.c,v 1.9 2003/12/20 23:41:38 kleink Exp $	*/
+/*	$NetBSD: print.c,v 1.10 2004/06/20 22:20:15 jmc Exp $	*/

 /*-
 * Copyright (c) 1991, 1993
@ -29,12 +29,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: print.c,v 1.9 2003/12/20 23:41:38 kleink Exp $");
+__RCSID("$NetBSD: print.c,v 1.10 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/cksum/sum1.c
+++ b/usr.bin/cksum/sum1.c
@ -1,4 +1,4 @@
-/*	$NetBSD: sum1.c,v 1.10 2003/12/20 23:41:38 kleink Exp $	*/
+/*	$NetBSD: sum1.c,v 1.11 2004/06/20 22:20:15 jmc Exp $	*/

 /*-
 * Copyright (c) 1991, 1993
@ -29,12 +29,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)sum1.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: sum1.c,v 1.10 2003/12/20 23:41:38 kleink Exp $");
+__RCSID("$NetBSD: sum1.c,v 1.11 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@ -1,4 +1,4 @@
-/*	$NetBSD: sum2.c,v 1.10 2003/12/20 23:41:38 kleink Exp $	*/
+/*	$NetBSD: sum2.c,v 1.11 2004/06/20 22:20:15 jmc Exp $	*/

 /*-
 * Copyright (c) 1991, 1993
@ -29,12 +29,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)sum2.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: sum2.c,v 1.10 2003/12/20 23:41:38 kleink Exp $");
+__RCSID("$NetBSD: sum2.c,v 1.11 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@ -1,4 +1,4 @@
-/*	$NetBSD: C.c,v 1.10 2003/08/07 11:13:30 agc Exp $	*/
+/*	$NetBSD: C.c,v 1.11 2004/06/20 22:20:15 jmc Exp $	*/

 /*
 * Copyright (c) 1987, 1993, 1994
@ -29,12 +29,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)C.c	8.4 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: C.c,v 1.10 2003/08/07 11:13:30 agc Exp $");
+__RCSID("$NetBSD: C.c,v 1.11 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@ -1,4 +1,4 @@
-/*	$NetBSD: ctags.c,v 1.9 2003/08/07 11:13:30 agc Exp $	*/
+/*	$NetBSD: ctags.c,v 1.10 2004/06/20 22:20:15 jmc Exp $	*/

 /*
 * Copyright (c) 1987, 1993, 1994, 1995
@ -29,6 +29,10 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__COPYRIGHT) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994, 1995\n\
@ -39,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993, 1994, 1995\n\
 #if 0
 static char sccsid[] = "@(#)ctags.c	8.4 (Berkeley) 2/7/95";
 #endif
-__RCSID("$NetBSD: ctags.c,v 1.9 2003/08/07 11:13:30 agc Exp $");
+__RCSID("$NetBSD: ctags.c,v 1.10 2004/06/20 22:20:15 jmc Exp $");
 #endif /* not lint */

 #include <err.h>
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@ -1,4 +1,4 @@
-/*	$NetBSD: fortran.c,v 1.8 2003/08/07 11:13:31 agc Exp $	*/
+/*	$NetBSD: fortran.c,v 1.9 2004/06/20 22:20:15 jmc Exp $	*/

 /*
 * Copyright (c) 1987, 1993, 1994
@ -29,12 +29,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)fortran.c	8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: fortran.c,v 1.8 2003/08/07 11:13:31 agc Exp $");
+__RCSID("$NetBSD: fortran.c,v 1.9 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@ -1,4 +1,4 @@
-/*	$NetBSD: lisp.c,v 1.8 2003/08/07 11:13:31 agc Exp $	*/
+/*	$NetBSD: lisp.c,v 1.9 2004/06/20 22:20:15 jmc Exp $	*/

 /*
 * Copyright (c) 1987, 1993, 1994
@ -29,12 +29,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)lisp.c	8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: lisp.c,v 1.8 2003/08/07 11:13:31 agc Exp $");
+__RCSID("$NetBSD: lisp.c,v 1.9 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@ -1,4 +1,4 @@
-/*	$NetBSD: print.c,v 1.7 2003/08/07 11:13:31 agc Exp $	*/
+/*	$NetBSD: print.c,v 1.8 2004/06/20 22:20:15 jmc Exp $	*/

 /*
 * Copyright (c) 1987, 1993, 1994
@ -29,12 +29,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)print.c	8.3 (Berkeley) 4/2/94";
 #else 
-__RCSID("$NetBSD: print.c,v 1.7 2003/08/07 11:13:31 agc Exp $");
+__RCSID("$NetBSD: print.c,v 1.8 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@ -1,4 +1,4 @@
-/*	$NetBSD: tree.c,v 1.9 2003/08/07 11:13:31 agc Exp $	*/
+/*	$NetBSD: tree.c,v 1.10 2004/06/20 22:20:15 jmc Exp $	*/

 /*
 * Copyright (c) 1987, 1993, 1994
@ -29,12 +29,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)tree.c	8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: tree.c,v 1.9 2003/08/07 11:13:31 agc Exp $");
+__RCSID("$NetBSD: tree.c,v 1.10 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@ -1,4 +1,4 @@
-/*	$NetBSD: yacc.c,v 1.8 2003/08/07 11:13:32 agc Exp $	*/
+/*	$NetBSD: yacc.c,v 1.9 2004/06/20 22:20:15 jmc Exp $	*/

 /*
 * Copyright (c) 1987, 1993, 1994
@ -29,12 +29,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)yacc.c	8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: yacc.c,v 1.8 2003/08/07 11:13:32 agc Exp $");
+__RCSID("$NetBSD: yacc.c,v 1.9 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@ -1,4 +1,4 @@
-/*	$NetBSD: eval.c,v 1.17 2003/08/07 11:14:30 agc Exp $	*/
+/*	$NetBSD: eval.c,v 1.18 2004/06/20 22:20:15 jmc Exp $	*/
 /*	$OpenBSD: eval.c,v 1.41 2001/10/10 23:25:31 espie Exp $	*/

 /*
@ -33,12 +33,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)eval.c	8.2 (Berkeley) 4/27/95";
 #else
-__RCSID("$NetBSD: eval.c,v 1.17 2003/08/07 11:14:30 agc Exp $");
+__RCSID("$NetBSD: eval.c,v 1.18 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@ -1,4 +1,4 @@
-/*	$NetBSD: expr.c,v 1.15 2003/08/07 11:14:31 agc Exp $	*/
+/*	$NetBSD: expr.c,v 1.16 2004/06/20 22:20:15 jmc Exp $	*/
 /*	$OpenBSD: expr.c,v 1.11 2000/01/11 14:00:57 espie Exp $	*/

 /*
@ -33,12 +33,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)expr.c	8.2 (Berkeley) 4/29/95";
 #else
-__RCSID("$NetBSD: expr.c,v 1.15 2003/08/07 11:14:31 agc Exp $");
+__RCSID("$NetBSD: expr.c,v 1.16 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/m4/gnum4.c
+++ b/usr.bin/m4/gnum4.c
@ -1,4 +1,4 @@
-/*	$NetBSD: gnum4.c,v 1.3 2004/04/23 02:58:29 simonb Exp $	*/
+/*	$NetBSD: gnum4.c,v 1.4 2004/06/20 22:20:15 jmc Exp $	*/
 /* $OpenBSD: gnum4.c,v 1.15 2001/10/13 20:18:48 espie Exp $ */

 /*
@ -26,6 +26,10 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 /* 
 * functions needed to support gnu-m4 extensions, including a fake freezing
 */
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@ -1,4 +1,4 @@
-/*	$NetBSD: look.c,v 1.9 2003/08/07 11:14:32 agc Exp $	*/
+/*	$NetBSD: look.c,v 1.10 2004/06/20 22:20:15 jmc Exp $	*/
 /*	$OpenBSD: look.c,v 1.8 2001/09/17 08:11:13 espie Exp $	*/

 /*
@ -33,12 +33,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)look.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: look.c,v 1.9 2003/08/07 11:14:32 agc Exp $");
+__RCSID("$NetBSD: look.c,v 1.10 2004/06/20 22:20:15 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.34 2003/08/07 11:14:32 agc Exp $	*/
+/*	$NetBSD: main.c,v 1.35 2004/06/20 22:20:16 jmc Exp $	*/
 /*	$OpenBSD: main.c,v 1.51 2001/10/06 10:52:25 espie Exp $	*/

 /*-
@ -33,6 +33,10 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__COPYRIGHT) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@ -43,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.34 2003/08/07 11:14:32 agc Exp $");
+__RCSID("$NetBSD: main.c,v 1.35 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@ -1,4 +1,4 @@
-/*	$NetBSD: misc.c,v 1.16 2003/08/07 11:14:33 agc Exp $	*/
+/*	$NetBSD: misc.c,v 1.17 2004/06/20 22:20:16 jmc Exp $	*/
 /*	$OpenBSD: misc.c,v 1.25 2001/10/10 11:17:37 espie Exp $	*/

 /*
@ -33,12 +33,16 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: misc.c,v 1.16 2003/08/07 11:14:33 agc Exp $");
+__RCSID("$NetBSD: misc.c,v 1.17 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.bin/m4/trace.c
+++ b/usr.bin/m4/trace.c
@ -1,4 +1,4 @@
-/*	$NetBSD: trace.c,v 1.4 2002/01/21 21:49:58 tv Exp $	*/
+/*	$NetBSD: trace.c,v 1.5 2004/06/20 22:20:16 jmc Exp $	*/
 /* $OpenBSD: trace.c,v 1.3 2001/09/29 15:47:18 espie Exp $ */

 /*
@ -26,6 +26,10 @@
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/types.h>
 #include <stddef.h>
 #include <stdio.h>
--- a/usr.bin/menuc/avl.c
+++ b/usr.bin/menuc/avl.c
@ -1,4 +1,4 @@
-/*	$NetBSD: avl.c,v 1.5 2003/07/17 08:33:43 lukem Exp $	*/
+/*	$NetBSD: avl.c,v 1.6 2004/06/20 22:20:16 jmc Exp $	*/

 /*
 * Copyright (c) 1997 Philip A. Nelson.
@ -46,10 +46,14 @@
 *	} id_rec;
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>

 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: avl.c,v 1.5 2003/07/17 08:33:43 lukem Exp $");
+__RCSID("$NetBSD: avl.c,v 1.6 2004/06/20 22:20:16 jmc Exp $");
 #endif


--- a/usr.bin/menuc/main.c
+++ b/usr.bin/menuc/main.c
@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.9 2003/07/17 08:33:43 lukem Exp $	*/
+/*	$NetBSD: main.c,v 1.10 2004/06/20 22:20:16 jmc Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -38,10 +38,14 @@

 /* main.c - main program for menu compiler. */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>

 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: main.c,v 1.9 2003/07/17 08:33:43 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.10 2004/06/20 22:20:16 jmc Exp $");
 #endif


--- a/usr.bin/menuc/mdb.c
+++ b/usr.bin/menuc/mdb.c
@ -1,4 +1,4 @@
-/*	$NetBSD: mdb.c,v 1.39 2003/10/18 18:26:53 dsl Exp $	*/
+/*	$NetBSD: mdb.c,v 1.40 2004/06/20 22:20:16 jmc Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -38,10 +38,14 @@

 /* mdb.c - menu database manipulation */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>

 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mdb.c,v 1.39 2003/10/18 18:26:53 dsl Exp $");
+__RCSID("$NetBSD: mdb.c,v 1.40 2004/06/20 22:20:16 jmc Exp $");
 #endif


--- a/usr.bin/menuc/util.c
+++ b/usr.bin/menuc/util.c
@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.3 2003/07/17 08:33:44 lukem Exp $	*/
+/*	$NetBSD: util.c,v 1.4 2004/06/20 22:20:16 jmc Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -38,10 +38,14 @@

 /* util.c - utility routines. */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>

 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: util.c,v 1.3 2003/07/17 08:33:44 lukem Exp $");
+__RCSID("$NetBSD: util.c,v 1.4 2004/06/20 22:20:16 jmc Exp $");
 #endif


--- a/usr.bin/msgc/msgdb.c
+++ b/usr.bin/msgc/msgdb.c
@ -1,4 +1,4 @@
-/*	$NetBSD: msgdb.c,v 1.19 2003/09/25 18:32:10 dsl Exp $	*/
+/*	$NetBSD: msgdb.c,v 1.20 2004/06/20 22:20:16 jmc Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -38,10 +38,14 @@

 /* mdb.c - message database manipulation */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>

 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: msgdb.c,v 1.19 2003/09/25 18:32:10 dsl Exp $");
+__RCSID("$NetBSD: msgdb.c,v 1.20 2004/06/20 22:20:16 jmc Exp $");
 #endif


--- a/usr.bin/msgc/msgmain.c
+++ b/usr.bin/msgc/msgmain.c
@ -1,4 +1,4 @@
-/*	$NetBSD: msgmain.c,v 1.6 2003/07/17 08:33:04 lukem Exp $	*/
+/*	$NetBSD: msgmain.c,v 1.7 2004/06/20 22:20:16 jmc Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -38,10 +38,14 @@

 /* main.c - main program */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>

 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: msgmain.c,v 1.6 2003/07/17 08:33:04 lukem Exp $");
+__RCSID("$NetBSD: msgmain.c,v 1.7 2004/06/20 22:20:16 jmc Exp $");
 #endif


--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_clntout.c,v 1.12 2002/01/31 19:36:48 tv Exp $	*/
+/*	$NetBSD: rpc_clntout.c,v 1.13 2004/06/20 22:20:16 jmc Exp $	*/
 /*
 * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
 * unrestricted use provided that this legend is included on all tape
@ -29,12 +29,16 @@
 * Mountain View, California  94043
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_clntout.c,v 1.12 2002/01/31 19:36:48 tv Exp $");
+__RCSID("$NetBSD: rpc_clntout.c,v 1.13 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif

--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_cout.c,v 1.25 2003/10/16 07:06:25 itojun Exp $	*/
+/*	$NetBSD: rpc_cout.c,v 1.26 2004/06/20 22:20:16 jmc Exp $	*/
 /*
 * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
 * unrestricted use provided that this legend is included on all tape
@ -29,12 +29,16 @@
 * Mountain View, California  94043
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_cout.c,v 1.25 2003/10/16 07:06:25 itojun Exp $");
+__RCSID("$NetBSD: rpc_cout.c,v 1.26 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif

--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_hout.c,v 1.19 2002/06/11 06:06:19 itojun Exp $	*/
+/*	$NetBSD: rpc_hout.c,v 1.20 2004/06/20 22:20:16 jmc Exp $	*/
 /*
 * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
 * unrestricted use provided that this legend is included on all tape
@ -29,12 +29,16 @@
 * Mountain View, California  94043
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_hout.c,v 1.19 2002/06/11 06:06:19 itojun Exp $");
+__RCSID("$NetBSD: rpc_hout.c,v 1.20 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif

--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_main.c,v 1.25 2004/05/12 15:59:54 christos Exp $	*/
+/*	$NetBSD: rpc_main.c,v 1.26 2004/06/20 22:20:16 jmc Exp $	*/

 /*
 * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@ -30,12 +30,16 @@
 * Mountain View, California  94043
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_main.c,v 1.25 2004/05/12 15:59:54 christos Exp $");
+__RCSID("$NetBSD: rpc_main.c,v 1.26 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif

--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_parse.c,v 1.12 2002/02/05 22:02:15 christos Exp $	*/
+/*	$NetBSD: rpc_parse.c,v 1.13 2004/06/20 22:20:16 jmc Exp $	*/
 /*
 * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
 * unrestricted use provided that this legend is included on all tape
@ -29,12 +29,16 @@
 * Mountain View, California  94043
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_parse.c,v 1.12 2002/02/05 22:02:15 christos Exp $");
+__RCSID("$NetBSD: rpc_parse.c,v 1.13 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif

--- a/usr.bin/rpcgen/rpc_sample.c
+++ b/usr.bin/rpcgen/rpc_sample.c
@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_sample.c,v 1.9 2002/01/31 19:36:49 tv Exp $	*/
+/*	$NetBSD: rpc_sample.c,v 1.10 2004/06/20 22:20:16 jmc Exp $	*/
 /*
 * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
 * unrestricted use provided that this legend is included on all tape
@ -29,12 +29,16 @@
 * Mountain View, California  94043
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_sample.c  1.1  90/08/30  (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_sample.c,v 1.9 2002/01/31 19:36:49 tv Exp $");
+__RCSID("$NetBSD: rpc_sample.c,v 1.10 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif

--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_scan.c,v 1.8 2002/01/31 19:36:49 tv Exp $	*/
+/*	$NetBSD: rpc_scan.c,v 1.9 2004/06/20 22:20:16 jmc Exp $	*/
 /*
 * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
 * unrestricted use provided that this legend is included on all tape
@ -29,12 +29,16 @@
 * Mountain View, California  94043
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_scan.c,v 1.8 2002/01/31 19:36:49 tv Exp $");
+__RCSID("$NetBSD: rpc_scan.c,v 1.9 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif

--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_svcout.c,v 1.21 2003/09/26 22:25:21 wiz Exp $	*/
+/*	$NetBSD: rpc_svcout.c,v 1.22 2004/06/20 22:20:16 jmc Exp $	*/
 /*
 * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
 * unrestricted use provided that this legend is included on all tape
@ -29,12 +29,16 @@
 * Mountain View, California  94043
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_svcout.c,v 1.21 2003/09/26 22:25:21 wiz Exp $");
+__RCSID("$NetBSD: rpc_svcout.c,v 1.22 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif

--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_tblout.c,v 1.10 2002/02/05 22:41:47 christos Exp $	*/
+/*	$NetBSD: rpc_tblout.c,v 1.11 2004/06/20 22:20:16 jmc Exp $	*/
 /*
 * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
 * unrestricted use provided that this legend is included on all tape
@ -29,12 +29,16 @@
 * Mountain View, California  94043
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
 #else
-__RCSID("$NetBSD: rpc_tblout.c,v 1.10 2002/02/05 22:41:47 christos Exp $");
+__RCSID("$NetBSD: rpc_tblout.c,v 1.11 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif

--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_util.c,v 1.9 2002/01/31 19:36:50 tv Exp $	*/
+/*	$NetBSD: rpc_util.c,v 1.10 2004/06/20 22:20:16 jmc Exp $	*/
 /*
 * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
 * unrestricted use provided that this legend is included on all tape
@ -29,12 +29,16 @@
 * Mountain View, California  94043
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
 #else
-__RCSID("$NetBSD: rpc_util.c,v 1.9 2002/01/31 19:36:50 tv Exp $");
+__RCSID("$NetBSD: rpc_util.c,v 1.10 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif

--- a/usr.bin/stat/stat.c
+++ b/usr.bin/stat/stat.c
@ -1,4 +1,4 @@
-/*	$NetBSD: stat.c,v 1.18 2004/05/28 04:48:31 atatat Exp $ */
+/*	$NetBSD: stat.c,v 1.19 2004/06/20 22:20:16 jmc Exp $ */

 /*
 * Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -42,7 +42,7 @@

 #include <sys/cdefs.h>
 #if !defined(lint)
-__RCSID("$NetBSD: stat.c,v 1.18 2004/05/28 04:48:31 atatat Exp $");
+__RCSID("$NetBSD: stat.c,v 1.19 2004/06/20 22:20:16 jmc Exp $");
 #endif

 #if ! HAVE_NBTOOL_CONFIG_H
@ -706,8 +706,8 @@ format1(const struct stat *st,
 	case SHOW_st_btime:
 		if (!gottime) {
 			gottime = 1;
-			secs = st->st_birthtimespec.tv_sec;
-			nsecs = st->st_birthtimespec.tv_nsec;
+			secs = st->st_birthtime;
+			nsecs = st->st_birthtimensec;
 		}
 #endif /* HAVE_STRUCT_STAT_ST_BIRTHTIME */
 		small = (sizeof(secs) == 4);
@ -802,7 +802,9 @@ format1(const struct stat *st,
 					(void)strcat(sdata, "*");
 				break;
 			case S_IFLNK:	(void)strcat(sdata, "@");	break;
+#ifdef S_IFSOCK
 			case S_IFSOCK:	(void)strcat(sdata, "=");	break;
+#endif
 #ifdef S_IFWHT
 			case S_IFWHT:	(void)strcat(sdata, "%");	break;
 #endif /* S_IFWHT */
@ -820,7 +822,9 @@ format1(const struct stat *st,
 			case S_IFBLK:	sdata = "Block Device";		break;
 			case S_IFREG:	sdata = "Regular File";		break;
 			case S_IFLNK:	sdata = "Symbolic Link";	break;
+#ifdef S_IFSOCK
 			case S_IFSOCK:	sdata = "Socket";		break;
+#endif
 #ifdef S_IFWHT
 			case S_IFWHT:	sdata = "Whiteout File";	break;
 #endif /* S_IFWHT */
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@ -1,4 +1,4 @@
-/*	$NetBSD: xinstall.c,v 1.86 2004/02/02 23:25:36 lukem Exp $	*/
+/*	$NetBSD: xinstall.c,v 1.87 2004/06/20 22:20:16 jmc Exp $	*/

 /*
 * Copyright (c) 1987, 1993
@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
 #if 0
 static char sccsid[] = "@(#)xinstall.c	8.1 (Berkeley) 7/21/93";
 #else
-__RCSID("$NetBSD: xinstall.c,v 1.86 2004/02/02 23:25:36 lukem Exp $");
+__RCSID("$NetBSD: xinstall.c,v 1.87 2004/06/20 22:20:16 jmc Exp $");
 #endif
 #endif /* not lint */

@ -578,7 +578,7 @@ install(char *from_name, char *to_name, u_int flags)
 			/* ensure that from_sb & tv are sane if !dolink */
 		if (stat(from_name, &from_sb))
 			err(1, "%s: stat", from_name);
-#ifdef BSD4_4
+#if BSD4_4 && !HAVE_NBTOOL_CONFIG_H
 		TIMESPEC_TO_TIMEVAL(&tv[0], &from_sb.st_atimespec);
 		TIMESPEC_TO_TIMEVAL(&tv[1], &from_sb.st_mtimespec);
 #else
--- a/usr.bin/xlint/common/emit.c
+++ b/usr.bin/xlint/common/emit.c
@ -1,4 +1,4 @@
-/*	$NetBSD: emit.c,v 1.3 2002/01/31 19:36:53 tv Exp $	*/
+/*	$NetBSD: emit.c,v 1.4 2004/06/20 22:20:16 jmc Exp $	*/

 /*
 * Copyright (c) 1994, 1995 Jochen Pohl
@ -31,9 +31,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: emit.c,v 1.3 2002/01/31 19:36:53 tv Exp $");
+__RCSID("$NetBSD: emit.c,v 1.4 2004/06/20 22:20:16 jmc Exp $");
 #endif

 #include <ctype.h>
--- a/usr.bin/xlint/common/inittyp.c
+++ b/usr.bin/xlint/common/inittyp.c
@ -1,4 +1,4 @@
-/*	$NetBSD: inittyp.c,v 1.5 2003/05/29 18:12:17 christos Exp $	*/
+/*	$NetBSD: inittyp.c,v 1.6 2004/06/20 22:20:16 jmc Exp $	*/

 /*
 * Copyright (c) 1994, 1995 Jochen Pohl
@ -31,9 +31,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: inittyp.c,v 1.5 2003/05/29 18:12:17 christos Exp $");
+__RCSID("$NetBSD: inittyp.c,v 1.6 2004/06/20 22:20:16 jmc Exp $");
 #endif

 #include <ctype.h>
--- a/usr.bin/xlint/common/mem.c
+++ b/usr.bin/xlint/common/mem.c
@ -1,4 +1,4 @@
-/*	$NetBSD: mem.c,v 1.6 2003/10/22 16:10:03 christos Exp $	*/
+/*	$NetBSD: mem.c,v 1.7 2004/06/20 22:20:16 jmc Exp $	*/

 /*
 * Copyright (c) 1994, 1995 Jochen Pohl
@ -31,9 +31,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mem.c,v 1.6 2003/10/22 16:10:03 christos Exp $");
+__RCSID("$NetBSD: mem.c,v 1.7 2004/06/20 22:20:16 jmc Exp $");
 #endif

 #include <sys/param.h>
--- a/usr.bin/xlint/lint1/decl.c
+++ b/usr.bin/xlint/lint1/decl.c
@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.32 2002/11/02 20:10:16 perry Exp $ */
+/* $NetBSD: decl.c,v 1.33 2004/06/20 22:20:16 jmc Exp $ */

 /*
 * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@ -32,9 +32,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.32 2002/11/02 20:10:16 perry Exp $");
+__RCSID("$NetBSD: decl.c,v 1.33 2004/06/20 22:20:16 jmc Exp $");
 #endif

 #include <sys/param.h>
--- a/usr.bin/xlint/lint1/emit1.c
+++ b/usr.bin/xlint/lint1/emit1.c
@ -1,4 +1,4 @@
-/* $NetBSD: emit1.c,v 1.13 2002/09/13 14:59:24 christos Exp $ */
+/* $NetBSD: emit1.c,v 1.14 2004/06/20 22:20:16 jmc Exp $ */

 /*
 * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@ -32,9 +32,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: emit1.c,v 1.13 2002/09/13 14:59:24 christos Exp $");
+__RCSID("$NetBSD: emit1.c,v 1.14 2004/06/20 22:20:16 jmc Exp $");
 #endif

 #include <ctype.h>
--- a/usr.bin/xlint/lint1/err.c
+++ b/usr.bin/xlint/lint1/err.c
@ -1,4 +1,4 @@
-/*	$NetBSD: err.c,v 1.26 2002/11/02 20:14:10 perry Exp $	*/
+/*	$NetBSD: err.c,v 1.27 2004/06/20 22:20:16 jmc Exp $	*/

 /*
 * Copyright (c) 1994, 1995 Jochen Pohl
@ -31,9 +31,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: err.c,v 1.26 2002/11/02 20:14:10 perry Exp $");
+__RCSID("$NetBSD: err.c,v 1.27 2004/06/20 22:20:16 jmc Exp $");
 #endif

 #include <sys/types.h>
--- a/usr.bin/xlint/lint1/func.c
+++ b/usr.bin/xlint/lint1/func.c
@ -1,4 +1,4 @@
-/*	$NetBSD: func.c,v 1.20 2002/10/23 00:36:36 christos Exp $	*/
+/*	$NetBSD: func.c,v 1.21 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1994, 1995 Jochen Pohl
@ -31,9 +31,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: func.c,v 1.20 2002/10/23 00:36:36 christos Exp $");
+__RCSID("$NetBSD: func.c,v 1.21 2004/06/20 22:20:17 jmc Exp $");
 #endif

 #include <stdlib.h>
--- a/usr.bin/xlint/lint1/init.c
+++ b/usr.bin/xlint/lint1/init.c
@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.17 2002/12/06 03:27:39 thorpej Exp $	*/
+/*	$NetBSD: init.c,v 1.18 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1994, 1995 Jochen Pohl
@ -31,9 +31,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: init.c,v 1.17 2002/12/06 03:27:39 thorpej Exp $");
+__RCSID("$NetBSD: init.c,v 1.18 2004/06/20 22:20:17 jmc Exp $");
 #endif

 #include <stdlib.h>
--- a/usr.bin/xlint/lint1/main1.c
+++ b/usr.bin/xlint/lint1/main1.c
@ -1,4 +1,4 @@
-/*	$NetBSD: main1.c,v 1.14 2003/04/18 03:21:02 lukem Exp $	*/
+/*	$NetBSD: main1.c,v 1.15 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1994, 1995 Jochen Pohl
@ -31,9 +31,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: main1.c,v 1.14 2003/04/18 03:21:02 lukem Exp $");
+__RCSID("$NetBSD: main1.c,v 1.15 2004/06/20 22:20:17 jmc Exp $");
 #endif

 #include <sys/types.h>
--- a/usr.bin/xlint/lint1/mem1.c
+++ b/usr.bin/xlint/lint1/mem1.c
@ -1,4 +1,4 @@
-/*	$NetBSD: mem1.c,v 1.10 2003/10/21 23:58:53 christos Exp $	*/
+/*	$NetBSD: mem1.c,v 1.11 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1994, 1995 Jochen Pohl
@ -31,9 +31,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mem1.c,v 1.10 2003/10/21 23:58:53 christos Exp $");
+__RCSID("$NetBSD: mem1.c,v 1.11 2004/06/20 22:20:17 jmc Exp $");
 #endif

 #include <sys/types.h>
--- a/usr.bin/xlint/lint1/tree.c
+++ b/usr.bin/xlint/lint1/tree.c
@ -1,4 +1,4 @@
-/*	$NetBSD: tree.c,v 1.36 2003/05/30 13:37:49 christos Exp $	*/
+/*	$NetBSD: tree.c,v 1.37 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1994, 1995 Jochen Pohl
@ -31,9 +31,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.36 2003/05/30 13:37:49 christos Exp $");
+__RCSID("$NetBSD: tree.c,v 1.37 2004/06/20 22:20:17 jmc Exp $");
 #endif

 #include <stdlib.h>
--- a/usr.bin/xlint/lint2/chk.c
+++ b/usr.bin/xlint/lint2/chk.c
@ -1,4 +1,4 @@
-/* $NetBSD: chk.c,v 1.16 2002/01/31 19:36:55 tv Exp $ */
+/* $NetBSD: chk.c,v 1.17 2004/06/20 22:20:17 jmc Exp $ */

 /*
 * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@ -32,9 +32,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: chk.c,v 1.16 2002/01/31 19:36:55 tv Exp $");
+__RCSID("$NetBSD: chk.c,v 1.17 2004/06/20 22:20:17 jmc Exp $");
 #endif

 #include <ctype.h>
--- a/usr.bin/xlint/lint2/hash.c
+++ b/usr.bin/xlint/lint2/hash.c
@ -1,4 +1,4 @@
-/*	$NetBSD: hash.c,v 1.8 2002/01/31 19:36:55 tv Exp $	*/
+/*	$NetBSD: hash.c,v 1.9 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1994, 1995 Jochen Pohl
@ -31,9 +31,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: hash.c,v 1.8 2002/01/31 19:36:55 tv Exp $");
+__RCSID("$NetBSD: hash.c,v 1.9 2004/06/20 22:20:17 jmc Exp $");
 #endif

 /*
--- a/usr.bin/xlint/lint2/main2.c
+++ b/usr.bin/xlint/lint2/main2.c
@ -1,4 +1,4 @@
-/*	$NetBSD: main2.c,v 1.6 2002/01/31 19:36:55 tv Exp $	*/
+/*	$NetBSD: main2.c,v 1.7 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1994, 1995 Jochen Pohl
@ -31,9 +31,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: main2.c,v 1.6 2002/01/31 19:36:55 tv Exp $");
+__RCSID("$NetBSD: main2.c,v 1.7 2004/06/20 22:20:17 jmc Exp $");
 #endif

 #include <stdio.h>
--- a/usr.bin/xlint/lint2/mem2.c
+++ b/usr.bin/xlint/lint2/mem2.c
@ -1,4 +1,4 @@
-/*	$NetBSD: mem2.c,v 1.8 2003/10/21 23:58:53 christos Exp $	*/
+/*	$NetBSD: mem2.c,v 1.9 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1994, 1995 Jochen Pohl
@ -31,9 +31,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: mem2.c,v 1.8 2003/10/21 23:58:53 christos Exp $");
+__RCSID("$NetBSD: mem2.c,v 1.9 2004/06/20 22:20:17 jmc Exp $");
 #endif

 #include <sys/param.h>
--- a/usr.bin/xlint/lint2/msg.c
+++ b/usr.bin/xlint/lint2/msg.c
@ -1,4 +1,4 @@
-/*	$NetBSD: msg.c,v 1.7 2002/01/31 19:36:55 tv Exp $	*/
+/*	$NetBSD: msg.c,v 1.8 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1994, 1995 Jochen Pohl
@ -31,9 +31,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: msg.c,v 1.7 2002/01/31 19:36:55 tv Exp $");
+__RCSID("$NetBSD: msg.c,v 1.8 2004/06/20 22:20:17 jmc Exp $");
 #endif

 #include <stdio.h>
--- a/usr.bin/xlint/lint2/read.c
+++ b/usr.bin/xlint/lint2/read.c
@ -1,4 +1,4 @@
-/* $NetBSD: read.c,v 1.13 2002/01/31 19:36:56 tv Exp $ */
+/* $NetBSD: read.c,v 1.14 2004/06/20 22:20:17 jmc Exp $ */

 /*
 * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@ -32,9 +32,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: read.c,v 1.13 2002/01/31 19:36:56 tv Exp $");
+__RCSID("$NetBSD: read.c,v 1.14 2004/06/20 22:20:17 jmc Exp $");
 #endif

 #include <ctype.h>
--- a/usr.bin/xlint/xlint/xlint.c
+++ b/usr.bin/xlint/xlint/xlint.c
@ -1,4 +1,4 @@
-/* $NetBSD: xlint.c,v 1.34 2004/01/26 21:51:11 dsl Exp $ */
+/* $NetBSD: xlint.c,v 1.35 2004/06/20 22:20:17 jmc Exp $ */

 /*
 * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@ -32,9 +32,13 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: xlint.c,v 1.34 2004/01/26 21:51:11 dsl Exp $");
+__RCSID("$NetBSD: xlint.c,v 1.35 2004/06/20 22:20:17 jmc Exp $");
 #endif

 #include <sys/param.h>
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.14 2003/08/07 11:17:53 agc Exp $	*/
+/*	$NetBSD: main.c,v 1.15 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1989 The Regents of the University of California.
@ -32,6 +32,10 @@
 * SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__COPYRIGHT) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1989 The Regents of the University of California.\n"
@ -42,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989 The Regents of the University of California
 #if 0
 static char sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.14 2003/08/07 11:17:53 agc Exp $");
+__RCSID("$NetBSD: main.c,v 1.15 2004/06/20 22:20:17 jmc Exp $");
 #endif
 #endif /* not lint */

--- a/usr.sbin/config/files.c
+++ b/usr.sbin/config/files.c
@ -1,4 +1,4 @@
-/*	$NetBSD: files.c,v 1.23 2003/11/24 21:44:37 christos Exp $	*/
+/*	$NetBSD: files.c,v 1.24 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -40,6 +40,10 @@
 *	from: @(#)files.c	8.1 (Berkeley) 6/6/93
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <errno.h>
 #include <stdio.h>
--- a/usr.sbin/config/hash.c
+++ b/usr.sbin/config/hash.c
@ -1,4 +1,4 @@
-/*	$NetBSD: hash.c,v 1.13 2003/11/25 19:34:05 rafal Exp $	*/
+/*	$NetBSD: hash.c,v 1.14 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -40,6 +40,10 @@
 *	from: @(#)hash.c	8.1 (Berkeley) 6/6/93
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <stdlib.h>
 #include <string.h>
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.93 2004/06/05 05:07:02 itojun Exp $	*/
+/*	$NetBSD: main.c,v 1.94 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -40,6 +40,10 @@
 *	from: @(#)main.c	8.1 (Berkeley) 6/6/93
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #ifndef MAKE_BOOTSTRAP
 #include <sys/cdefs.h>
 #define	COPYRIGHT(x)	__COPYRIGHT(x)
--- a/usr.sbin/config/mkdevsw.c
+++ b/usr.sbin/config/mkdevsw.c
@ -1,4 +1,4 @@
-/*	$NetBSD: mkdevsw.c,v 1.4 2003/05/17 18:53:01 itojun Exp $	*/
+/*	$NetBSD: mkdevsw.c,v 1.5 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -36,6 +36,10 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
--- a/usr.sbin/config/mkheaders.c
+++ b/usr.sbin/config/mkheaders.c
@ -1,4 +1,4 @@
-/*	$NetBSD: mkheaders.c,v 1.35 2003/08/07 11:25:16 agc Exp $	*/
+/*	$NetBSD: mkheaders.c,v 1.36 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -40,6 +40,10 @@
 *	from: @(#)mkheaders.c	8.1 (Berkeley) 6/6/93
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <ctype.h>
 #include <errno.h>
--- a/usr.sbin/config/mkioconf.c
+++ b/usr.sbin/config/mkioconf.c
@ -1,4 +1,4 @@
-/*	$NetBSD: mkioconf.c,v 1.72 2003/08/07 11:25:16 agc Exp $	*/
+/*	$NetBSD: mkioconf.c,v 1.73 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -40,6 +40,10 @@
 *	from: @(#)mkioconf.c	8.1 (Berkeley) 6/6/93
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <errno.h>
 #include <stdio.h>
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@ -1,4 +1,4 @@
-/*	$NetBSD: mkmakefile.c,v 1.61 2004/06/04 07:28:26 thorpej Exp $	*/
+/*	$NetBSD: mkmakefile.c,v 1.62 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -40,6 +40,10 @@
 *	from: @(#)mkmakefile.c	8.1 (Berkeley) 6/6/93
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <ctype.h>
 #include <errno.h>
--- a/usr.sbin/config/mkswap.c
+++ b/usr.sbin/config/mkswap.c
@ -1,4 +1,4 @@
-/*	$NetBSD: mkswap.c,v 1.16 2003/08/07 11:25:16 agc Exp $	*/
+/*	$NetBSD: mkswap.c,v 1.17 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -40,6 +40,10 @@
 *	from: @(#)mkswap.c	8.1 (Berkeley) 6/6/93
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <errno.h>
 #include <stdio.h>
--- a/usr.sbin/config/pack.c
+++ b/usr.sbin/config/pack.c
@ -1,4 +1,4 @@
-/*	$NetBSD: pack.c,v 1.15 2003/11/24 21:44:37 christos Exp $	*/
+/*	$NetBSD: pack.c,v 1.16 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -40,6 +40,10 @@
 *	from: @(#)pack.c	8.1 (Berkeley) 6/6/93
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <stdlib.h>
 #include <string.h>
--- a/usr.sbin/config/sem.c
+++ b/usr.sbin/config/sem.c
@ -1,4 +1,4 @@
-/*	$NetBSD: sem.c,v 1.42 2004/05/22 04:04:13 grant Exp $	*/
+/*	$NetBSD: sem.c,v 1.43 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -40,6 +40,10 @@
 *	from: @(#)sem.c	8.1 (Berkeley) 6/6/93
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/param.h>
 #include <ctype.h>
 #include <stdio.h>
--- a/usr.sbin/config/util.c
+++ b/usr.sbin/config/util.c
@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.20 2003/11/25 19:34:06 rafal Exp $	*/
+/*	$NetBSD: util.c,v 1.21 2004/06/20 22:20:17 jmc Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -40,6 +40,10 @@
 *	from: @(#)util.c	8.1 (Berkeley) 6/6/93
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/usr.sbin/installboot/arch/amiga.c
+++ b/usr.sbin/installboot/arch/amiga.c
@ -1,4 +1,4 @@
-/*	$NetBSD: amiga.c,v 1.2 2003/04/15 14:22:14 dsl Exp $	*/
+/*	$NetBSD: amiga.c,v 1.3 2004/06/20 22:20:17 jmc Exp $	*/

 /*-
 * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@ -39,9 +39,13 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: amiga.c,v 1.2 2003/04/15 14:22:14 dsl Exp $");
+__RCSID("$NetBSD: amiga.c,v 1.3 2004/06/20 22:20:17 jmc Exp $");
 #endif	/* !__lint */

 #include <sys/param.h>
--- a/Show More
+++ b/Show More