Update of nas to 1.6.

pkgsrc changes: PKG_SYSCONFised.

changes: bug fixes and ...

1.5h    10/12/2002

        - Added SoundFileGetProc() to get access to the toSound and
          fromSound Procs in _SoundFileInfo[].  Needed for xemacs.

        - Added AudioLibraryVersionMajor, AudioLibraryVersionMinor,
          and AudioLibraryVersionTeeny to audiolib.h.  Somewhat more
          informative than just the old AudioLibraryVersion which was
          set a '2'.  The older AudioLibraryVersion define is still
          there however.

1.5g    10/7/2002

        - changed inputsection defaults in nasd.conf.eg to 44.1Khz, 2
          channel 16b sound.

          outputsection also defaults to 44.1Khz now, instead of 33Khz.

        - began some CC ANSI'fication of libaudio.

1.5f    8/26/2002


        7/20/2002

        - added cygwinArchitecture to the server Imakefile so
          auvoxware will be built on cygwin systems.

        - Removed the SoundFileInfo[] array in sound.h so cygwin would
          be happy.  Apps should not have been accessing that array
          directly anyways.

          Added the following new functions to sound.c (that used to
          be macros in sound.h):

             SoundFileFormatString, SoundValidDataFormat,
             SoundFileFormatToString, SoundFileFormatToAbbrev,
             SoundFileFormatToSuffixes

          Assuming your code did not attempt to directly access
          SoundFileInfo[], no changes should be required.

          libaudio.so revision bumped to 2.3

        - re-added back the Xtutils stuff, as some of the demos did in
          fact require it.  cygwin has a problem with implicitly
          defined functions anyway.


        7/9/2002

        - rename dia/nasconfig.* to dia/nasconf.* to avoid name
          collision with NasConfig.h on windows systems.


1.5e    7/7/2002

        - added patch from Nicolas Escuder that adds support for
          Windows operating systems using Cygwin.  Even the NAS server
          is now supported.  There are still issues with building
          regarding Imake, but once I can get more information, I'll
          fix those up.

          Read the README.CYGWIN file in the nas/ directory for
          instructions.  I will provide a link on the nas-links page
          to precompiled windows binaries for libaudio.dll, nasd, and
          some clients - provided by Nicolas.

        - based on idea from Nicolas, added background (-b) mode to
          nasd, to force it to run in the background.  Actually, he
          supplied a patch, but I just redid it to work properly with unix
          systems.

        - added NAS_AUDIOMSGFILE in config/NasConfig.h to specify
          where audio messages are stored (ADMPATH in os/osinit.c).

1.5d    6/1/2002

        - added .ps -> .pdf conversions in doc/pdf/

        - added html versions of man pages in doc/html/

1.5c    3/27/2002

        - removed Xtutil[hc] from libaudio and removed references to
          Xtutil.h in the  clients.  Suggestion by Paul Fox.

1.5b    3/16/2002

        - added patch from Marco Molteni to add a '-local' option to
          nasd.  Specifying this option allows only local clients to
          connect.

        - moved allow_any_host into the NasConfig struct.  Along with
          the new '-local' option.

1.5a    2/23/2002

        - more STARTSERVER fixes - there was still one case where when
          STARTSERVER was defined, nasd could be called with the wrong
          display number due to a bug in _AuConnectServer.

        - changed LEX/YACC DEBUG token to CDEBUG to avoid conflicts
          when building nas with '-DDEBUG'

        - DEFAULT_AUSERVER is now ":0" rather than
          "tcp/localhost:8000".  A local socket connection will startup
          faster than a tcp connection.

        - mutex.h
                - corrected unixware 7.x build problem
                  (XMUTEX_INITIALIZER) in mutex.h
                - added same check for sun/solaris boxes
                - got rid of XUSE_MTSAFE_API - now controlled by
                  NAS_USEMTSAFEAPI defined in config/NasConfig.h


                  If you think you are having mutex problems, you can
                  edit config/NasConfig.h and '#undef'
                  NAS_USEMTSAFEAPI, then rebuild everthing.  This will
                  turn off threadsafety in libaudio.

        - added new option, 'gain', to config file in the input/output
          sections.  This sets the default gains when nasd starts up
          (if MixerInit is enabled).  Only in voxware for now.

