summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/nas/Makefile13
-rw-r--r--audio/nas/files/md54
-rw-r--r--audio/nas/files/patch-sum9
-rw-r--r--audio/nas/patches/patch-aa227
-rw-r--r--audio/nas/patches/patch-ab508
-rw-r--r--audio/nas/patches/patch-ac39
-rw-r--r--audio/nas/patches/patch-ad13
-rw-r--r--audio/nas/pkg/PLIST125
8 files changed, 127 insertions, 811 deletions
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 45721324bb1..d14514e3b7d 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,15 +1,18 @@
-# $NetBSD: Makefile,v 1.9 1999/12/24 03:37:26 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/04 01:31:55 jlam Exp $
# FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp
#
-DISTNAME= nas-1.2p5
-PKGNAME= nas-1.2.5
+DISTNAME= nas-1.4.src
+PKGNAME= ${DISTNAME:S/.src//}
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=audio/nas/}
MAINTAINER= packages@netbsd.org
-HOMEPAGE= http://home.rmi.net/~jon/nas.html
+HOMEPAGE= http://radscan.com/nas.html
-USE_IMAKE= yes
+USE_IMAKE= # defined
+USE_X11BASE= # defined
+
+WRKSRC= ${WRKDIR}/${PKGNAME}
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/nas/files/md5 b/audio/nas/files/md5
index 38881056f78..9054f37fbc0 100644
--- a/audio/nas/files/md5
+++ b/audio/nas/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1998/08/07 13:16:55 agc Exp $
+$NetBSD: md5,v 1.5 2000/08/04 01:31:56 jlam Exp $
-MD5 (nas-1.2p5.tar.gz) = 27c7118347dd71dd32a7f27d7e6d44bc
+MD5 (nas-1.4.src.tar.gz) = 8b9280377d0ad404afbaa5a93f213bc5
diff --git a/audio/nas/files/patch-sum b/audio/nas/files/patch-sum
index b7c1b81c1a3..cec34863675 100644
--- a/audio/nas/files/patch-sum
+++ b/audio/nas/files/patch-sum
@@ -1,6 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:13 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/04 01:31:56 jlam Exp $
-MD5 (patch-aa) = eb92c8229e44896ea0e61dc22fc28f48
-MD5 (patch-ab) = 209de19c745dbc29fdae3132961e9ed6
-MD5 (patch-ac) = 69603cef0325d4abf3c41a327933dda0
-MD5 (patch-ad) = a1f606e530cd60908c0056d6c76423f2
+MD5 (patch-aa) = 3820e20e048424230d36c917ffdba227
+MD5 (patch-ab) = 0feb82f92c4fce1cae6b95c382d4680c
+MD5 (patch-ac) = e741e437ad3a9f6766dfd691e7dfd862
diff --git a/audio/nas/patches/patch-aa b/audio/nas/patches/patch-aa
index 34d72f7191d..f3fb11b0c85 100644
--- a/audio/nas/patches/patch-aa
+++ b/audio/nas/patches/patch-aa
@@ -1,226 +1,13 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:36:04 agc Exp $
+$NetBSD: patch-aa,v 1.4 2000/08/04 01:31:56 jlam Exp $
---- ./clients/audio/audial/audial.c.orig Sun May 17 19:29:08 1998
-+++ ./clients/audio/audial/audial.c Sun May 17 19:31:30 1998
-@@ -133,6 +133,7 @@
- signal(SIGALRM, SIG_DFL);
- }
-
-+#if (!defined(__FreeBSD__) || (__FreeBSD__ < 3)) && !defined(__NetBSD__)
- static void
- usleep(usecs)
- unsigned int usecs;
-@@ -149,6 +150,7 @@
- setitimer(ITIMER_REAL, &ntval, &otval);
- pause();
- }
-+#endif /* !__FreeBSD__ && !__NetBSD__ */
-
- #endif /* SYSV else not */
- #endif /* VMS else not */
---- ./clients/audio/auedit/Graph.c.orig Sun May 17 17:22:27 1998
-+++ ./clients/audio/auedit/Graph.c Sun May 17 19:40:41 1998
-@@ -28,7 +28,12 @@
- */
-
- #ifndef WIN32
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#include <limits.h>
-+#define MAXSHORT SHRT_MAX
-+#else /* !__FreeBSD__ && !__NetBSD__ */
- #include <values.h>
-+#endif /* __FreeBSD__ || __NetBSD__ */
- #else /* WIN32 */
- #define MAXSHORT 0x7fff
- #endif /* WIN32 */
---- ./config/NetAudio.tmpl.orig Sun May 17 15:49:55 1998
-+++ ./config/NetAudio.tmpl Sun May 17 18:29:27 1998
-@@ -193,12 +193,14 @@
+--- config/NetAudio.tmpl.orig Sat Mar 4 21:40:50 2000
++++ config/NetAudio.tmpl Thu Aug 3 21:03:54 2000
+@@ -207,7 +207,7 @@
+ #define AuInstallManPage(file,destdir) AuInstallManPageLong(file,destdir,file)
#define AuInstallManPageLong(file,destdir,dest) @@\
- install.man:: file.man @@\
-+ @if [ ! -f file.man.orig ]; then \ @@\
-+ cp file.man file.man.orig; \ @@\
-+ fi @@\
+-install.man:: file.man @@\
++tmp.man:: file.man @@\
@(rel=`cat $(TOP)/RELEASE | \ @@\
sed 's/Network Audio System Release //'`; \ @@\
sed -f $(TOP)/config/mungeman \ @@\
-- -e "s/_RELEASE_/$$rel/" < file.man > tmp.man) @@\
-- InstallManPageLong(tmp,destdir,dest) @@\
-- @$(RM) tmp.man
-+ -e "s/_RELEASE_/$$rel/" < file.man.orig > file.man) @@\
-+ InstallManPageLong(file,destdir,dest)
-
- #define SingleAudioProgram(program) @@\
- InstallProgram(program,$(BINDIR)) @@\
---- ./include/audio/Imakefile.orig Sun May 17 17:03:45 1998
-+++ ./include/audio/Imakefile Sun May 17 20:33:52 1998
-@@ -24,7 +24,11 @@
-
- #include "../../config/NetAudio.tmpl"
-
--INSTALLFLAGS = $(INSTINCFLAGS)
-+#if HasBsdMake
-+INSTALLFLAGS += $(INSTINCFLAGS)
-+#else
-+INSTALLFLAGS = $(INSTALLFLAGS) $(INSTINCFLAGS)
-+#endif
-
- HEADERS = Afuncproto.h Afuncs.h Amd.h Aos.h Aosdefs.h Aproto.h audio.h
- FILES = $(HEADERS)
-@@ -37,7 +41,7 @@
- MakeDir($(BUILDINCDIR:/=\))
- #endif /* WIN32 */
-
--BuildIncludes($(HEADERS),audio,..)
-+BuildIncludes($(HEADERS),audio,.)
-
- #if ProjectX < 5 /* X11R4 doesn't make dir explicitly */
- #ifndef MakeDir
---- ./lib/audio/Alibint.c.orig Sun May 17 15:02:27 1998
-+++ ./lib/audio/Alibint.c Sun May 17 17:10:44 1998
-@@ -1324,11 +1324,12 @@
- static char *_SysErrorMsg (n)
- int n;
- {
--#if !defined(__FreeBSD__)
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
- extern char *sys_errlist[];
- #endif
- extern int sys_nerr;
-- char *s = ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
-+ char *s;
-+ s = ((n >= 0 && n < sys_nerr) ? (char *) sys_errlist[n] : "unknown error");
-
- return (s ? s : "no such error");
- }
---- ./lib/audio/ConnSvr.c.orig Sun May 17 15:03:00 1998
-+++ ./lib/audio/ConnSvr.c Sun May 17 15:03:32 1998
-@@ -54,9 +54,9 @@
- #define FIOSNBIO FIONBIO
- #endif /* WIN32 */
-
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <sys/param.h>
--#endif /* __FreeBSD__ */
-+#endif /* __FreeBSD__ || __NetBSD__ */
- #include <ctype.h>
- #include <audio/Alibint.h>
- #include <audio/Aos.h>
---- ./lib/audio/Imakefile.orig Sun May 17 17:01:15 1998
-+++ ./lib/audio/Imakefile Sun May 17 20:33:19 1998
-@@ -65,11 +65,20 @@
- COMPAT_OBJS = AuGetBest.o
- #endif /* ProjectX < 5 */
-
-+#if HasBSD44Sockets
-+ SOCK_DEFINES = -DBSD44SOCKETS
-+#endif
-+
- EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/AuErrorDB\"
-
- DEFINES = $(MALLOC_DEFINES) $(SYSV_DEFINES)
-- CONN_DEFINES = ConnectionFlags
-- INSTALLFLAGS = $(INSTINCFLAGS)
-+ CONN_DEFINES = ConnectionFlags $(SOCK_DEFINES)
-+
-+#if HasBsdMake
-+ INSTALLFLAGS += $(INSTINCFLAGS)
-+#else
-+ INSTALLFLAGS = $(INSTINCFLAGS)
-+#endif
-
- HEADERS = Alibint.h Alibnet.h Xtutil.h audiolib.h audioutil.h snd.h wave.h \
- voc.h aiff.h sound.h soundlib.h fileutil.h 8svx.h Astreams.h
-@@ -120,7 +129,7 @@
-
- #endif
-
--BuildIncludes($(HEADERS),audio,..)
-+BuildIncludes($(HEADERS),audio,.)
- InstallMultiple($(HEADERS),$(INCDIR))
- #if ProjectX >= 5
- InstallNonExecFile(AuErrorDB,$(LIBDIR))
---- ./lib/audio/Astreams.c.orig Sun May 17 19:34:53 1998
-+++ ./lib/audio/Astreams.c Sun May 17 19:36:13 1998
-@@ -51,8 +51,11 @@
- #include <errno.h>
- #include <sys/stropts.h>
-
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
-+/* needed for some platforms which do not define this in <errno.h> */
- extern int errno;
- extern char *sys_errlist[];
-+#endif
-
- /* stolen from <X11/Xproto.h> */
- typedef struct {
---- ./lib/audio/ErrHndlr.c.orig Sun May 17 19:04:41 1998
-+++ ./lib/audio/ErrHndlr.c Sun May 17 19:04:45 1998
-@@ -59,9 +59,9 @@
- AuIOErrorHandler oldhandler = aud->funcs.ioerror_handler;
-
- if (!oldhandler)
-- oldhandler = (AuErrorHandler) _AuDefaultIOError;
-+ oldhandler = (AuIOErrorHandler) _AuDefaultIOError;
-
- aud->funcs.ioerror_handler = handler ? handler :
-- (AuErrorHandler) _AuDefaultIOError;
-+ (AuIOErrorHandler) _AuDefaultIOError;
- return oldhandler;
- }
---- ./server/dda/voxware/auvoxware.c.orig Sun May 17 15:08:50 1998
-+++ ./server/dda/voxware/auvoxware.c Sun May 17 15:18:55 1998
-@@ -164,6 +164,9 @@
- #ifdef __FreeBSD__
- #include <machine/soundcard.h>
- #include <machine/pcaudioio.h>
-+#elif defined(__NetBSD__)
-+#include <sys/ioctl.h>
-+#include <soundcard.h>
- #else
- #include <sys/soundcard.h>
- #endif
---- ./server/dia/au.h.orig Sun May 17 20:36:35 1998
-+++ ./server/dia/au.h Sun May 17 15:05:42 1998
-@@ -33,7 +33,7 @@
- #include "../dda/sgi/ausgi.h"
- #endif /* sgi */
-
--#if defined(__FreeBSD__) || defined(linux) || (defined(SVR4) && defined(SYSV386))
-+#if defined(__FreeBSD__) || defined(linux) || (defined(SVR4) && defined(SYSV386)) || defined(__NetBSD__)
- #include "../dda/voxware/auvoxware.h"
- #endif
-
---- ./server/os/connection.c.orig Sun May 17 15:04:27 1998
-+++ ./server/os/connection.c Sun May 17 15:04:51 1998
-@@ -1032,7 +1032,7 @@
-
- for (i=0; i<MAXSOCKS; i++) ConnectionTranslation[i] = 0;
- #ifndef X_NOT_POSIX
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- lastfdesc = getdtablesize() - 1;
- #else
- lastfdesc = sysconf(_SC_OPEN_MAX) - 1;
---- ./server/Imakefile.orig Sun May 17 15:07:12 1998
-+++ ./server/Imakefile Sun May 17 15:38:11 1998
-@@ -52,6 +52,8 @@
- #else
- SYSLIBS = /usr/ucblib/libucb.a
- #endif
-+#elif defined(NetBSDArchitecture)
-+ SYSLIBS = -lossaudio
- #else
- SYSLIBS =
- #endif
-@@ -87,7 +89,7 @@
- #endif
-
-
--#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture)
-+#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture)
- #define CanBuildAuServer YES
- ALL1 = auvoxware
- #define BuildVoxServer
diff --git a/audio/nas/patches/patch-ab b/audio/nas/patches/patch-ab
index f2609f3d690..39eff837da0 100644
--- a/audio/nas/patches/patch-ab
+++ b/audio/nas/patches/patch-ab
@@ -1,501 +1,17 @@
-$NetBSD: patch-ab,v 1.4 1998/08/07 10:36:05 agc Exp $
+$NetBSD: patch-ab,v 1.5 2000/08/04 01:31:56 jlam Exp $
---- lib/audio/8svx.c 1998/05/18 10:17:50 1.1
-+++ lib/audio/8svx.c 1998/05/18 10:22:13
-@@ -43,7 +43,7 @@
- char n;
+--- server/Imakefile.orig Sat Feb 12 15:22:43 2000
++++ server/Imakefile Thu Aug 3 21:03:54 2000
+@@ -207,10 +207,11 @@
+ $(RM) $(ALL)
- if ((status = fread(c, sizeof(SvxChunk), 1, fp)))
-- if (LITTLE_ENDIAN)
-+ if (NAS_LITTLE_ENDIAN)
- swapl(&c->ckSize, n);
+ ETCDIR = NasConfigSearchPath
++ EGDIR = ${PREFIX}/share/examples/nas
- return status;
-@@ -87,17 +87,17 @@
- {
- AuUint8 c;
+ InstallManPage(nasd,$(MANDIR))
+ InstallManPage(nasd.conf,$(MANDIR))
+-InstallNonExecFile(nasd.conf.eg,$(ETCDIR))
++InstallNonExecFile(nasd.conf.eg,$(EGDIR))
-- si->numSamples = FileReadL(si->fp, LITTLE_ENDIAN);
-- FileReadL(si->fp, LITTLE_ENDIAN);
-- FileReadL(si->fp, LITTLE_ENDIAN);
-- si->sampleRate = FileReadS(si->fp, LITTLE_ENDIAN);
-+ si->numSamples = FileReadL(si->fp, NAS_LITTLE_ENDIAN);
-+ FileReadL(si->fp, NAS_LITTLE_ENDIAN);
-+ FileReadL(si->fp, NAS_LITTLE_ENDIAN);
-+ si->sampleRate = FileReadS(si->fp, NAS_LITTLE_ENDIAN);
- readByte(&c);
- readByte(&c);
-
- if (c)
- Err();
-
-- FileReadL(si->fp, LITTLE_ENDIAN);
-+ FileReadL(si->fp, NAS_LITTLE_ENDIAN);
- }
- /* sound data chunk */
- else if (!cmpID(&ck.ckID, SVX_BodyID))
-@@ -149,7 +149,7 @@
-
- si->sizeOffset = ftell(si->fp);
-
-- if (!FileWriteL(0, si->fp, LITTLE_ENDIAN) ||
-+ if (!FileWriteL(0, si->fp, NAS_LITTLE_ENDIAN) ||
- !fwrite(SVX_8svxID, sizeof(SVX_ID), 1, si->fp))
- Err();
-
-@@ -158,7 +158,7 @@
- if ((n = strlen(si->comment)))
- {
- if (!fwrite(SVX_NameID, sizeof(SVX_ID), 1, si->fp) ||
-- !FileWriteL(n, si->fp, LITTLE_ENDIAN) ||
-+ !FileWriteL(n, si->fp, NAS_LITTLE_ENDIAN) ||
- !fwrite(si->comment, n, 1, si->fp))
- Err();
-
-@@ -166,13 +166,13 @@
- }
-
- if (!fwrite(SVX_VhdrID, sizeof(SVX_ID), 1, si->fp) ||
-- !FileWriteL(SVX_SizeofVhdrChunk, si->fp, LITTLE_ENDIAN) ||
-- !FileWriteL(si->numSamples, si->fp, LITTLE_ENDIAN) ||
-- !FileWriteL(0, si->fp, LITTLE_ENDIAN) ||
-- !FileWriteL(0, si->fp, LITTLE_ENDIAN) ||
-- !FileWriteS(si->sampleRate, si->fp, LITTLE_ENDIAN) ||
-- !FileWriteS(0, si->fp, LITTLE_ENDIAN) ||
-- !FileWriteL(SVX_MaxVolume, si->fp, LITTLE_ENDIAN))
-+ !FileWriteL(SVX_SizeofVhdrChunk, si->fp, NAS_LITTLE_ENDIAN) ||
-+ !FileWriteL(si->numSamples, si->fp, NAS_LITTLE_ENDIAN) ||
-+ !FileWriteL(0, si->fp, NAS_LITTLE_ENDIAN) ||
-+ !FileWriteL(0, si->fp, NAS_LITTLE_ENDIAN) ||
-+ !FileWriteS(si->sampleRate, si->fp, NAS_LITTLE_ENDIAN) ||
-+ !FileWriteS(0, si->fp, NAS_LITTLE_ENDIAN) ||
-+ !FileWriteL(SVX_MaxVolume, si->fp, NAS_LITTLE_ENDIAN))
- Err();
-
- si->fileSize += sizeof(SvxChunk) + SVX_SizeofVhdrChunk;
-@@ -182,7 +182,7 @@
-
- si->dataOffset = ftell(si->fp);
-
-- if (!FileWriteL(0, si->fp, LITTLE_ENDIAN))
-+ if (!FileWriteL(0, si->fp, NAS_LITTLE_ENDIAN))
- Err();
-
- si->fileSize += sizeof(SvxChunk);
-@@ -202,9 +202,9 @@
- if (si->writing)
- {
- fseek(si->fp, si->sizeOffset, 0);
-- FileWriteL(si->fileSize + si->dataSize, si->fp, LITTLE_ENDIAN);
-+ FileWriteL(si->fileSize + si->dataSize, si->fp, NAS_LITTLE_ENDIAN);
- fseek(si->fp, si->dataOffset, 0);
-- FileWriteL(si->dataSize, si->fp, LITTLE_ENDIAN);
-+ FileWriteL(si->dataSize, si->fp, NAS_LITTLE_ENDIAN);
- }
-
- status = fclose(si->fp);
---- lib/audio/aiff.c 1998/05/18 10:20:15 1.1
-+++ lib/audio/aiff.c 1998/05/18 10:23:52
-@@ -218,7 +218,7 @@
- char n;
-
- if ((status = fread(c, sizeof(AiffChunk), 1, fp)))
-- if (LITTLE_ENDIAN)
-+ if (NAS_LITTLE_ENDIAN)
- swapl(&c->ckSize, n);
-
- return status;
-@@ -262,9 +262,9 @@
- {
- char rate[AIFF_SizeofExtended];
-
-- ai->channels = FileReadS(ai->fp, LITTLE_ENDIAN);
-- ai->numSamples = FileReadL(ai->fp, LITTLE_ENDIAN);
-- ai->bitsPerSample = FileReadS(ai->fp, LITTLE_ENDIAN);
-+ ai->channels = FileReadS(ai->fp, NAS_LITTLE_ENDIAN);
-+ ai->numSamples = FileReadL(ai->fp, NAS_LITTLE_ENDIAN);
-+ ai->bitsPerSample = FileReadS(ai->fp, NAS_LITTLE_ENDIAN);
-
- if (!fread(rate, AIFF_SizeofExtended, 1, ai->fp))
- Err();
-@@ -277,8 +277,8 @@
- AuInt32 blockSize,
- offset;
-
-- offset = FileReadL(ai->fp, LITTLE_ENDIAN);
-- blockSize = FileReadL(ai->fp, LITTLE_ENDIAN);
-+ offset = FileReadL(ai->fp, NAS_LITTLE_ENDIAN);
-+ blockSize = FileReadL(ai->fp, NAS_LITTLE_ENDIAN);
- ai->dataOffset = ftell(ai->fp) - sizeof(long) * 3 + offset;
- ai->dataSize = ck.ckSize - 8;
-
-@@ -290,7 +290,7 @@
- {
- unsigned short numComments;
-
-- numComments = FileReadS(ai->fp, LITTLE_ENDIAN);
-+ numComments = FileReadS(ai->fp, NAS_LITTLE_ENDIAN);
-
- if (numComments)
- {
-@@ -298,9 +298,9 @@
- AIFF_MARKER_ID marker;
- unsigned short count;
-
-- timeStamp = FileReadL(ai->fp, LITTLE_ENDIAN);
-- marker = FileReadS(ai->fp, LITTLE_ENDIAN);
-- count = FileReadS(ai->fp, LITTLE_ENDIAN);
-+ timeStamp = FileReadL(ai->fp, NAS_LITTLE_ENDIAN);
-+ marker = FileReadS(ai->fp, NAS_LITTLE_ENDIAN);
-+ count = FileReadS(ai->fp, NAS_LITTLE_ENDIAN);
-
- if (count)
- {
-@@ -353,7 +353,7 @@
-
- ai->sizeOffset = ftell(ai->fp);
-
-- if (!FileWriteL(0, ai->fp, LITTLE_ENDIAN) ||
-+ if (!FileWriteL(0, ai->fp, NAS_LITTLE_ENDIAN) ||
- !fwrite(AIFF_AiffID, sizeof(AIFF_ID), 1, ai->fp))
- Err();
-
-@@ -367,15 +367,15 @@
- size = AIFF_SizeofCommentChunk + PAD2(n);
-
- if (!fwrite(AIFF_CommentID, sizeof(AIFF_ID), 1, ai->fp) ||
-- !FileWriteL(size, ai->fp, LITTLE_ENDIAN) ||
-+ !FileWriteL(size, ai->fp, NAS_LITTLE_ENDIAN) ||
- /* one comment */
-- !FileWriteS(1, ai->fp, LITTLE_ENDIAN) ||
-+ !FileWriteS(1, ai->fp, NAS_LITTLE_ENDIAN) ||
- /* XXX: maybe we should use the real time */
-- !FileWriteL(0, ai->fp, LITTLE_ENDIAN) ||
-+ !FileWriteL(0, ai->fp, NAS_LITTLE_ENDIAN) ||
- /* no marker */
-- !FileWriteS(0, ai->fp, LITTLE_ENDIAN) ||
-+ !FileWriteS(0, ai->fp, NAS_LITTLE_ENDIAN) ||
- /* comment length */
-- !FileWriteS(n, ai->fp, LITTLE_ENDIAN) ||
-+ !FileWriteS(n, ai->fp, NAS_LITTLE_ENDIAN) ||
- !fwrite(ai->comment, n, 1, ai->fp))
- Err();
-
-@@ -388,10 +388,10 @@
- ConvertToIeeeExtended((double) ai->sampleRate, rate);
-
- if (!fwrite(AIFF_CommonID, sizeof(AIFF_ID), 1, ai->fp) ||
-- !FileWriteL(AIFF_SizeofCommonChunk, ai->fp, LITTLE_ENDIAN) ||
-- !FileWriteS(ai->channels, ai->fp, LITTLE_ENDIAN) ||
-- !FileWriteL(ai->numSamples, ai->fp, LITTLE_ENDIAN) ||
-- !FileWriteS(ai->bitsPerSample, ai->fp, LITTLE_ENDIAN) ||
-+ !FileWriteL(AIFF_SizeofCommonChunk, ai->fp, NAS_LITTLE_ENDIAN) ||
-+ !FileWriteS(ai->channels, ai->fp, NAS_LITTLE_ENDIAN) ||
-+ !FileWriteL(ai->numSamples, ai->fp, NAS_LITTLE_ENDIAN) ||
-+ !FileWriteS(ai->bitsPerSample, ai->fp, NAS_LITTLE_ENDIAN) ||
- !fwrite(rate, AIFF_SizeofExtended, 1, ai->fp))
- Err();
-
-@@ -402,11 +402,11 @@
-
- ai->dataOffset = ftell(ai->fp);
-
-- if (!FileWriteL(0, ai->fp, LITTLE_ENDIAN) ||
-+ if (!FileWriteL(0, ai->fp, NAS_LITTLE_ENDIAN) ||
- /* offset */
-- !FileWriteL(0, ai->fp, LITTLE_ENDIAN) ||
-+ !FileWriteL(0, ai->fp, NAS_LITTLE_ENDIAN) ||
- /* block size */
-- !FileWriteL(0, ai->fp, LITTLE_ENDIAN))
-+ !FileWriteL(0, ai->fp, NAS_LITTLE_ENDIAN))
- Err();
-
- ai->fileSize += sizeof(AiffChunk) + AIFF_SizeofSoundDataChunk;
-@@ -430,9 +430,9 @@
-
- fseek(ai->fp, ai->sizeOffset, 0);
- FileWriteL(ai->fileSize + PAD2(ai->dataSize), ai->fp,
-- LITTLE_ENDIAN);
-+ NAS_LITTLE_ENDIAN);
- fseek(ai->fp, ai->dataOffset, 0);
-- FileWriteL(ai->dataSize, ai->fp, LITTLE_ENDIAN);
-+ FileWriteL(ai->dataSize, ai->fp, NAS_LITTLE_ENDIAN);
- }
-
- status = fclose(ai->fp);
---- lib/audio/convutil.c 1998/05/18 10:20:15 1.1
-+++ lib/audio/convutil.c 1998/05/18 10:24:44
-@@ -107,7 +107,7 @@
- convert(char, x << 8);
- break;
- case AuFormatLinearSigned16MSB:
-- if (LITTLE_ENDIAN)
-+ if (NAS_LITTLE_ENDIAN)
- convert(short, ((((unsigned short) x) >> 8) | (x << 8)));
- #if 0
- else
-@@ -115,14 +115,14 @@
- #endif
- break;
- case AuFormatLinearUnsigned16MSB:
-- if (LITTLE_ENDIAN)
-+ if (NAS_LITTLE_ENDIAN)
- convert(short,
- (((((unsigned short) x) >> 8) | (x << 8)) ^ 0x8000));
- else
- convert(short, x ^ 0x8000);
- break;
- case AuFormatLinearSigned16LSB:
-- if (BIG_ENDIAN)
-+ if (NAS_BIG_ENDIAN)
- convert(short, ((((unsigned short) x) >> 8) | (x << 8)));
- #if 0
- else
-@@ -130,7 +130,7 @@
- #endif
- break;
- case AuFormatLinearUnsigned16LSB:
-- if (BIG_ENDIAN)
-+ if (NAS_BIG_ENDIAN)
- convert(short,
- (((((unsigned short) x) >> 8) | (x << 8)) ^ 0x8000));
- else
-@@ -266,7 +266,7 @@
- convert(char, x >> 8);
- break;
- case AuFormatLinearSigned16MSB:
-- if (LITTLE_ENDIAN)
-+ if (NAS_LITTLE_ENDIAN)
- convert(short, ((((unsigned short) x) >> 8) | (x << 8)));
- #if 0
- else
-@@ -276,7 +276,7 @@
- #endif
- break;
- case AuFormatLinearUnsigned16MSB:
-- if (LITTLE_ENDIAN)
-+ if (NAS_LITTLE_ENDIAN)
- {
- convert(short,
- (((((unsigned short) x) >> 8) | (x << 8)) ^ 0x8000));
-@@ -287,7 +287,7 @@
- }
- break;
- case AuFormatLinearSigned16LSB:
-- if (BIG_ENDIAN)
-+ if (NAS_BIG_ENDIAN)
- convert(short, ((((unsigned short) x) >> 8) | (x << 8)));
- #if 0
- else
-@@ -297,7 +297,7 @@
- #endif
- break;
- case AuFormatLinearUnsigned16LSB:
-- if (BIG_ENDIAN)
-+ if (NAS_BIG_ENDIAN)
- {
- convert(short,
- (((((unsigned short) x) >> 8) | (x << 8)) ^ 0x8000));
---- lib/audio/fileutil.h 1998/05/18 10:18:30 1.1
-+++ lib/audio/fileutil.h 1998/05/18 10:25:31
-@@ -58,8 +58,8 @@
- #endif
- #endif /* _FUNCPROTOBEGIN */
-
--#define LITTLE_ENDIAN (*(char *) &endian)
--#define BIG_ENDIAN (!LITTLE_ENDIAN)
-+#define NAS_LITTLE_ENDIAN (*(char *) &endian)
-+#define NAS_BIG_ENDIAN (!NAS_LITTLE_ENDIAN)
- static int endian = 1;
-
- /* byte swap a AuInt32 */
---- lib/audio/snd.c 1998/05/18 10:20:15 1.1
-+++ lib/audio/snd.c 1998/05/18 10:25:57
-@@ -62,7 +62,7 @@
- {
- if (si->writing)
- {
-- if (LITTLE_ENDIAN)
-+ if (NAS_LITTLE_ENDIAN)
- {
- char n;
-
-@@ -136,7 +136,7 @@
- Err();
-
- /* do byte swapping if necessary */
-- if (LITTLE_ENDIAN)
-+ if (NAS_LITTLE_ENDIAN)
- {
- char n;
-
-@@ -201,7 +201,7 @@
- {
- h = si->h;
-
-- if (LITTLE_ENDIAN)
-+ if (NAS_LITTLE_ENDIAN)
- { /* header is big-endian */
- char n;
-
---- lib/audio/voc.c 1998/05/18 10:20:15 1.1
-+++ lib/audio/voc.c 1998/05/18 10:26:31
-@@ -66,9 +66,9 @@
-
- if (!fread(buf, VOC_ID_SIZE, 1, vi->fp) ||
- strncmp(buf, VOC_ID, VOC_ID_SIZE) ||
-- FileReadS(vi->fp, BIG_ENDIAN) != VOC_DATA_OFFSET ||
-- FileReadS(vi->fp, BIG_ENDIAN) != VOC_VERSION ||
-- FileReadS(vi->fp, BIG_ENDIAN) != VOC_VERSION_CHK)
-+ FileReadS(vi->fp, NAS_BIG_ENDIAN) != VOC_DATA_OFFSET ||
-+ FileReadS(vi->fp, NAS_BIG_ENDIAN) != VOC_VERSION ||
-+ FileReadS(vi->fp, NAS_BIG_ENDIAN) != VOC_VERSION_CHK)
- Err();
-
- do
-@@ -153,9 +153,9 @@
-
- if (!(vi->fp = fopen(name, AU_WRITE_BINARY)) ||
- !fwrite(VOC_ID, VOC_ID_SIZE, 1, vi->fp) ||
-- !FileWriteS(VOC_DATA_OFFSET, vi->fp, BIG_ENDIAN) ||
-- !FileWriteS(VOC_VERSION, vi->fp, BIG_ENDIAN) ||
-- !FileWriteS(VOC_VERSION_CHK, vi->fp, BIG_ENDIAN))
-+ !FileWriteS(VOC_DATA_OFFSET, vi->fp, NAS_BIG_ENDIAN) ||
-+ !FileWriteS(VOC_VERSION, vi->fp, NAS_BIG_ENDIAN) ||
-+ !FileWriteS(VOC_VERSION_CHK, vi->fp, NAS_BIG_ENDIAN))
- Err();
-
- if ((n = strlen(vi->comment)))
---- lib/audio/wave.c 1998/05/18 10:20:15 1.1
-+++ lib/audio/wave.c 1998/05/18 10:27:46
-@@ -47,7 +47,7 @@
- char n;
-
- if ((status = fread(c, sizeof(RiffChunk), 1, fp)))
-- if (BIG_ENDIAN)
-+ if (NAS_BIG_ENDIAN)
- swapl(&c->ckSize, n);
-
- return status;
-@@ -130,18 +130,18 @@
- {
- AuInt32 dummy;
-
-- wi->format = FileReadS(wi->fp, BIG_ENDIAN);
-- wi->channels = FileReadS(wi->fp, BIG_ENDIAN);
-- wi->sampleRate = FileReadL(wi->fp, BIG_ENDIAN);
-+ wi->format = FileReadS(wi->fp, NAS_BIG_ENDIAN);
-+ wi->channels = FileReadS(wi->fp, NAS_BIG_ENDIAN);
-+ wi->sampleRate = FileReadL(wi->fp, NAS_BIG_ENDIAN);
-
- /* we don't care about the next two fields */
-- dummy = FileReadL(wi->fp, BIG_ENDIAN);
-- dummy = FileReadS(wi->fp, BIG_ENDIAN);
-+ dummy = FileReadL(wi->fp, NAS_BIG_ENDIAN);
-+ dummy = FileReadS(wi->fp, NAS_BIG_ENDIAN);
-
- if (wi->format != RIFF_WAVE_FORMAT_PCM)
- Err();
-
-- wi->bitsPerSample = FileReadS(wi->fp, BIG_ENDIAN);
-+ wi->bitsPerSample = FileReadS(wi->fp, NAS_BIG_ENDIAN);
-
- /* skip any other format specific fields */
- fseek(wi->fp, PAD2(ck.ckSize - 16), 1);
-@@ -199,7 +199,7 @@
-
- wi->sizeOffset = ftell(wi->fp);
-
-- if (!FileWriteL(0, wi->fp, BIG_ENDIAN) ||
-+ if (!FileWriteL(0, wi->fp, NAS_BIG_ENDIAN) ||
- !fwrite(RIFF_WaveID, sizeof(RIFF_FOURCC), 1, wi->fp))
- Err();
-
-@@ -213,10 +213,10 @@
- size = sizeof(RiffChunk) + sizeof(RIFF_FOURCC) + PAD2(n);
-
- if (!fwrite(RIFF_ListID, sizeof(RIFF_FOURCC), 1, wi->fp) ||
-- !FileWriteL(size, wi->fp, BIG_ENDIAN) ||
-+ !FileWriteL(size, wi->fp, NAS_BIG_ENDIAN) ||
- !fwrite(RIFF_ListInfoID, sizeof(RIFF_FOURCC), 1, wi->fp) ||
- !fwrite(RIFF_InfoIcmtID, sizeof(RIFF_FOURCC), 1, wi->fp) ||
-- !FileWriteL(n, wi->fp, BIG_ENDIAN) ||
-+ !FileWriteL(n, wi->fp, NAS_BIG_ENDIAN) ||
- !fwrite(wi->comment, n, 1, wi->fp))
- Err();
-
-@@ -227,15 +227,15 @@
- }
-
- if (!fwrite(RIFF_WaveFmtID, sizeof(RIFF_FOURCC), 1, wi->fp) ||
-- !FileWriteL(RIFF_WaveFmtSize, wi->fp, BIG_ENDIAN) ||
-- !FileWriteS(RIFF_WAVE_FORMAT_PCM, wi->fp, BIG_ENDIAN) ||
-- !FileWriteS(wi->channels, wi->fp, BIG_ENDIAN) ||
-- !FileWriteL(wi->sampleRate, wi->fp, BIG_ENDIAN) ||
-+ !FileWriteL(RIFF_WaveFmtSize, wi->fp, NAS_BIG_ENDIAN) ||
-+ !FileWriteS(RIFF_WAVE_FORMAT_PCM, wi->fp, NAS_BIG_ENDIAN) ||
-+ !FileWriteS(wi->channels, wi->fp, NAS_BIG_ENDIAN) ||
-+ !FileWriteL(wi->sampleRate, wi->fp, NAS_BIG_ENDIAN) ||
- !FileWriteL(wi->channels * wi->sampleRate * (wi->bitsPerSample >> 3),
-- wi->fp, BIG_ENDIAN) ||
-+ wi->fp, NAS_BIG_ENDIAN) ||
- !FileWriteS(wi->channels * (wi->bitsPerSample >> 3), wi->fp,
-- BIG_ENDIAN) ||
-- !FileWriteS(wi->bitsPerSample, wi->fp, BIG_ENDIAN))
-+ NAS_BIG_ENDIAN) ||
-+ !FileWriteS(wi->bitsPerSample, wi->fp, NAS_BIG_ENDIAN))
- Err();
-
- wi->fileSize += sizeof(RiffChunk) + RIFF_WaveFmtSize;
-@@ -245,7 +245,7 @@
-
- wi->dataOffset = ftell(wi->fp);
-
-- if (!FileWriteL(0, wi->fp, BIG_ENDIAN))
-+ if (!FileWriteL(0, wi->fp, NAS_BIG_ENDIAN))
- Err();
-
- wi->fileSize += sizeof(RiffChunk);
-@@ -268,9 +268,9 @@
- fputc(0, wi->fp); /* pad the data */
-
- fseek(wi->fp, wi->sizeOffset, 0);
-- FileWriteL(wi->fileSize + PAD2(wi->dataSize), wi->fp, BIG_ENDIAN);
-+ FileWriteL(wi->fileSize + PAD2(wi->dataSize), wi->fp, NAS_BIG_ENDIAN);
- fseek(wi->fp, wi->dataOffset, 0);
-- FileWriteL(wi->dataSize, wi->fp, BIG_ENDIAN);
-+ FileWriteL(wi->dataSize, wi->fp, NAS_BIG_ENDIAN);
- }
-
- status = fclose(wi->fp);
---- clients/audio/auedit/auedit.c 1998/05/18 10:16:02 1.1
-+++ clients/audio/auedit/auedit.c 1998/05/18 10:11:17
-@@ -77,8 +77,8 @@
- #include "pause.xbm"
-
- #define APP_CLASS "Auedit"
--#define LITTLE_ENDIAN (*(char *) &g->endian == 1)
--#define BIG_ENDIAN (!LITTLE_ENDIAN)
-+#define NAS_LITTLE_ENDIAN (*(char *) &g->endian == 1)
-+#define NAS_BIG_ENDIAN (!NAS_LITTLE_ENDIAN)
- #define SELECTION_HEADER_SIZE 4
- #define DEFAULT_FREQUENCY 8000
- #define ZOOM_SCALE 2
-@@ -508,7 +508,7 @@
- XtVaSetValues(g->frequency, XtNstring, buf, NULL);
-
- s = SoundCreate(SoundFileFormatNone,
-- LITTLE_ENDIAN ? AuFormatLinearSigned16LSB :
-+ NAS_LITTLE_ENDIAN ? AuFormatLinearSigned16LSB :
- AuFormatLinearSigned16MSB, g->numTracks,
- freq, g->numSamples, NULL);
-
-@@ -693,7 +693,7 @@
- setTime(g, g->positionTime, start);
-
- s = SoundCreate(SoundFileFormatNone,
-- LITTLE_ENDIAN ? AuFormatLinearSigned16LSB :
-+ NAS_LITTLE_ENDIAN ? AuFormatLinearSigned16LSB :
- AuFormatLinearSigned16MSB,
- g->numTracks, g->sampleRate, end - start, NULL);
+ #else /* CanBuildAuServer */
diff --git a/audio/nas/patches/patch-ac b/audio/nas/patches/patch-ac
index 482cdd66ce9..43373a48730 100644
--- a/audio/nas/patches/patch-ac
+++ b/audio/nas/patches/patch-ac
@@ -1,8 +1,31 @@
-$NetBSD: patch-ac,v 1.3 1998/08/23 06:26:24 garbled Exp $
---- server/include/resource.h.orig Wed Jul 22 17:33:02 1998
-+++ server/include/resource.h Wed Jul 22 17:33:18 1998
-@@ -65,3 +65,3 @@
- RESTYPE CreateNewResourceClass();
--unsigned long FakeClientID();
-+AuID FakeClientID();
- Bool AddResource();
+$NetBSD: patch-ac,v 1.4 2000/08/04 01:31:56 jlam Exp $
+
+--- server/nasd.conf.eg.orig Sat Jan 1 22:03:50 2000
++++ server/nasd.conf.eg Thu Aug 3 21:11:29 2000
+@@ -29,7 +29,7 @@
+
+ inputsection
+
+- device "/dev/dsp1" # the SB emulation on my PAS16
++ device "/dev/audio"
+ maxrate 11025
+ minrate 4000 # Kind of redundant
+ maxfrags 3 # We want really low latency
+@@ -41,7 +41,7 @@
+
+ # These are used by voxware only for now.
+ outputsection
+- device "/dev/dsp" # the full 16 bit interface!
++ device "/dev/audio"
+ maxrate 33000 # is flakey on my OPTi mb at 44
+ minrate 5000 # Redundant again
+ maxfrags 3 # Low latency (for doom!)
+@@ -57,7 +57,7 @@
+ # was an 8 bit SB and the PC speaker with the voxware server.
+ #
+ #outputsection
+-# device "/dev/pcaudio"
++# device "/dev/speaker"
+ # maxrate 8000
+ # minrate 8000
+ # wordsize 8
diff --git a/audio/nas/patches/patch-ad b/audio/nas/patches/patch-ad
deleted file mode 100644
index e7c0470aca7..00000000000
--- a/audio/nas/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.4 1998/11/12 15:46:41 agc Exp $
-
---- server/dia/auevents.c.orig Thu Apr 21 17:50:59 1994
-+++ server/dia/auevents.c Sat Oct 17 23:26:34 1998
-@@ -27,7 +27,7 @@
- #ifdef sgi
- #define _BSD_SIGNALS
- #endif
--#include <sys/signal.h>
-+#include <signal.h>
- #include <audio/audio.h>
- #include <audio/Aproto.h>
- #include "au.h"
diff --git a/audio/nas/pkg/PLIST b/audio/nas/pkg/PLIST
index 8cae2b0012d..985e6ba3620 100644
--- a/audio/nas/pkg/PLIST
+++ b/audio/nas/pkg/PLIST
@@ -1,28 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1998/05/18 10:12:17 agc Exp $
-include/audio/Afuncproto.h
-include/audio/Afuncs.h
-include/audio/Amd.h
-include/audio/Aos.h
-include/audio/Aosdefs.h
-include/audio/Aproto.h
-include/audio/audio.h
-include/audio/Alibint.h
-include/audio/Alibnet.h
-include/audio/Xtutil.h
-include/audio/audiolib.h
-include/audio/audioutil.h
-include/audio/snd.h
-include/audio/wave.h
-include/audio/voc.h
-include/audio/aiff.h
-include/audio/sound.h
-include/audio/soundlib.h
-include/audio/fileutil.h
-include/audio/8svx.h
-include/audio/Astreams.h
-@dirrm include/audio
-bin/auvoxware
-bin/au
+@comment $NetBSD: PLIST,v 1.6 2000/08/04 01:31:56 jlam Exp $
bin/auconvert
bin/auctl
bin/audemo
@@ -30,22 +6,41 @@ bin/audial
bin/auedit
bin/auinfo
bin/aupanel
+bin/auphone
bin/auplay
bin/aurecord
+bin/auscope
bin/autool
bin/auwave
-bin/auphone
-bin/auscope
-bin/soundtoh
+bin/checkmail
bin/issndfile
+bin/nasd
bin/playbucket
-bin/checkmail
-lib/AUVoxConfig.eg
+bin/soundtoh
+include/audio/8svx.h
+include/audio/Afuncproto.h
+include/audio/Afuncs.h
+include/audio/Alibint.h
+include/audio/Alibnet.h
+include/audio/Amd.h
+include/audio/Aos.h
+include/audio/Aosdefs.h
+include/audio/Aproto.h
+include/audio/Astreams.h
+include/audio/Xtutil.h
+include/audio/aiff.h
+include/audio/audio.h
+include/audio/audiolib.h
+include/audio/audioutil.h
+include/audio/fileutil.h
+include/audio/snd.h
+include/audio/sound.h
+include/audio/soundlib.h
+include/audio/voc.h
+include/audio/wave.h
lib/X11/AuErrorDB
lib/libaudio.a
-man/cat1/auserver.0
-man/cat1/AUVoxConfig.0
-man/cat1/auvoxware.0
+lib/libaudio.so.1.4
man/cat1/auconvert.0
man/cat1/auctl.0
man/cat1/audemo.0
@@ -53,68 +48,70 @@ man/cat1/audial.0
man/cat1/auedit.0
man/cat1/auinfo.0
man/cat1/aupanel.0
+man/cat1/auphone.0
man/cat1/auplay.0
man/cat1/aurecord.0
+man/cat1/auscope.0
man/cat1/autool.0
+man/cat1/auvoxware.0
man/cat1/auwave.0
-man/cat1/auphone.0
-man/cat1/auscope.0
-man/cat1/soundtoh.0
-man/cat1/issndfile.0
-man/cat1/playbucket.0
man/cat1/checkmail.0
+man/cat1/issndfile.0
man/cat1/nas.0
+man/cat1/nasd.0
+man/cat1/nasd.conf.0
+man/cat1/playbucket.0
+man/cat1/soundtoh.0
man/cat3/AuAnyEvent.0
man/cat3/AuBucketAttributes.0
+man/cat3/AuCloseServer.0
man/cat3/AuConvertDataToShort.0
man/cat3/AuConvertShortToData.0
-man/cat3/AuCloseServer.0
man/cat3/AuCreateBucket.0
man/cat3/AuCreateFlow.0
-man/cat3/AuDeviceAttributes.0
man/cat3/AuDataFormats.0
man/cat3/AuDataTypes.0
man/cat3/AuDefineToFormat.0
man/cat3/AuDestroyBucket.0
man/cat3/AuDestroyFlow.0
+man/cat3/AuDeviceAttributes.0
man/cat3/AuDispatchEvent.0
+man/cat3/AuElement.0
man/cat3/AuElementNotifyEvent.0
man/cat3/AuElementParameters.0
man/cat3/AuElementState.0
-man/cat3/AuElement.0
man/cat3/AuErrorEvent.0
man/cat3/AuEvent.0
man/cat3/AuEventsQueued.0
+man/cat3/AuFileFormats.0
man/cat3/AuFixedPointFractionalAddend.0
man/cat3/AuFixedPointFromFraction.0
man/cat3/AuFixedPointFromSum.0
man/cat3/AuFixedPointIntegralAddend.0
man/cat3/AuFixedPointRoundDown.0
man/cat3/AuFixedPointRoundUp.0
-man/cat3/AuFileFormats.0
man/cat3/AuFlush.0
+man/cat3/AuFormatToDefine.0
+man/cat3/AuFormatToString.0
man/cat3/AuFreeBucketAttributes.0
man/cat3/AuFreeDeviceAttributes.0
man/cat3/AuFreeElementStates.0
-man/cat3/AuFormatToDefine.0
-man/cat3/AuFormatToString.0
man/cat3/AuFreeElements.0
man/cat3/AuGetBucketAttributes.0
man/cat3/AuGetCloseDownMode.0
man/cat3/AuGetDeviceAttributes.0
-man/cat3/AuGetErrorDatabaseText.0
man/cat3/AuGetElementParameters.0
man/cat3/AuGetElementStates.0
+man/cat3/AuGetElements.0
+man/cat3/AuGetErrorDatabaseText.0
man/cat3/AuGetErrorText.0
+man/cat3/AuGetScratchFlow.0
man/cat3/AuGetScratchFlowFromBucket.0
man/cat3/AuGetScratchFlowToBucket.0
-man/cat3/AuGetScratchFlow.0
man/cat3/AuGetServerTime.0
-man/cat3/AuGetElements.0
man/cat3/AuGrabNotifyEvent.0
man/cat3/AuHandleEvents.0
man/cat3/AuIDOfEvent.0
-man/cat3/AuServer.0
man/cat3/AuInputTrack.0
man/cat3/AuKillClient.0
man/cat3/AuListBuckets.0
@@ -130,58 +127,59 @@ man/cat3/AuMakeElementExportMonitor.0
man/cat3/AuMakeElementImportBucket.0
man/cat3/AuMakeElementImportClient.0
man/cat3/AuMakeElementImportDevice.0
-man/cat3/AuNextEvent.0
man/cat3/AuMakeElementImportWaveForm.0
man/cat3/AuMakeElementMultiplyConstant.0
man/cat3/AuMakeElementState.0
man/cat3/AuMakeElementSum.0
man/cat3/AuMakeInputTrack.0
man/cat3/AuMakeNoopAction.0
-man/cat3/AuMonitorNotifyEvent.0
man/cat3/AuMakeSendNotifyAction.0
man/cat3/AuMonitorDevice.0
+man/cat3/AuMonitorNotifyEvent.0
+man/cat3/AuNextEvent.0
man/cat3/AuOpenServer.0
man/cat3/AuPauseFlow.0
+man/cat3/AuReadElement.0
man/cat3/AuRegisterEventHandler.0
man/cat3/AuReleaseScratchFlow.0
-man/cat3/AuReadElement.0
man/cat3/AuRequeueEvent.0
+man/cat3/AuScanEvents.0
+man/cat3/AuScanForTypedEvent.0
+man/cat3/AuServer.0
+man/cat3/AuServerName.0
man/cat3/AuSetBucketAttributes.0
-man/cat3/AuSync.0
-man/cat3/AuSoundCreateBucketFromData.0
-man/cat3/AuSoundCreateBucketFromFile.0
-man/cat3/AuSoundCreateDataFromBucket.0
man/cat3/AuSetCloseDownMode.0
-man/cat3/AuSoundCreateFileFromBucket.0
man/cat3/AuSetDeviceAttributes.0
man/cat3/AuSetElementParameters.0
man/cat3/AuSetElementStates.0
man/cat3/AuSetElements.0
man/cat3/AuSetErrorHandler.0
man/cat3/AuSetIOErrorHandler.0
+man/cat3/AuSetString.0
+man/cat3/AuSoundCreateBucketFromData.0
+man/cat3/AuSoundCreateBucketFromFile.0
+man/cat3/AuSoundCreateDataFromBucket.0
+man/cat3/AuSoundCreateFileFromBucket.0
man/cat3/AuSoundPlay.0
man/cat3/AuSoundPlayFromBucket.0
man/cat3/AuSoundPlayFromData.0
man/cat3/AuSoundPlayFromFile.0
-man/cat3/Sound.0
man/cat3/AuSoundPlaySynchronousFromFile.0
man/cat3/AuSoundRecord.0
man/cat3/AuSoundRecordToBucket.0
man/cat3/AuSoundRecordToData.0
man/cat3/AuSoundRecordToFile.0
man/cat3/AuSoundRecordToFileN.0
-man/cat3/AuSetString.0
-man/cat3/AuScanEvents.0
-man/cat3/AuScanForTypedEvent.0
-man/cat3/AuServerName.0
-man/cat3/AuStopFlow.0
man/cat3/AuStartFlow.0
+man/cat3/AuStopFlow.0
man/cat3/AuStringToFormat.0
man/cat3/AuStringToWaveForm.0
+man/cat3/AuSync.0
man/cat3/AuSynchronize.0
man/cat3/AuUnregisterEventHandler.0
man/cat3/AuWaveFormToString.0
man/cat3/AuWriteElement.0
+man/cat3/Sound.0
man/cat3/SoundAbbrevToFileFormat.0
man/cat3/SoundCloseFile.0
man/cat3/SoundCreate.0
@@ -194,3 +192,6 @@ man/cat3/SoundSeekFile.0
man/cat3/SoundStringToFileFormat.0
man/cat3/SoundTellFile.0
man/cat3/SoundWriteFile.0
+share/examples/nas/nasd.conf.eg
+@dirrm share/examples/nas
+@dirrm include/audio