From: Robert Garrett <rob@dragonflybsd.org>
Date: Tue, 10 Feb 2004 02:59:44 +0000 (+0000)
Subject: It seems I missed a directory when doing the __FreeBSD__ -> __DragonFly__
X-Git-Url: https://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/commitdiff_plain/db43ed0fd2c212b1251df5d54beb0129af84344b

It seems I missed a directory when doing the __FreeBSD__ -> __DragonFly__
conversion. This I believe makes world buildable with gcc3

NOTE:

    The things in the contrib areas will generate warnings about
__FreeBSD__ being redefined for the moment. To correct that
will require moving the files to where they are built from, and
correcting them there. Then patches will be sent to the owners of
the files, and finally we can update with corrected sources and
all will be back to normal. I will be going through these one by
one and moving the files that need to be fixed into place.
But I expect this to take some time.
---

diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c
index ee73e85beb..67b5d5826c 100644
--- a/usr.sbin/faithd/faithd.c
+++ b/usr.sbin/faithd/faithd.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/faithd/faithd.c,v 1.2.2.7 2002/04/28 08:01:39 ume Exp $
- * $DragonFly: src/usr.sbin/faithd/faithd.c,v 1.4 2003/11/16 14:10:45 eirikn Exp $
+ * $DragonFly: src/usr.sbin/faithd/faithd.c,v 1.5 2004/02/10 02:59:41 rob Exp $
  */
 
 /*
@@ -47,7 +47,7 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/ioctl.h>
-#ifdef __FreeBSD__
+#ifdef __DragonFly__
 #include <libutil.h>
 #endif
 
diff --git a/usr.sbin/i4b/isdnd/log.c b/usr.sbin/i4b/isdnd/log.c
index c88cb2704c..45911944d7 100644
--- a/usr.sbin/i4b/isdnd/log.c
+++ b/usr.sbin/i4b/isdnd/log.c
@@ -30,7 +30,7 @@
  *	$Id: log.c,v 1.25 2000/10/09 12:53:29 hm Exp $ 
  *
  * $FreeBSD: src/usr.sbin/i4b/isdnd/log.c,v 1.6.2.2 2001/08/01 17:45:03 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdnd/log.c,v 1.3 2003/11/16 15:17:35 eirikn Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdnd/log.c,v 1.4 2004/02/10 02:59:42 rob Exp $
  *
  *      last edit-date: [Mon Dec 13 21:47:28 1999]
  *
@@ -168,10 +168,10 @@ log(int what, const char *fmt, ...)
  * to write to the last column in the logfilewindow without causing an
  * automatic newline to occur resulting in a blank line in that window.
  */
-#ifdef __FreeBSD__
+#ifdef __DragonFly__
 #include <osreldate.h>
 #endif
-#if defined(__FreeBSD_version) && __FreeBSD_version >= 400009		
+#if defined(__DragonFly__)
 #warning "FreeBSD ncurses is buggy: write to last column = auto newline!"
 		     COLS-((strlen(dp))+(strlen(logtab[what].text))+3), buffer);
 #else
diff --git a/usr.sbin/i4b/isdnd/msghdl.c b/usr.sbin/i4b/isdnd/msghdl.c
index 4917ed22fc..029d4ec12e 100644
--- a/usr.sbin/i4b/isdnd/msghdl.c
+++ b/usr.sbin/i4b/isdnd/msghdl.c
@@ -30,7 +30,7 @@
  *	$Id: msghdl.c,v 1.78 2000/09/21 11:29:51 hm Exp $ 
  *
  * $FreeBSD: src/usr.sbin/i4b/isdnd/msghdl.c,v 1.6.2.3 2001/12/16 15:13:38 hm Exp $
- * $DragonFly: src/usr.sbin/i4b/isdnd/msghdl.c,v 1.2 2003/06/17 04:29:54 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdnd/msghdl.c,v 1.3 2004/02/10 02:59:42 rob Exp $
  *
  *      last edit-date: [Thu Sep 21 11:11:48 2000]
  *
@@ -42,7 +42,7 @@
 #include <net/if.h>
 #include <net/if_types.h>
 
-#if defined(__FreeBSD__)
+#if defined(__DragonFly__)
 #include <net/if_var.h>
 #endif
 