8 files changed, 75 insertions, 56 deletions

diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index b70bd758fb5..2d730ad7c15 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2002/10/18 14:02:12 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2002/11/28 11:40:45 markd Exp $
 # FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp
 #
 
-DISTNAME=	nas-1.4.2.src
+DISTNAME=	nas-1.6.src
 PKGNAME=	${DISTNAME:S/.src//}
 WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	audio
@@ -17,8 +17,17 @@ USE_BUILDLINK2=		# defined
 USE_IMAKE=		# defined
 USE_X11BASE=		# defined
 
+PKG_SYSCONFSUBDIR=	nas
+
 pre-configure:
 	cd ${WRKSRC}; for file in					\
+		config/NetAudio.def;					\
+	do								\
+		${SED}	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"	\
+			$${file} >> $${file}.fixed;			\
+		${MV} -f $${file}.fixed $${file};			\
+	done
+	cd ${WRKSRC}; for file in					\
 		server/nasd.conf.eg					\
 		server/dda/voxware/auvoxware.c;				\
 	do								\
@@ -28,9 +37,11 @@ pre-configure:
 	done
 
 PLIST_SRC=	${PKGDIR}/PLIST.clients
-.if ${MACHINE_ARCH} == "i386"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc"
 .  include "../../mk/ossaudio.buildlink2.mk"
 PLIST_SRC+=	${PKGDIR}/PLIST.voxware
+CONF_FILES=	${PREFIX}/share/examples/nas/nasd.conf.eg ${PKG_SYSCONFDIR}/nasd.conf
 .endif
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/nas/PLIST.clients b/audio/nas/PLIST.clients
index dcb8b7b638d..2631a387be8 100644
--- a/audio/nas/PLIST.clients
+++ b/audio/nas/PLIST.clients
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.clients,v 1.1 2001/11/01 00:20:13 zuntum Exp $
+@comment $NetBSD: PLIST.clients,v 1.2 2002/11/28 11:40:45 markd Exp $
 bin/auconvert
 bin/auctl
 bin/audemo
@@ -32,6 +32,7 @@ include/audio/audio.h
 include/audio/audiolib.h
 include/audio/audioutil.h
 include/audio/fileutil.h
+include/audio/mutex.h
 include/audio/snd.h
 include/audio/sound.h
 include/audio/soundlib.h
@@ -41,7 +42,7 @@ lib/X11/AuErrorDB
 lib/libaudio.a
 lib/libaudio.so
 lib/libaudio.so.2
-lib/libaudio.so.2.1
+lib/libaudio.so.2.3
 man/cat1/auconvert.0
 man/cat1/auctl.0
 man/cat1/audemo.0
diff --git a/audio/nas/distinfo b/audio/nas/distinfo
index da13d321536..038c421f03c 100644
--- a/audio/nas/distinfo
+++ b/audio/nas/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/10/18 14:02:12 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/11/28 11:40:45 markd Exp $
 
-SHA1 (nas-1.4.2.src.tar.gz) = 39634818e5719a850eecf751bbccd98758721e4b
-Size (nas-1.4.2.src.tar.gz) = 816938 bytes
-SHA1 (patch-aa) = 344776f3bd3e24664c5cb675aea047b7de645f00
-SHA1 (patch-ab) = e749e6d8517b91a1b362ec50566edfb7c07ea24c
-SHA1 (patch-ac) = 77e8b791a63240e59cbc73c9e20b5874e4acea5c
-SHA1 (patch-ad) = 56c089c327066eec55655974bac8b56442fa7fcb
+SHA1 (nas-1.6.src.tar.gz) = cba0fae4be38cdad9b84e79cbabb8cad2b44bbe0
+Size (nas-1.6.src.tar.gz) = 1099385 bytes
+SHA1 (patch-ab) = f02fba53ac1a3e4debd0401069eba130d670dca7
+SHA1 (patch-ac) = 36f8ee0ec494e9d6a7994780c608c7a5fbf2114d
+SHA1 (patch-ad) = c8e77228282cdd4de5d9686e88a260e286c6bf80
+SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543
diff --git a/audio/nas/patches/patch-aa b/audio/nas/patches/patch-aa
deleted file mode 100644
index 5c484ed9ab6..00000000000
--- a/audio/nas/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2001/07/14 13:35:13 jlam Exp $
-
---- config/NetAudio.tmpl.orig	Sun Mar 18 15:36:39 2001
-+++ config/NetAudio.tmpl
-@@ -222,7 +222,7 @@
- #define	AuInstallManPage(file,destdir) AuInstallManPageLong(file,destdir,file)
- 
- #define	AuInstallManPageLong(file,destdir,dest)				    @@\
--install.man:: file.man							    @@\
-+tmp.man:: file.man							    @@\
- 	@(rel=`cat $(TOP)/RELEASE | \				     	    @@\
- 	  sed 's/Network Audio System Release //'`; \			    @@\
- 	  sed -f $(TOP)/config/mungeman \				    @@\
diff --git a/audio/nas/patches/patch-ab b/audio/nas/patches/patch-ab
index 75f27446e92..d8a305a5c94 100644
--- a/audio/nas/patches/patch-ab
+++ b/audio/nas/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2002/10/18 14:02:12 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2002/11/28 11:40:46 markd Exp $
 
---- server/Imakefile.orig	Tue Dec 12 20:45:48 2000
+--- server/Imakefile.orig	Wed Jul 24 13:49:33 2002
 +++ server/Imakefile
-@@ -38,7 +38,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/
+@@ -38,7 +38,7 @@
       EXTENSIONS = 
           XAULIB = 
         XDMCPLIB = 
@@ -11,14 +11,18 @@ $NetBSD: patch-ab,v 1.7 2002/10/18 14:02:12 jlam Exp $
          BSDEMUL = $(LIBSRC)/Berk/Berklib.o
              MFB =
              CFB =
-@@ -217,10 +217,11 @@ clean::
+@@ -224,6 +224,7 @@
  	$(RM) $(ALL)
  
   ETCDIR = NasConfigSearchPath
-+  EGDIR = ${PREFIX}/share/examples/nas
++ EGDIR = ${PREFIX}/share/examples/nas
  
  InstallManPage(nasd,$(MANDIR))
+ #ifdef InstallGenManPage
+@@ -231,7 +232,7 @@
+ #else
  InstallManPage(nasd.conf,$(RCMANDIR))
+ #endif
 -InstallNonExecFile(nasd.conf.eg,$(ETCDIR))
 +InstallNonExecFile(nasd.conf.eg,$(EGDIR))
  
diff --git a/audio/nas/patches/patch-ac b/audio/nas/patches/patch-ac
index dd9ca28758e..8db4843c54f 100644
--- a/audio/nas/patches/patch-ac
+++ b/audio/nas/patches/patch-ac
@@ -1,27 +1,29 @@
-$NetBSD: patch-ac,v 1.5 2002/10/18 14:02:13 jlam Exp $
+$NetBSD: patch-ac,v 1.6 2002/11/28 11:40:46 markd 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 @@
+--- server/nasd.conf.eg.orig	Tue Oct  8 16:08:02 2002
++++ server/nasd.conf.eg
+@@ -29,8 +29,8 @@
  
  inputsection
  
--	device		"/dev/dsp1"		# the SB emulation on my PAS16
-+	device		"@DEVOSSAUDIO@"
- 	maxrate		11025
+-	device		"/dev/dsp1"		# The input device, usually
+-	mixer		"/dev/mixer1"		# mixer device
++	device		"@DEVOSSAUDIO@"		# The input device, usually
++	mixer		"/dev/mixer"		# mixer device
+         gain            50                      # default input gain (0-100)
+ 	maxrate		44100
  	minrate		4000			# Kind of redundant
- 	maxfrags	3			# We want really low latency
-@@ -41,7 +41,7 @@
+@@ -47,7 +47,7 @@
  
  # These are used by voxware only for now.
  outputsection
--	device		"/dev/dsp"		# the full 16 bit interface!
-+	device		"@DEVOSSAUDIO@"
- 	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.
+-	device		"/dev/dsp"		# The output device, usually
++	device		"@DEVOSSAUDIO@"		# The output device, usually
+ 	mixer		"/dev/mixer"		# mixer device
+         gain            50                      # default output gain (0-100)
+ 	maxrate		44100			# CD quality.
+@@ -73,7 +73,7 @@
+ #
  #
  #outputsection
 -#	device	"/dev/pcaudio"
diff --git a/audio/nas/patches/patch-ad b/audio/nas/patches/patch-ad
index e42348fe305..0dd5e2695fb 100644
--- a/audio/nas/patches/patch-ad
+++ b/audio/nas/patches/patch-ad
@@ -1,20 +1,22 @@
-$NetBSD: patch-ad,v 1.8 2002/10/18 14:02:13 jlam Exp $
+$NetBSD: patch-ad,v 1.9 2002/11/28 11:40:46 markd Exp $
 
---- server/dda/voxware/auvoxware.c.orig	Thu Oct  5 20:39:16 2000
+--- server/dda/voxware/auvoxware.c.orig	Thu Jul 25 12:42:28 2002
 +++ server/dda/voxware/auvoxware.c
-@@ -224,7 +224,11 @@
+@@ -238,8 +238,13 @@
  	256,			/* fragSize */
  	3,			/* minFrags */
  	32,			/* maxFrags */
 +#if defined(__NetBSD__)
 +	"@DEVOSSAUDIO@",		/* device */
++	"/dev/mixer",		/* mixer */
 +#else
  	"/dev/dsp1",		/* device */
+ 	"/dev/mixer1",		/* mixer */
 +#endif
- 	0			/* isPCSpeaker */
- }, sndStatOut =
- {
-@@ -237,7 +241,11 @@
+ #if defined(__CYGWIN__)
+ 	O_RDONLY,		/* howToOpen */
+ #else
+@@ -260,7 +265,11 @@
  	256,			/* fragSize */
  	3,			/* minFrags */
  	32,			/* maxFrags */
@@ -23,6 +25,6 @@ $NetBSD: patch-ad,v 1.8 2002/10/18 14:02:13 jlam Exp $
 +#else
  	"/dev/dsp",		/* device */
 +#endif
- 	0			/* isPCSpeaker */
- };
- 
+ 	"/dev/mixer",		/* mixer */
+ #if defined(__CYGWIN__)
+ 	O_WRONLY,		/* howToOpen */
diff --git a/audio/nas/patches/patch-ae b/audio/nas/patches/patch-ae
new file mode 100644
index 00000000000..9fe58616703
--- /dev/null
+++ b/audio/nas/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.3 2002/11/28 11:40:46 markd Exp $
+
+--- config/NetAudio.def.orig	Sun Feb 24 17:39:08 2002
++++ config/NetAudio.def
+@@ -8,6 +8,6 @@
+ 
+ XCOMM Directory where NAS will look for it's config file(s)
+ #ifndef NasConfigSearchPath
+-#define NasConfigSearchPath /etc/nas/
++#define NasConfigSearchPath @PKG_SYSCONFDIR@/
+ #endif
+