diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-08-08 17:32:38 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-08-08 17:32:38 +0000 |
| commit | ea619b3e9f1e9b9e0f3c279a7cc30bf54721156c (patch) | |
| tree | e9dcc21cf71ce173f2790858a453ef0045f87260 /editors/openoffice-1.0/files | |
| parent | Fix another namespace collision which made the debug build segfaulting (diff) | |
machine/soundcard.h -> sys/soundcard.h
Fix trailing patch which was ignored
Submitted by: kan
Notes
Notes:
svn path=/head/; revision=64241
Diffstat (limited to 'editors/openoffice-1.0/files')
| -rw-r--r-- | editors/openoffice-1.0/files/patch-nas+nas-1.4.1.patch | 12 | ||||
| -rw-r--r-- | editors/openoffice-1.0/files/patch-nas:nas-1.4.1.patch | 12 |
2 files changed, 14 insertions, 10 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 a283035f623c..8623e0bd5892 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 a283035f623c..8623e0bd5892 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 @@ + |