Update to version 1.7b

6/3/2005 1.7b (devel)

         - applied patch from 'Inma', correcting a connection hang in
           Solaris 9.  This reworks some of the very old and primitive
           fd_set stuff in Aulibint.c .

         - updated config/config.sub and config.guess to properly
           detect DragonFly systems.

         - Applied patch from Mark Davies and Joerg Sonnenberger
           correcting some BSD issues and adding DragonFly support.

           Then nasd.conf man page is always installed in
           $FILEMANDIR for all systems.

4/10/2005 1.7a (devel)

        - applied patch from Mark Davies correcting audio/Imakefile
          to properly define BSD44SOCKETS on NetBSD systems.

        - Applied patch from Steve McIntyre correcting CYWIN -> CYGWIN
          typo in server/dda/voxware/auvoxware.c

        - applied patch from Steve McIntyre Correcting some Gcc 4.0
          and AMD64 issues.

6 files changed, 32 insertions, 46 deletions

diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 9f209ff5e43..718eac0d53c 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2005/05/22 20:07:39 jlam Exp $
+# $NetBSD: Makefile,v 1.55 2005/06/04 23:43:51 markd Exp $
 
-DISTNAME=	nas-1.7.src
+DISTNAME=	nas-1.7b.src
 PKGNAME=	${DISTNAME:S/.src//}
-PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://nas.codebrilliance.com/nas/ \
 		ftp://ftp.uni-duisburg.de/Sound/NAS/
@@ -24,12 +23,6 @@ PKG_SYSCONFSUBDIR=	nas
 
 REPLACE_PERL=		clients/audio/auscope/auscope
 
-post-patch:
-	@for f in `${FIND} ${WRKSRC} -name '*.[ch]' -print`; do		\
-		${SED} -e "s|<malloc.h>|<stdlib.h>|g" $$f > $$f.patch	\
-		&& ${MV} $$f.patch $$f;					\
-	done
-
 pre-configure:
 	@cd ${WRKSRC}; for file in					\
 		config/NetAudio.def;					\
@@ -56,6 +49,11 @@ pre-configure:
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${OPSYS} == "SunOS"
+post-install:
+	${LN} -s ${PREFIX}/lib/libaudio.so.2.3 ${PREFIX}/lib/libaudio.so.2
+.endif
+
 PLIST_SRC=	${PKGDIR}/PLIST.clients
 
 .if ${OPSYS} != "Interix"
@@ -63,8 +61,11 @@ PLIST_SRC=	${PKGDIR}/PLIST.clients
       (${MACHINE_ARCH} == "sparc")
 .    include "../../mk/ossaudio.buildlink3.mk"
 EGDIR=		${PREFIX}/share/examples/nas
-PLIST_SRC+=	${PKGDIR}/PLIST.voxware
 CONF_FILES=	${EGDIR}/nasd.conf.eg ${PKG_SYSCONFDIR}/nasd.conf
+.    if ${OPSYS} != "SunOS"
+PLIST_SRC+=	${PKGDIR}/PLIST.voxware
+.    endif
+PLIST_SRC+=	${PKGDIR}/PLIST.server
 .  endif
 .endif
 
diff --git a/audio/nas/PLIST.server b/audio/nas/PLIST.server
new file mode 100644
index 00000000000..901f10d27dd
--- /dev/null
+++ b/audio/nas/PLIST.server
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST.server,v 1.1 2005/06/04 23:43:51 markd Exp $
+bin/nasd
+${IMAKE_MAN_DIR}/nasd.${IMAKE_MANNEWSUFFIX}
+${IMAKE_FILEMAN_DIR}/nasd.conf.${IMAKE_FILEMAN_SUFFIX}
+share/examples/nas/nasd.conf.eg
+@dirrm share/examples/nas
diff --git a/audio/nas/PLIST.voxware b/audio/nas/PLIST.voxware
index cce9bb7be13..674939779a4 100644
--- a/audio/nas/PLIST.voxware
+++ b/audio/nas/PLIST.voxware
@@ -1,7 +1,2 @@
-@comment $NetBSD: PLIST.voxware,v 1.2 2003/02/25 02:22:29 jschauma Exp $
-bin/nasd
+@comment $NetBSD: PLIST.voxware,v 1.3 2005/06/04 23:43:51 markd Exp $
 ${IMAKE_MAN_DIR}/auvoxware.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/nasd.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/nasd.conf.${IMAKE_MANNEWSUFFIX}
-share/examples/nas/nasd.conf.eg
-@dirrm share/examples/nas
diff --git a/audio/nas/distinfo b/audio/nas/distinfo
index da448f2d02d..09467e1ceb9 100644
--- a/audio/nas/distinfo
+++ b/audio/nas/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.14 2005/04/09 01:47:02 markd Exp $
+$NetBSD: distinfo,v 1.15 2005/06/04 23:43:51 markd Exp $
 
-SHA1 (nas-1.7.src.tar.gz) = a41adef84d0bf4c8e02b14d77bec0d284e7c9317
-RMD160 (nas-1.7.src.tar.gz) = 227ddc4f5f9d264c97066dc461bad138776d1dfd
-Size (nas-1.7.src.tar.gz) = 1288569 bytes
-SHA1 (patch-ab) = 777e5d1e9beaa1a4837a70e7dbc522eb1cb78f9c
+SHA1 (nas-1.7b.src.tar.gz) = 6d6e6990f6774fe36fb55679489c08358ac3c9b8
+RMD160 (nas-1.7b.src.tar.gz) = cc4f9ba61cf1e9c726938e6de8569d9ddd6d9f59
+Size (nas-1.7b.src.tar.gz) = 1290251 bytes
+SHA1 (patch-ab) = bb992f10d5176fee23faacbd243a4260ce06c7d8
 SHA1 (patch-ac) = 36f8ee0ec494e9d6a7994780c608c7a5fbf2114d
 SHA1 (patch-ad) = 5918e8188c8400fc7133c3ae4016d99c7c7594fa
 SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543
 SHA1 (patch-af) = 3dfd09dad97549c69e44aac042ed971534926cca
-SHA1 (patch-ag) = 80f4ab3e1922d8f9bc6d5f0d46575640ff9adfad
diff --git a/audio/nas/patches/patch-ab b/audio/nas/patches/patch-ab
index 7c66b837e4f..cfdb23d6a60 100644
--- a/audio/nas/patches/patch-ab
+++ b/audio/nas/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.10 2002/12/03 09:13:39 jlam Exp $
+$NetBSD: patch-ab,v 1.11 2005/06/04 23:43:51 markd Exp $
 
---- server/Imakefile.orig	Tue Jul 23 18:49:33 2002
+--- server/Imakefile.orig	2005-06-04 16:40:58.000000000 +1200
 +++ server/Imakefile
 @@ -61,7 +61,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/
  #endif
@@ -11,16 +11,16 @@ $NetBSD: patch-ab,v 1.10 2002/12/03 09:13:39 jlam Exp $
  #endif
  
             CBRT =
-@@ -99,7 +99,7 @@ RCMANDIR = $(MANDIR)
+@@ -96,7 +96,7 @@ ALL1 = nasd
  #endif
  
  
--#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture)
-+#if defined(i386SVR4Architecture) || defined(NetBSDArchitecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture)
+-#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
++#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
  # define CanBuildAuServer	YES
  
- # if defined(LinuxArchitecture)
-@@ -224,6 +224,7 @@ clean::
+ # if defined(cygwinArchitecture)
+@@ -213,6 +213,7 @@ clean::
  	$(RM) $(ALL)
  
   ETCDIR = NasConfigSearchPath
@@ -28,9 +28,9 @@ $NetBSD: patch-ab,v 1.10 2002/12/03 09:13:39 jlam Exp $
  
  InstallManPage(nasd,$(MANDIR))
  #ifdef InstallGenManPage
-@@ -231,7 +232,7 @@ InstallGenManPage(nasd.conf,$(RCMANDIR),
+@@ -220,7 +221,7 @@ InstallGenManPage(nasd.conf,$(FILEMANDIR
  #else
- InstallManPage(nasd.conf,$(RCMANDIR))
+ InstallManPage(nasd.conf,$(FILEMANDIR))
  #endif
 -InstallNonExecFile(nasd.conf.eg,$(ETCDIR))
 +InstallNonExecFile(nasd.conf.eg,$(EGDIR))
diff --git a/audio/nas/patches/patch-ag b/audio/nas/patches/patch-ag
deleted file mode 100644
index c582f96aa50..00000000000
--- a/audio/nas/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2005/04/09 01:47:02 markd Exp $
-
---- lib/audio/Imakefile.orig	2004-09-12 07:23:33.000000000 +1200
-+++ lib/audio/Imakefile
-@@ -59,8 +59,8 @@
- #endif
- 
- XCOMM JET - hmmm.
--#if (defined(FreeBSDArchitecture) || defined(BSDArchitecture)) && defined(HasBSD44Sockets)
--	EXTRA_DEFINES = -DBSD44SOCKETS
-+#if (defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(BSDArchitecture)) && defined(HasBSD44Sockets)
-+  EXTRA_DEFINES = -DBSD44SOCKETS
- #endif
- 
- XCOMM JET - see if we should avoid streams