diff --git a/usr.sbin/i4b/isdnmonitor/main.c b/usr.sbin/i4b/isdnmonitor/main.c
index 86d0eebae1..e2cff38522 100644
--- a/usr.sbin/i4b/isdnmonitor/main.c
+++ b/usr.sbin/i4b/isdnmonitor/main.c
@@ -36,7 +36,7 @@
  *	$Id: main.c,v 1.35 2000/08/24 11:48:57 hm Exp $
  *
  * $FreeBSD: src/usr.sbin/i4b/isdnmonitor/main.c,v 1.7.2.1 2001/08/01 17:45:06 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdnmonitor/main.c,v 1.3 2003/11/16 15:17:35 eirikn Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdnmonitor/main.c,v 1.4 2004/02/10 02:59:42 rob Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:11 1999]
  *
@@ -519,10 +519,10 @@ print_logevent(time_t tstamp, int prio, char * what, char * msg)
  * to write to the last column in the logfilewindow without causing an
  * automatic newline to occur resulting in a blank line in that window.
  */
-#ifdef __FreeBSD__
+#ifdef __DragonFly__
 #include <osreldate.h>
 #endif
-#if defined(__FreeBSD_version) && __FreeBSD_version >= 400009
+#if defined(__DragonFly__)
 #warning "FreeBSD ncurses is buggy: write to last column = auto newline!"
 	                wprintw(lower_w, "%s %s %-.*s\n", buf, what,
 				COLS-((strlen(buf))+(strlen(what))+3), msg);
diff --git a/usr.sbin/i4b/isdnmonitor/monprivate.h b/usr.sbin/i4b/isdnmonitor/monprivate.h
index 4c7f3ffba2..1264f526bf 100644
--- a/usr.sbin/i4b/isdnmonitor/monprivate.h
+++ b/usr.sbin/i4b/isdnmonitor/monprivate.h
@@ -30,7 +30,7 @@
  *	$Id: monprivate.h,v 1.10 1999/12/13 21:25:26 hm Exp $
  *
  * $FreeBSD: src/usr.sbin/i4b/isdnmonitor/monprivate.h,v 1.1.2.1 2001/08/01 17:45:06 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdnmonitor/monprivate.h,v 1.3 2003/08/08 04:18:45 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdnmonitor/monprivate.h,v 1.4 2004/02/10 02:59:42 rob Exp $
  *
  *      last edit-date: [Mon Dec 13 21:52:25 1999]
  *
@@ -61,7 +61,8 @@
  *	definitions in i4b_ioctl.h, do something for other systems
  *---------------------------------------------------------------------------*/
 #if defined (__FreeBSD__) || defined(__NetBSD__) || \
-    defined (__OpenBSD__) || defined(__bsdi__)
+    defined (__OpenBSD__) || defined(__bsdi__)   || \
+    defined (__DragonFly__)
 
 #include <i4b_machine/i4b_ioctl.h>
 
diff --git a/usr.sbin/i4b/isdntel/defs.h b/usr.sbin/i4b/isdntel/defs.h
index 04b50f4bfa..4aa8317819 100644
--- a/usr.sbin/i4b/isdntel/defs.h
+++ b/usr.sbin/i4b/isdntel/defs.h
@@ -30,7 +30,7 @@
  *	$Id: defs.h,v 1.10 1999/12/13 21:25:26 hm Exp $ 
  *
  * $FreeBSD: src/usr.sbin/i4b/isdntel/defs.h,v 1.6.2.1 2001/08/01 17:45:06 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdntel/defs.h,v 1.3 2003/08/08 04:18:45 dillon Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdntel/defs.h,v 1.4 2004/02/10 02:59:42 rob Exp $
  *
  *      last edit-date: [Mon Dec 13 21:53:50 1999]
  *
@@ -47,7 +47,7 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include <sys/time.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if defined(__DragonFly__) 
 #include <dirent.h>
 #else
 #include <sys/dir.h>
diff --git a/usr.sbin/i4b/isdntel/files.c b/usr.sbin/i4b/isdntel/files.c
index 0d47561ec2..57c8e4551e 100644
--- a/usr.sbin/i4b/isdntel/files.c
+++ b/usr.sbin/i4b/isdntel/files.c
@@ -30,7 +30,7 @@
  *      $Id: files.c,v 1.8 1999/12/13 21:25:26 hm Exp $ 
  *
  * $FreeBSD: src/usr.sbin/i4b/isdntel/files.c,v 1.6.2.1 2001/08/01 17:45:06 obrien Exp $
- * $DragonFly: src/usr.sbin/i4b/isdntel/files.c,v 1.3 2003/11/16 15:17:35 eirikn Exp $
+ * $DragonFly: src/usr.sbin/i4b/isdntel/files.c,v 1.4 2004/02/10 02:59:42 rob Exp $
  *
  *      last edit-date: [Mon Dec 13 21:54:06 1999]
  *
