From 56c8e9ad065fa73972a914b811e0871f024a4159 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 4 Aug 2000 01:31:55 +0000 Subject: Update nas from 1.2.5 to 1.4. Relevant changes from version 1.2.5: - corrected a problem in the voxware server where when ReleaseDevice was enabled, the device would be held open when nasd was first started until the first connection was made. - changed documentation regarding the new location of the web site (http://radscan.com/nas.html) - integrated config handling in all servers, based on a lex/yacc parser from Stephen Hocking that was in the voxware server. - config file is /etc/nas/nasd.conf an example config file is installed. - parser errors are a bit more informative ;-) - each server now has a config.c and config.h file that provides the ddaSetConfig() functionality required of each server by dia/. In the SGI case, it's just a stub. ddaSetConfig() ignores options it doesn't understand (required behavior). - server cmdline options '-v' (verbose) and '-d ' (debug messages) added. These override nasd.conf settings. - hooks added to all servers in config.c - ddaProcessArg() and ddaUseMsg() for integrated arg handling. - voxware server: - release device functionality now controlled by nasd.conf - mixer init policy now controlled by nasd.conf - sun server: - added integrated sun (ausuni) module (now built by default) into the distribution. - release device functionality now controlled by nasd.conf - hpux server: - added device release (ReleaseDevice) capability to hpux server. All servers except for sgi now support this functionality. - fixed sample rate change problem in hpux server - separated hardware init code for ReleaseDevice functionality - added new option in nasd.conf to select either the EXT (external - headphones/speakers) or INT (internal speaker) output device by default - renamed generated server binary from au* to nasd for all servers - man pages updated (auserver.man and AUVoxConfig.man respectively). - Added patches from Mark Davies for NetBSD. --- audio/nas/Makefile | 13 +- audio/nas/files/md5 | 4 +- audio/nas/files/patch-sum | 9 +- audio/nas/patches/patch-aa | 227 +------------------- audio/nas/patches/patch-ab | 508 ++------------------------------------------- audio/nas/patches/patch-ac | 39 +++- audio/nas/patches/patch-ad | 13 -- audio/nas/pkg/PLIST | 125 +++++------ 8 files changed, 127 insertions(+), 811 deletions(-) delete mode 100644 audio/nas/patches/patch-ad (limited to 'audio/nas') 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 -+#define MAXSHORT SHRT_MAX -+#else /* !__FreeBSD__ && !__NetBSD__ */ - #include -+#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 --#endif /* __FreeBSD__ */ -+#endif /* __FreeBSD__ || __NetBSD__ */ - #include - #include