I4B header files are now installed in include/i4b/ and no longer

in include/machine/.

Adapt #include paths.

Approved by:	re (kensmith)

12 files changed, 21 insertions, 21 deletions

diff --git a/usr.sbin/i4b/g711conv/g711conv.c b/usr.sbin/i4b/g711conv/g711conv.c
index f8087c0..f158a9d 100644
--- a/usr.sbin/i4b/g711conv/g711conv.c
+++ b/usr.sbin/i4b/g711conv/g711conv.c
@@ -76,7 +76,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <machine/i4b_ioctl.h>
+#include <i4b/i4b_ioctl.h>
 
 /* copy from CCITT G.711 specifications */
 
diff --git a/usr.sbin/i4b/isdnd/isdnd.8 b/usr.sbin/i4b/isdnd/isdnd.8
index 60e00b3..b3c749a 100644
--- a/usr.sbin/i4b/isdnd/isdnd.8
+++ b/usr.sbin/i4b/isdnd/isdnd.8
@@ -28,7 +28,7 @@
 .\"
 .\"	last edit-date: [Wed May  2 10:48:30 2001]
 .\"
-.Dd May 2, 2001
+.Dd July 5, 2007
 .Dt ISDND 8
 .Os
 .Sh NAME
@@ -223,7 +223,7 @@ from device
 .Pp
 The messages and message parameters are documented in the include
 file
-.Em /usr/include/machine/i4b_ioctl.h .
+.Em /usr/include/i4b/i4b_ioctl.h .
 .Pp
 Supported command and response messages (ioctls) to the kernel are:
 .Bl -tag -width Ds -compact -offset indent
diff --git a/usr.sbin/i4b/isdnd/isdnd.h b/usr.sbin/i4b/isdnd/isdnd.h
index 2dbed37..4e65bfe 100644
--- a/usr.sbin/i4b/isdnd/isdnd.h
+++ b/usr.sbin/i4b/isdnd/isdnd.h
@@ -68,8 +68,8 @@
 
 #include <net/if_sppp.h>
 
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b/i4b_ioctl.h>
+#include <i4b/i4b_cause.h>
 
 #include "config.h"		/* compile time configuration	*/
 #include "pathnames.h"		/* location of files		*/
diff --git a/usr.sbin/i4b/isdndebug/main.c b/usr.sbin/i4b/isdndebug/main.c
index caa38ab..3586173 100644
--- a/usr.sbin/i4b/isdndebug/main.c
+++ b/usr.sbin/i4b/isdndebug/main.c
@@ -47,8 +47,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
+#include <i4b/i4b_debug.h>
+#include <i4b/i4b_ioctl.h>
 
 char *bin_str(unsigned long val, int length);
 
diff --git a/usr.sbin/i4b/isdndecode/decode.h b/usr.sbin/i4b/isdndecode/decode.h
index 83bab00..7eb544b 100644
--- a/usr.sbin/i4b/isdndecode/decode.h
+++ b/usr.sbin/i4b/isdndecode/decode.h
@@ -50,8 +50,8 @@
 #include <sys/ioctl.h>
 #include <sys/file.h>
 
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/i4b_ioctl.h>
+#include <i4b/i4b_trace.h>
 
 #include "pcause.h"
 
diff --git a/usr.sbin/i4b/isdnmonitor/monprivate.h b/usr.sbin/i4b/isdnmonitor/monprivate.h
index ec6ec4d..d676344 100644
--- a/usr.sbin/i4b/isdnmonitor/monprivate.h
+++ b/usr.sbin/i4b/isdnmonitor/monprivate.h
@@ -62,7 +62,7 @@
 #if defined (__FreeBSD__) || defined(__NetBSD__) || \
     defined (__OpenBSD__) || defined(__bsdi__)
 
-#include <machine/i4b_ioctl.h>
+#include <i4b/i4b_ioctl.h>
 
 #else
 
diff --git a/usr.sbin/i4b/isdnphone/defs.h b/usr.sbin/i4b/isdnphone/defs.h
index 18da037..fade94b 100644
--- a/usr.sbin/i4b/isdnphone/defs.h
+++ b/usr.sbin/i4b/isdnphone/defs.h
@@ -54,8 +54,8 @@
 #include <sys/time.h>
 #include <sys/param.h>
 
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_tel_ioctl.h>
+#include <i4b/i4b_ioctl.h>
+#include <i4b/i4b_tel_ioctl.h>
 
 /* device file prefixes */
 
diff --git a/usr.sbin/i4b/isdntel/defs.h b/usr.sbin/i4b/isdntel/defs.h
index 9b5fd69..0d8d386 100644
--- a/usr.sbin/i4b/isdntel/defs.h
+++ b/usr.sbin/i4b/isdntel/defs.h
@@ -53,7 +53,7 @@
 #endif
 #include <sys/param.h>
 
-#include <machine/i4b_ioctl.h>
+#include <i4b/i4b_ioctl.h>
 
 #define GOOD	0
 #define	ERROR	(-1)
diff --git a/usr.sbin/i4b/isdntelctl/main.c b/usr.sbin/i4b/isdntelctl/main.c
index 3b11e5d..0e9c8ff 100644
--- a/usr.sbin/i4b/isdntelctl/main.c
+++ b/usr.sbin/i4b/isdntelctl/main.c
@@ -50,8 +50,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_tel_ioctl.h>
+#include <i4b/i4b_ioctl.h>
+#include <i4b/i4b_tel_ioctl.h>
 
 static void usage ( void );
 
diff --git a/usr.sbin/i4b/isdntest/main.c b/usr.sbin/i4b/isdntest/main.c
index 2bb2b24..08c7b89 100644
--- a/usr.sbin/i4b/isdntest/main.c
+++ b/usr.sbin/i4b/isdntest/main.c
@@ -49,8 +49,8 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b/i4b_ioctl.h>
+#include <i4b/i4b_cause.h>
 
 static void kbdrdhdl ( void );
 static void isdnrdhdl (int isdnfd );
diff --git a/usr.sbin/i4b/isdntrace/trace.h b/usr.sbin/i4b/isdntrace/trace.h
index 81fa415..95c6861 100644
--- a/usr.sbin/i4b/isdntrace/trace.h
+++ b/usr.sbin/i4b/isdntrace/trace.h
@@ -59,8 +59,8 @@
 #include <sys/stat.h>
 #include <sys/param.h>
 
-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/i4b_ioctl.h>
+#include <i4b/i4b_trace.h>
 
 #include "pcause_1tr6.h"	/* obsolete german national ISDN */
 #include "pcause_q850.h"
diff --git a/usr.sbin/i4b/man/i4b.4 b/usr.sbin/i4b/man/i4b.4
index f2e031a..be7b224 100644
--- a/usr.sbin/i4b/man/i4b.4
+++ b/usr.sbin/i4b/man/i4b.4
@@ -26,7 +26,7 @@
 .\"
 .\"	last edit-date: [Sun Jul 28 12:07:13 2002]
 .\"
-.Dd July 28, 2002
+.Dd July 5, 2007
 .Dt I4B 4
 .Os
 .Sh NAME
@@ -49,7 +49,7 @@ by user programs.
 .Pp
 The messages and message parameters are documented in the include
 file
-.Em /usr/include/machine/i4b_ioctl.h .
+.Em /usr/include/i4b/i4b_ioctl.h .
 .Pp
 The most important available ioctl's are:
 .Pp