@@ -94,7 +94,7 @@ struct onefile
 int
 fill_list(void)
 {
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if defined(__DragonFly__) 
 	register struct dirent *dp;
 #else
 	register struct direct *dp;
diff --git a/usr.sbin/ipftest/Makefile b/usr.sbin/ipftest/Makefile
index e67c4ff246..0a7eb077e9 100644
--- a/usr.sbin/ipftest/Makefile
+++ b/usr.sbin/ipftest/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/usr.sbin/ipftest/Makefile,v 1.4.2.5 2002/04/27 18:19:04 darrenr Exp $
-# $DragonFly: src/usr.sbin/ipftest/Makefile,v 1.4 2004/01/31 06:56:45 dillon Exp $
+# $DragonFly: src/usr.sbin/ipftest/Makefile,v 1.5 2004/02/10 02:59:42 rob Exp $
 
 .PATH:	${.CURDIR}/../../sys/netinet \
 	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
@@ -16,6 +16,7 @@ CFLAGS+= -I${.OBJDIR}
 CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter
 CFLAGS+=-I${.CURDIR}/../../sys
 CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
+CFLAGS+=-D__FreeBSD__
 
 CLEANFILES+=	opt_ipfilter.h
 
diff --git a/usr.sbin/ipsend/Makefile b/usr.sbin/ipsend/Makefile
index 3ceaa18d5d..e04701e3e9 100644
--- a/usr.sbin/ipsend/Makefile
+++ b/usr.sbin/ipsend/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/usr.sbin/ipsend/Makefile,v 1.8.2.3 2001/11/14 14:15:05 guido Exp $
-# $DragonFly: src/usr.sbin/ipsend/Makefile,v 1.4 2004/01/31 06:56:45 dillon Exp $
+# $DragonFly: src/usr.sbin/ipsend/Makefile,v 1.5 2004/02/10 02:59:42 rob Exp $
 
 .PATH:	${.CURDIR}/../../contrib/ipfilter/ipsend \
 	${.CURDIR}/../../contrib/ipfilter/iplang \
@@ -15,6 +15,7 @@ CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6 \
 	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
 	-I${.CURDIR}/../../contrib/ipfilter/iplang \
 	-I${.CURDIR}/../../contrib/ipfilter
+CFLAGS+=-D__FreeBSD__
 
 DPADD=	${LIBL}
 LDADD=	-ll
diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h
index 5e3b0e8449..7a078e1840 100644
--- a/usr.sbin/mrouted/defs.h
+++ b/usr.sbin/mrouted/defs.h
@@ -8,7 +8,7 @@
  *
  *
  * $FreeBSD: src/usr.sbin/mrouted/defs.h,v 1.12.2.1 2001/07/19 01:41:11 kris Exp $
- * $DragonFly: src/usr.sbin/mrouted/defs.h,v 1.5 2003/11/06 19:46:42 eirikn Exp $
+ * $DragonFly: src/usr.sbin/mrouted/defs.h,v 1.6 2004/02/10 02:59:42 rob Exp $
  * defs.h,v 3.8.4.15 1998/03/01 02:51:42 fenner Exp
  */
 
@@ -42,14 +42,12 @@
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/igmp.h>
-#ifdef __FreeBSD__	/* sigh */
+#ifdef __DragonFly__	/* sigh */
 #include <osreldate.h>
-#if __FreeBSD_version >= 220000
 #define rtentry kernel_rtentry
 #include <net/route.h>
 #undef rtentry
 #endif
-#endif
 #include <net/ip_mroute/ip_mroute.h>
 #ifdef RSRR
 #include <sys/un.h>
diff --git a/usr.sbin/pcvt/fontedit/fontedit.c b/usr.sbin/pcvt/fontedit/fontedit.c
index d9ed357c6e..2ee314094c 100644
--- a/usr.sbin/pcvt/fontedit/fontedit.c
+++ b/usr.sbin/pcvt/fontedit/fontedit.c
@@ -20,6 +20,8 @@
  *      Nov 21, 1987 - Fixed man page to say "Fontedit" instead of "Top"
  *      Nov 22, 1987 - Added BSD Compatible ioctl, turned cursor on/off
  *                     - eap@bucsf.bu.edu
+ *
+ * $DragonFly: src/usr.sbin/pcvt/fontedit/Attic/fontedit.c,v 1.2 2004/02/10 02:59:42 rob Exp $
  */
 
 void clear_screen();
@@ -30,10 +32,10 @@ void clear_screen();
 #ifdef BSD
 #include <sys/ioctl.h>
 #endif BSD
-#if defined (__NetBSD__) || defined (__FreeBSD__)
+#if defined (__NetBSD__) || defined (__DragonFly__)
 #include <sys/termios.h>
 #include <sys/ioctl.h>
-#endif /* __NetBSD__ || __FreeBSD__ */
+#endif /* __NetBSD__ || __DragonFly__ */
 #include <signal.h>
 
 #ifdef CURFIX
@@ -107,9 +109,9 @@ struct termio old_stty, new_stty;
 #ifdef BSD
 struct sgttyb old_stty, new_stty;
 #endif BSD
-#if defined (__NetBSD__) || defined (__FreeBSD__)
+#if defined (__NetBSD__) || defined (__DragonFly__)
 struct termios old_stty, new_stty;
-#endif /* __NetBSD__ || __FreeBSD__ */
+#endif /* __NetBSD__ || __DragonFly__ */
 FILE * font_file = (FILE *)0;
 
 
@@ -130,9 +132,9 @@ interrupt()
 #ifdef BSD
         ioctl( 0, TIOCSETP, &old_stty );
 #endif BSD
-#if defined (__NetBSD__) || defined (__FreeBSD__)
+#if defined (__NetBSD__) || defined (__DragonFly__)
         ioctl( 0, TIOCSETA, &old_stty );
-#endif /* __NetBSD__ || __FreeBSD__ */
+#endif /* __NetBSD__ || __DragonFly__ */
 	clear_screen();
 	exit( 0 );
 }
