summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbr <mbr@FreeBSD.org>2002-08-08 17:32:38 +0000
committermbr <mbr@FreeBSD.org>2002-08-08 17:32:38 +0000
commita2afe4ef3179f4c47123409da92256e32bba3eb7 (patch)
tree21ae43ab2cfda15221d19210b061ca45bfdb5765
parente8950459362248d696e0f970e20d8434cc78757e (diff)
downloadFreeBSD-ports-a2afe4ef3179f4c47123409da92256e32bba3eb7.zip
FreeBSD-ports-a2afe4ef3179f4c47123409da92256e32bba3eb7.tar.gz
machine/soundcard.h -> sys/soundcard.h
Fix trailing patch which was ignored Submitted by: kan
-rw-r--r--editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice-1.0/files/patch-nas:nas-1.4.1.patch12
-rw-r--r--editors/openoffice-1.1-devel/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice-1.1/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice-2.0-devel/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice-3-devel/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice-3/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice-devel/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice.org-1.0/files/patch-nas:nas-1.4.1.patch12
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice.org-1.1/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice.org-2-RC/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice.org-2-devel/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice.org-2.0/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice.org-2/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice.org-3-RC/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice.org-3-devel/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice.org-3/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice/files/patch-nas+nas-1.4.1.patch12
-rw-r--r--editors/openoffice/files/patch-nas:nas-1.4.1.patch12
23 files changed, 161 insertions, 115 deletions
diff --git a/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch b/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice-1.0/files/patch-nas:nas-1.4.1.patch b/editors/openoffice-1.0/files/patch-nas:nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice-1.0/files/patch-nas:nas-1.4.1.patch
+++ b/editors/openoffice-1.0/files/patch-nas:nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice-1.1-devel/files/patch-nas+nas-1.4.1.patch b/editors/openoffice-1.1-devel/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice-1.1-devel/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice-1.1-devel/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice-1.1/files/patch-nas+nas-1.4.1.patch b/editors/openoffice-1.1/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice-1.1/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice-1.1/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice-2.0-devel/files/patch-nas+nas-1.4.1.patch b/editors/openoffice-2.0-devel/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice-2.0-devel/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice-2.0-devel/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice-3-devel/files/patch-nas+nas-1.4.1.patch b/editors/openoffice-3-devel/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice-3-devel/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice-3-devel/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice-3/files/patch-nas+nas-1.4.1.patch b/editors/openoffice-3/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice-3/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice-3/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice-devel/files/patch-nas+nas-1.4.1.patch b/editors/openoffice-devel/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice-devel/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice-devel/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice.org-1.0/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice.org-1.0/files/patch-nas:nas-1.4.1.patch b/editors/openoffice.org-1.0/files/patch-nas:nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice.org-1.0/files/patch-nas:nas-1.4.1.patch
+++ b/editors/openoffice.org-1.0/files/patch-nas:nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice.org-1.1-devel/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice.org-1.1/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-1.1/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice.org-1.1/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice.org-1.1/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice.org-2-RC/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-2-RC/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice.org-2-RC/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice.org-2-RC/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice.org-2-devel/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-2-devel/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice.org-2-devel/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice.org-2-devel/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice.org-2.0-devel/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-2.0-devel/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice.org-2.0-devel/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice.org-2.0/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-2.0/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice.org-2.0/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice.org-2.0/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice.org-2/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-2/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice.org-2/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice.org-2/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice.org-3-RC/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-3-RC/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice.org-3-RC/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice.org-3-RC/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice.org-3-devel/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-3-devel/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice.org-3-devel/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice.org-3-devel/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice.org-3/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-3/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice.org-3/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice.org-3/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice.org-vcltesttool/files/patch-nas+nas-1.4.1.patch b/editors/openoffice.org-vcltesttool/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice.org-vcltesttool/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice/files/patch-nas+nas-1.4.1.patch b/editors/openoffice/files/patch-nas+nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice/files/patch-nas+nas-1.4.1.patch
+++ b/editors/openoffice/files/patch-nas+nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
diff --git a/editors/openoffice/files/patch-nas:nas-1.4.1.patch b/editors/openoffice/files/patch-nas:nas-1.4.1.patch
index a283035..8623e0b 100644
--- a/editors/openoffice/files/patch-nas:nas-1.4.1.patch
+++ b/editors/openoffice/files/patch-nas:nas-1.4.1.patch
@@ -1,6 +1,6 @@
--- ../nas/nas-1.4.1.patch.orig Thu Nov 1 17:27:31 2001
-+++ ../nas/nas-1.4.1.patch Sun May 19 14:58:01 2002
-@@ -120,26 +120,137 @@
++++ ../nas/nas-1.4.1.patch Thu Aug 8 16:47:25 2002
+@@ -120,26 +120,139 @@
return(-1);
}
@@ -59,11 +59,13 @@
+ #endif /* NEEDUSLEEP */
+--- misc/nas-1.4.1/server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
++++ misc/build/nas-1.4.1/server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
-+@@ -156,7 +156,9 @@
++@@ -155,8 +155,10 @@
++ #include <assert.h>
+
+ #ifdef __FreeBSD__
-+ # include <machine/soundcard.h>
++-# include <machine/soundcard.h>
+-# include <machine/pcaudioio.h>
+++# include <sys/soundcard.h>
++# ifdef __i386__
++# include <machine/pcaudioio.h>
++# endif
@@ -161,7 +163,7 @@
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath $(PROJECTROOT)/etc/
+ #endif
-+--- misc/build/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++--- misc/nas-1.4.1/server/os/utils.c.orig Tue Jul 23 23:48:23 2002
++++ misc/build/nas-1.4.1/server/os/utils.c Tue Jul 23 23:49:06 2002
+@@ -120,7 +120,7 @@
+
OpenPOWER on IntegriCloud