@@ -187,9 +189,9 @@ char *argv[];
 #ifdef BSD
         ioctl( 0, TIOCGETP, &old_stty );
 #endif BSD
-#if defined (__NetBSD__) || defined (__FreeBSD__)
+#if defined (__NetBSD__) || defined (__DragonFly__)
         ioctl( 0, TIOCGETA, &old_stty );
-#endif /* __NetBSD__ || __FreeBSD__ */
+#endif /* __NetBSD__ || __DragonFly__ */
 	signal( SIGINT, (void *) interrupt );
 	new_stty = old_stty;
 #ifdef SYSV
@@ -197,12 +199,12 @@ char *argv[];
 	new_stty.c_cc[VMIN] = 1;
 	ioctl( 0, TCSETA, &new_stty );
 #endif SYSV
-#if defined (__NetBSD__) || defined (__FreeBSD__)
+#if defined (__NetBSD__) || defined (__DragonFly__)
 	new_stty.c_lflag &= ~ICANON;
         new_stty.c_lflag &= ~ECHO;
 	new_stty.c_cc[VMIN] = 1;
 	ioctl( 0, TIOCSETA, &new_stty );
-#endif /* __NetBSD__ || __FreeBSD__ */
+#endif /* __NetBSD__ || __DragonFly__ */
 #ifdef BSD
 	new_stty.sg_flags |= CBREAK;
         new_stty.sg_flags &= ~ECHO;
@@ -218,9 +220,9 @@ char *argv[];
 #ifdef BSD
 	ioctl( 0, TIOCSETP, &old_stty );
 #endif BSD
-#if defined (__NetBSD__) || defined (__FreeBSD__)
+#if defined (__NetBSD__) || defined (__DragonFly__)
 	ioctl( 0, TIOCSETA, &old_stty );
-#endif /* __NetBSD__ || __FreeBSD__ */
+#endif /* __NetBSD__ || __DragonFly__ */
 	clear_screen();
 
 	/* Overwrite the old file. */
diff --git a/usr.sbin/pppctl/pppctl.c b/usr.sbin/pppctl/pppctl.c
index 123ccd2b5d..be81d4c472 100644
--- a/usr.sbin/pppctl/pppctl.c
+++ b/usr.sbin/pppctl/pppctl.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pppctl/pppctl.c,v 1.21.2.2 2001/11/23 13:18:39 brian Exp $
- * $DragonFly: src/usr.sbin/pppctl/pppctl.c,v 1.2 2003/06/17 04:30:01 dillon Exp $
+ * $DragonFly: src/usr.sbin/pppctl/pppctl.c,v 1.3 2004/02/10 02:59:42 rob Exp $
  */
 
 #include <sys/types.h>
@@ -266,7 +266,7 @@ main(int argc, char **argv)
             break;
           pos += n;
         }
-#ifdef __FreeBSD__
+#ifdef __DragonFly__
       setproctitle("-%s", title);
 #else
       setproctitle("%s", title);
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index b690533aeb..876644fe06 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -33,7 +33,7 @@
  * @(#) Copyright (c) 1980, 1991, 1993, 1994 The Regents of the University of California.  All rights reserved.
  * @(#)pstat.c	8.16 (Berkeley) 5/9/95
  * $FreeBSD: src/usr.sbin/pstat/pstat.c,v 1.49.2.5 2002/07/12 09:12:49 des Exp $
- * $DragonFly: src/usr.sbin/pstat/pstat.c,v 1.6 2004/01/02 18:19:49 eirikn Exp $
+ * $DragonFly: src/usr.sbin/pstat/pstat.c,v 1.7 2004/02/10 02:59:42 rob Exp $
  */
 
 #define _KERNEL_STRUCTURES
@@ -93,7 +93,7 @@ struct nlist nl[] = {
 
 
 
-#ifdef __FreeBSD__
+#ifdef __DragonFly__
 #define SCCONS	(SNPTY+1)
 	{ "_sccons" },
 #define NSCCONS	(SNPTY+2)
@@ -730,7 +730,7 @@ ttymode(void)
 		KGET(SCONS, *tty);
 		ttyprt(&tty[0], 0);
 	}
-#ifdef __FreeBSD__
+#ifdef __DragonFly__
 	if (nl[NSCCONS].n_type != 0)
 		ttytype(tty, "vty", SCCONS, NSCCONS, 0);
 	if (nl[NSIO].n_type != 0)
diff --git a/usr.sbin/pw/pw_user.c b/usr.sbin/pw/pw_user.c
index efc76f61ae..4eaaf48444 100644
--- a/usr.sbin/pw/pw_user.c
+++ b/usr.sbin/pw/pw_user.c
@@ -25,7 +25,7 @@
  * 
  *
  * $FreeBSD: src/usr.sbin/pw/pw_user.c,v 1.34.2.13 2003/02/01 21:20:10 gad Exp $
- * $DragonFly: src/usr.sbin/pw/pw_user.c,v 1.2 2003/06/17 04:30:02 dillon Exp $
+ * $DragonFly: src/usr.sbin/pw/pw_user.c,v 1.3 2004/02/10 02:59:43 rob Exp $
  */
 
 #include <ctype.h>
@@ -125,7 +125,7 @@ pw_user(struct userconf * cnf, int mode, struct cargs * args)
 		"/nonexistent",
 		"/bin/sh",
 		0
-#if defined(__FreeBSD__)
+#if defined(__DragonFly__)
 		,0
 #endif
 	};
diff --git a/usr.sbin/pw/pw_vpw.c b/usr.sbin/pw/pw_vpw.c
index d54253c6f9..895c6574e4 100644
--- a/usr.sbin/pw/pw_vpw.c
+++ b/usr.sbin/pw/pw_vpw.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pw/pw_vpw.c,v 1.3 2000/01/15 00:20:21 davidn Exp $
- * $DragonFly: src/usr.sbin/pw/pw_vpw.c,v 1.2 2003/06/17 04:30:02 dillon Exp $
+ * $DragonFly: src/usr.sbin/pw/pw_vpw.c,v 1.3 2004/02/10 02:59:43 rob Exp $
  */
 
 #include <stdio.h>
@@ -191,7 +191,7 @@ RET_SETGRENT
 vsetgrent(void)
 {
 	vendgrent();
-#if defined(__FreeBSD__)
+#if defined(__DragonFly__)
 	return 0;
 #endif
 }
diff --git a/usr.sbin/pw/pwupd.h b/usr.sbin/pw/pwupd.h
index 1d8b08bd8c..29e7cebf83 100644
--- a/usr.sbin/pw/pwupd.h
+++ b/usr.sbin/pw/pwupd.h
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/pw/pwupd.h,v 1.7 2000/01/15 00:20:22 davidn Exp $
- * $DragonFly: src/usr.sbin/pw/pwupd.h,v 1.3 2003/11/03 19:31:41 eirikn Exp $
+ * $DragonFly: src/usr.sbin/pw/pwupd.h,v 1.4 2004/02/10 02:59:43 rob Exp $
  */
 
 #ifndef _PWUPD_H_
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-#if defined(__FreeBSD__)
+#if defined(__DragonFly__)
 #define	RET_SETGRENT	int
 #else
 #define	RET_SETGRENT	void
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index fe300d9318..5064ae2550 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -20,7 +20,7 @@
  *
  * @(#) Copyright (c) 1990, 1991, 1992, 1993, 1996 The Regents of the University of California.  All rights reserved.
  * $FreeBSD: src/usr.sbin/rarpd/rarpd.c,v 1.23.2.4 2002/12/01 19:19:34 dwmalone Exp $
- * $DragonFly: src/usr.sbin/rarpd/rarpd.c,v 1.2 2003/06/17 04:30:02 dillon Exp $
+ * $DragonFly: src/usr.sbin/rarpd/rarpd.c,v 1.3 2004/02/10 02:59:43 rob Exp $
  */
 
 /*
@@ -59,7 +59,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#if defined(SUNOS4) || defined(__FreeBSD__) /* XXX */
+#if defined(SUNOS4) || defined(__DragonFly__) /* XXX */
 #define HAVE_DIRENT_H
 #endif
 
diff --git a/usr.sbin/rip6query/rip6query.c b/usr.sbin/rip6query/rip6query.c
index bf39433a3d..ebbadce6fd 100644
--- a/usr.sbin/rip6query/rip6query.c
+++ b/usr.sbin/rip6query/rip6query.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/rip6query/rip6query.c,v 1.3.2.2 2001/07/03 11:02:08 ume Exp $
- * $DragonFly: src/usr.sbin/rip6query/rip6query.c,v 1.3 2003/11/03 19:31:41 eirikn Exp $
+ * $DragonFly: src/usr.sbin/rip6query/rip6query.c,v 1.4 2004/02/10 02:59:43 rob Exp $
  */
 
 #include <stdio.h>
@@ -47,9 +47,9 @@
 #include <sys/queue.h>
 
 #include <net/if.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if defined(__DragonFly__)
 #include <net/if_var.h>
-#endif /* __FreeBSD__ >= 3 */
+#endif /* __DragonFly__  */
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <arpa/inet.h>
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index e2600a8b19..2557e6539c 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -1,5 +1,5 @@
 /*	$FreeBSD: src/usr.sbin/route6d/route6d.c,v 1.2.2.5 2001/07/03 11:02:09 ume Exp $	*/
-/*	$DragonFly: src/usr.sbin/route6d/route6d.c,v 1.4 2003/11/03 19:31:42 eirikn Exp $	*/
+/*	$DragonFly: src/usr.sbin/route6d/route6d.c,v 1.5 2004/02/10 02:59:43 rob Exp $	*/
 /*	$KAME: route6d.c,v 1.64 2001/05/08 04:36:37 itojun Exp $	*/
 
 /*
@@ -60,9 +60,9 @@
 #include <sys/sysctl.h>
 #include <sys/uio.h>
 #include <net/if.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if defined(__DragonFly__)
 #include <net/if_var.h>
-#endif /* __FreeBSD__ >= 3 */
+#endif /* __DragonFly__  */
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
@@ -2257,7 +2257,7 @@ getifmtu(ifindex)
 	}
 	ifm = (struct if_msghdr *)buf;
 	mtu = ifm->ifm_data.ifi_mtu;
-#ifdef __FreeBSD__
+#ifdef __DragonFly__
 	if (ifindex != ifm->ifm_index) {
 		fatal("ifindex does not match with ifm_index");
 		/*NOTREACHED*/
@@ -2608,7 +2608,7 @@ rt_entry(rtm, again)
 	/* Check gateway */
 	if (!IN6_IS_ADDR_LINKLOCAL(&rrt->rrt_gw) &&
 	    !IN6_IS_ADDR_LOOPBACK(&rrt->rrt_gw)
-#ifdef __FreeBSD__
+#ifdef __DragonFly__
 	 && (rrt->rrt_flags & RTF_LOCAL) == 0
 #endif
 	    ) {
diff --git a/usr.sbin/rrenumd/lexer.l b/usr.sbin/rrenumd/lexer.l
index 77152e4168..6c032b2595 100644
--- a/usr.sbin/rrenumd/lexer.l
+++ b/usr.sbin/rrenumd/lexer.l
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/rrenumd/lexer.l,v 1.1.2.2 2001/07/03 11:02:10 ume Exp $
- * $DragonFly: src/usr.sbin/rrenumd/lexer.l,v 1.3 2003/11/03 19:31:42 eirikn Exp $
+ * $DragonFly: src/usr.sbin/rrenumd/lexer.l,v 1.4 2004/02/10 02:59:43 rob Exp $
  */
 
 %{
@@ -43,9 +43,9 @@
 #include <string.h>
 
 #include <net/if.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if defined(__DragonFly__) 
 #include <net/if_var.h>
-#endif /* __FreeBSD__ >= 3 */
+#endif /* __DragonFly__  */
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
diff --git a/usr.sbin/rrenumd/parser.y b/usr.sbin/rrenumd/parser.y
index 05e2375325..83dd68702b 100644
--- a/usr.sbin/rrenumd/parser.y
+++ b/usr.sbin/rrenumd/parser.y
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/rrenumd/parser.y,v 1.1.2.2 2001/07/03 11:02:10 ume Exp $
- * $DragonFly: src/usr.sbin/rrenumd/parser.y,v 1.3 2003/11/03 19:31:42 eirikn Exp $
+ * $DragonFly: src/usr.sbin/rrenumd/parser.y,v 1.4 2004/02/10 02:59:43 rob Exp $
  */
 
 %{
@@ -40,9 +40,9 @@
 #include <sys/queue.h>
 
 #include <net/if.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if defined(__DragonFly__)
 #include <net/if_var.h>
-#endif /* __FreeBSD__ >= 3 */
+#endif /* __DragonFly__  */
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c
index 90d3cd0fce..16677b8c61 100644
--- a/usr.sbin/rtadvd/config.c
+++ b/usr.sbin/rtadvd/config.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/rtadvd/config.c,v 1.3.2.5 2003/04/22 09:40:57 suz Exp $
- * $DragonFly: src/usr.sbin/rtadvd/config.c,v 1.3 2003/11/03 19:31:42 eirikn Exp $
+ * $DragonFly: src/usr.sbin/rtadvd/config.c,v 1.4 2004/02/10 02:59:43 rob Exp $
  */
 
 #include <sys/param.h>
@@ -39,9 +39,9 @@
 #include <sys/sysctl.h>
 
 #include <net/if.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if defined(__DragonFly__) 
 #include <net/if_var.h>
-#endif /* __FreeBSD__ >= 3 */
+#endif /* __DragonFly__  */
 #include <net/route.h>
 #include <net/if_dl.h>
 
diff --git a/usr.sbin/rtadvd/dump.c b/usr.sbin/rtadvd/dump.c
index 3348fd39ec..b896e7f7b7 100644
--- a/usr.sbin/rtadvd/dump.c
+++ b/usr.sbin/rtadvd/dump.c
@@ -29,16 +29,16 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/rtadvd/dump.c,v 1.1.2.3 2002/06/29 18:59:53 ume Exp $
- * $DragonFly: src/usr.sbin/rtadvd/dump.c,v 1.3 2003/11/03 19:31:42 eirikn Exp $
+ * $DragonFly: src/usr.sbin/rtadvd/dump.c,v 1.4 2004/02/10 02:59:43 rob Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/queue.h>
 
 #include <net/if.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if defined(__DragonFly__) 
 #include <net/if_var.h>
-#endif /* __FreeBSD__ >= 3 */
+#endif /* __DragonFly__ */
 #include <net/if_dl.h>
 
 #include <netinet/in.h>
@@ -68,7 +68,7 @@ extern struct rainfo *ralist;
 static char *ether_str(struct sockaddr_dl *);
 static void if_dump(void);
 
-#ifdef __FreeBSD__		/* XXX: see PORTABILITY */
+#ifdef __DragonFly__		/* XXX: see PORTABILITY */
 #define LONGLONG "%qu"
 #else
 #define LONGLONG "%llu"
diff --git a/usr.sbin/rtadvd/if.c b/usr.sbin/rtadvd/if.c
index 273bd08e2c..1705872d00 100644
--- a/usr.sbin/rtadvd/if.c
+++ b/usr.sbin/rtadvd/if.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/rtadvd/if.c,v 1.2.2.3 2001/07/03 11:02:14 ume Exp $
- * $DragonFly: src/usr.sbin/rtadvd/if.c,v 1.3 2003/11/03 19:31:42 eirikn Exp $
+ * $DragonFly: src/usr.sbin/rtadvd/if.c,v 1.4 2004/02/10 02:59:43 rob Exp $
  */
 
 #include <sys/param.h>
@@ -38,7 +38,7 @@
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <net/if_types.h>
-#ifdef __FreeBSD__
+#ifdef __DragonFly__
 # include <net/ethernet.h>
 #endif
 #include <ifaddrs.h>
diff --git a/usr.sbin/rtadvd/rrenum.c b/usr.sbin/rtadvd/rrenum.c
index 31eb1accff..79796736af 100644
--- a/usr.sbin/rtadvd/rrenum.c
+++ b/usr.sbin/rtadvd/rrenum.c
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/rtadvd/rrenum.c,v 1.2.2.2 2001/07/03 11:02:14 ume Exp $
- * $DragonFly: src/usr.sbin/rtadvd/rrenum.c,v 1.2 2003/06/17 04:30:02 dillon Exp $
+ * $DragonFly: src/usr.sbin/rtadvd/rrenum.c,v 1.3 2004/02/10 02:59:43 rob Exp $
  */
 #include <sys/types.h>
 #include <sys/param.h>
@@ -38,9 +38,9 @@
 #include <sys/sysctl.h>
 
 #include <net/if.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if defined(__DragonFly__)
 #include <net/if_var.h>
-#endif /* __FreeBSD__ >= 3 */
+#endif /* __DragonFly__ */
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index b0418c0fdf..e87d6c292a 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.8 (Berkeley) 3/28/97
 # $FreeBSD: src/usr.sbin/sendmail/Makefile,v 1.15.2.13 2002/03/25 21:32:29 gshapiro Exp $
-# $DragonFly: src/usr.sbin/sendmail/Makefile,v 1.4 2004/01/31 06:56:46 dillon Exp $
+# $DragonFly: src/usr.sbin/sendmail/Makefile,v 1.5 2004/02/10 02:59:43 rob Exp $
 
 SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 SMDIR=	${SENDMAIL_DIR}/src
@@ -33,6 +33,7 @@ MAPS=	-DMAP_REGEX -DDNSMAP
 
 CFLAGS+= -I${SMDIR} -I${SENDMAIL_DIR}/include -I.
 CFLAGS+= ${DBMDEF} ${NIS} -DMILTER -DNETINET6 -DTCPWRAPPERS ${MAPS}
+CFLAGS+= -D__FreeBSD__
 
 DPADD=	${LIBUTIL} ${LIBWRAP}
 LDADD=	-lutil -lwrap
diff --git a/usr.sbin/tcpdump/tcpslice/tcpslice.c b/usr.sbin/tcpdump/tcpslice/tcpslice.c
index 77b46538db..83057cbec1 100644
--- a/usr.sbin/tcpdump/tcpslice/tcpslice.c
+++ b/usr.sbin/tcpdump/tcpslice/tcpslice.c
@@ -20,7 +20,7 @@
  *
  * @(#) Copyright (c) 1987-1990 The Regents of the University of California. All rights reserved.
  * $FreeBSD: src/usr.sbin/tcpdump/tcpslice/tcpslice.c,v 1.9.2.1 2000/07/01 01:34:11 ps Exp $
- * $DragonFly: src/usr.sbin/tcpdump/tcpslice/tcpslice.c,v 1.2 2003/06/17 04:30:03 dillon Exp $
+ * $DragonFly: src/usr.sbin/tcpdump/tcpslice/tcpslice.c,v 1.3 2004/02/10 02:59:43 rob Exp $
  */
 
 /*
@@ -40,7 +40,7 @@ int fddipad;	/* XXX: libpcap needs this global */
 enum stamp_styles { TIMESTAMP_RAW, TIMESTAMP_READABLE, TIMESTAMP_PARSEABLE };
 enum stamp_styles timestamp_style = TIMESTAMP_RAW;
 
-#ifndef __FreeBSD__
+#ifndef __DragonFly__
 extern int getopt( int argc, char **argv, char *optstring );
 #endif
 
diff --git a/usr.sbin/usbdevs/usbdevs.c b/usr.sbin/usbdevs/usbdevs.c
index 94553989f1..94025d7a01 100644
--- a/usr.sbin/usbdevs/usbdevs.c
+++ b/usr.sbin/usbdevs/usbdevs.c
@@ -1,7 +1,7 @@
 /*
  * $NetBSD: usbdevs.c,v 1.17 2001/02/19 23:22:48 cgd Exp $
  * $FreeBSD: src/usr.sbin/usbdevs/usbdevs.c,v 1.8 2002/04/22 13:44:47 des Exp $
- * $DragonFly: src/usr.sbin/usbdevs/usbdevs.c,v 1.4 2003/12/30 01:01:48 dillon Exp $
+ * $DragonFly: src/usr.sbin/usbdevs/usbdevs.c,v 1.5 2004/02/10 02:59:44 rob Exp $
  */
 
 /*
@@ -49,7 +49,7 @@
 #include <err.h>
 #include <errno.h>
 #include <bus/usb/usb.h>
-#if defined(__FreeBSD__)
+#if defined(__DragonFly__)
 #include <sys/ioctl.h>
 #endif