pkg/45449: [PATCH] audio/nas 1.9.3

[makoto%ki.nu@localhost]

>Number:         45449
>Category:       pkg
>Synopsis:       Update audio/nas 1.9.1 to 1.9.3
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Oct 10 15:15:00 +0000 2011
>Originator:     Makoto Fujiwara
>Release:        NetBSD 5.1
>Organization:
KINU Corporation
>Environment:
        
        
System: NetBSD t-105.i.ki.nu 5.1 NetBSD 5.1 (GENERIC) #0: Sat Nov 6 13:19:33 
UTC 2010 
builds%b6.netbsd.org@localhost:/home/builds/ab/netbsd-5-1-RELEASE/amd64/201011061943Z-obj/home/builds/ab/netbsd-5-1-RELEASE/src/sys/arch/amd64/compile/GENERIC
 amd64
Architecture: x86_64
Machine: amd64
>Description:
Version 1.9.3 (stable) 05/13/2011

  - overdue 1.9.3 maint release

  - Older X11 systems used to define SharedLibX and friends if the
    installed X11 system was built with shared lib support.  Newer
    X11's use SharedLibX11 instead.  Same for
    {Normal|Debug|Profile}LibX.  So check for these and set
    appropriately in NetAudio.tmpl.

    Shared lib installations should deal with libXau dependancies
    correctly now. 

  - auerswald:

    Added MacOS X aka Darwin to list of systems that need to
    explicitely link libaudio.so against libXau. This enables building
    of the shared library libaudio.so on MacOS X.

    There is currently no NAS server for MacOS X.

Version 1.9.2 (stable) 03/07/2009

  - overdue 1.9.2 release.

  - patch from Aleksey Cheusov:

    "fix for "libpthread: Unlocking unlocked mutex" seen on NetBSD-4"

    libaudio: OpenSvr.c: The server mutex was being unlocked, even
    though it was never locked in the first place.

  - Hugo Vanwoerkom reported thousands of diagnostics in his syslog:
    "doSetup: elementRate == 0! Forcing to 5000".  Fix doSetup to only
    warn about this when the debug level is above 10.

  - auerswald:

    document syslog usage

    use syslog if running as a daemon, stderr otherwise

    add syslog-usage-change to HISTORY file

  - steve_mcintyre:

    Minor man page fix ported from the Debian packages.

    Multiple minor portability changes ported over from the Debian
    packages. Cope with Hurd and GNU/KFreeBSD and other systems using
    glibc

  - apply patch from sourceforge user moinakg:

    Libaudio is built with missing linker flags on OpenSolaris like
    missing lXt, so it results in symbol not found errors at runtime.
    I am including an Imakefile patch below that fixed this.

>How-To-Repeat:
        cd pkgsrc/audio/nas; make package-install
>Fix:
rm patches/patch-a{g,h}

Index: audio/nas/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/nas/Makefile,v
retrieving revision 1.86
diff -u -u -r1.86 Makefile
--- audio/nas/Makefile  10 Oct 2011 10:29:58 -0000      1.86
+++ audio/nas/Makefile  10 Oct 2011 15:02:43 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.86 2011/10/10 10:29:58 wiz Exp $
 
-DISTNAME=      nas-1.9.1.src
+DISTNAME=      nas-1.9.3.src
 PKGNAME=       ${DISTNAME:S/.src//}
-PKGREVISION=   2
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=nas/}
 
Index: audio/nas/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/nas/distinfo,v
retrieving revision 1.27
diff -u -u -r1.27 distinfo
--- audio/nas/distinfo  9 Jul 2009 19:10:25 -0000       1.27
+++ audio/nas/distinfo  10 Oct 2011 15:02:43 -0000
@@ -1,13 +1,11 @@
 $NetBSD: distinfo,v 1.27 2009/07/09 19:10:25 hasso Exp $
 
-SHA1 (nas-1.9.1.src.tar.gz) = 1207a821676ca1b763a47e3c278262a64a626ba3
-RMD160 (nas-1.9.1.src.tar.gz) = 6d6aa05ae2376fbc8ff3145b73da1d28b190a856
-Size (nas-1.9.1.src.tar.gz) = 1454523 bytes
-SHA1 (patch-aa) = f407891f0207d789c0e5bf7a455fd7798ce01fde
-SHA1 (patch-ab) = d424b0970bd23584629f6a9bebea8b8c014462b5
+SHA1 (nas-1.9.3.src.tar.gz) = dca770ddd10936ad1f19bf3c51f941c10d7bf84b
+RMD160 (nas-1.9.3.src.tar.gz) = 693c97658885a9bea02b27376c3a5a142b49e57a
+Size (nas-1.9.3.src.tar.gz) = 1485222 bytes
+SHA1 (patch-aa) = 8a7c3b96b97605f7acbb651d6b2730d4c4ddd1fc
+SHA1 (patch-ab) = e1d1f5e4b2209cb3c207e343745b15a6dd3cb213
 SHA1 (patch-ac) = 48f6c6791bde679774fd534012e8da2cf6e1e781
-SHA1 (patch-ad) = b889775d66e1de80fc9bc2563f9cc0ebf720ad71
+SHA1 (patch-ad) = 8d7ab0c4f7b8cfa762f94df355353a2f63bcf353
 SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543
 SHA1 (patch-af) = c08e0e2e6bfe6fd3aed7171dfd16a4df99a0b66a
-SHA1 (patch-ag) = 73959e05169d6b1ed658228cddbca86e62e142be
-SHA1 (patch-ah) = 62e0538441f4375b93169906e1cdc82ab045e5c5
Index: audio/nas/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/audio/nas/patches/patch-aa,v
retrieving revision 1.12
diff -u -u -r1.12 patch-aa
--- audio/nas/patches/patch-aa  9 Jul 2009 19:10:25 -0000       1.12
+++ audio/nas/patches/patch-aa  10 Oct 2011 15:02:43 -0000
@@ -1,24 +1,27 @@
-$NetBSD: patch-aa,v 1.12 2009/07/09 19:10:25 hasso Exp $
+$NetBSD$
 
---- lib/audio/Imakefile.orig   2006-08-14 03:10:05.000000000 +0200
-+++ lib/audio/Imakefile
-@@ -150,14 +150,14 @@ XAULIB = 
+(1) Add NetBSDArchitecture and DragonFlyArchitecture
+
+--- lib/audio/Imakefile.orig   2011-01-27 01:10:17.000000000 +0900
++++ lib/audio/Imakefile        2011-10-06 18:15:26.000000000 +0900
+@@ -150,15 +150,15 @@
  XAULIB = -lXau
  #endif
  
--#if defined(LinuxArchitecture) || defined(GNUArchitecture) || 
defined(__FreeBSD_kernel__)
-+#if defined(LinuxArchitecture) || defined(GNUArchitecture) || 
defined(__FreeBSD_kernel__) || defined(NetBSDArchitecture) || 
defined(DragonFlyArchitecture)
+-#if defined(LinuxArchitecture) || defined(GNUArchitecture) || 
defined(SunArchitecture) || defined(__FreeBSD_kernel__) || 
defined(DarwinArchitecture)
++#if defined(LinuxArchitecture) || defined(GNUArchitecture) || 
defined(SunArchitecture) || defined(__FreeBSD_kernel__) || 
defined(DarwinArchitecture) || defined(NetBSDArchitecture) || 
defined(DragonFlyArchitecture)
  REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) -lm 
 -#endif
--
+ 
 -#if defined(cygwinArchitecture)
 +#elif defined(cygwinArchitecture)
  REQUIREDLIBS = $(LDPRELIB) $(XAUTHLIB) $(XTOOLLIB) $(XONLYLIB)
  STD_INCLUDES = -I/usr/include
 -#endif                                                                        
+-
 +#else
 +REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB)
 +#endif
  
- 
  #if DoSharedLib
+ #if DoNormalLib
Index: audio/nas/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/audio/nas/patches/patch-ab,v
retrieving revision 1.13
diff -u -u -r1.13 patch-ab
--- audio/nas/patches/patch-ab  5 May 2007 21:31:10 -0000       1.13
+++ audio/nas/patches/patch-ab  10 Oct 2011 15:02:43 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.13 2007/05/05 21:31:10 markd Exp $
+$NetBSD$
 
---- server/Imakefile.orig      2006-08-14 13:04:17.000000000 +1200
-+++ server/Imakefile
-@@ -61,7 +61,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/
+--- server/Imakefile.orig      2009-02-26 10:16:01.000000000 +0900
++++ server/Imakefile   2011-10-06 18:18:11.000000000 +0900
+@@ -61,7 +61,7 @@
  #endif
  
  #ifdef NetBSDArchitecture
@@ -11,16 +11,16 @@
  #endif
  
             CBRT =
-@@ -96,7 +96,7 @@ ALL1 = nasd
+@@ -96,7 +96,7 @@
  #endif
  
  
 -#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || 
defined(__FreeBSD__) || defined(FreeBSDArchitecture) || 
defined(LinuxArchitecture) || defined(i386BsdArchitecture) || 
defined(USLArchitecture) || defined(cygwinArchitecture) || 
defined(__DragonFly__)
-+#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || 
defined(__FreeBSD__) || defined(NetBSDArchitecture) || 
defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || 
defined(i386BsdArchitecture) || defined(USLArchitecture) || 
defined(cygwinArchitecture) || defined(__DragonFly__)
++#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || 
defined(__FreeBSD__) || defined(FreeBSDArchitecture) || 
defined(NetBSDArchitecture) || defined(LinuxArchitecture) || 
defined(i386BsdArchitecture) || defined(USLArchitecture) || 
defined(cygwinArchitecture) || defined(__DragonFly__)
  # define CanBuildAuServer     YES
  
- # if defined(cygwinArchitecture)
-@@ -213,14 +213,19 @@ clean::
+ #if !defined(GNUMachArchitecture)
+@@ -215,14 +215,19 @@
        $(RM) $(ALL)
  
   ETCDIR = NasConfigSearchPath
Index: audio/nas/patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/audio/nas/patches/patch-ad,v
retrieving revision 1.13
diff -u -u -r1.13 patch-ad
--- audio/nas/patches/patch-ad  14 Oct 2008 12:47:11 -0000      1.13
+++ audio/nas/patches/patch-ad  10 Oct 2011 15:02:43 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.13 2008/10/14 12:47:11 markd Exp $
+$NetBSD$
 
---- server/dda/voxware/auvoxware.c.orig        2007-11-11 12:40:47.000000000 
+1300
-+++ server/dda/voxware/auvoxware.c
-@@ -245,8 +245,13 @@ SndStat sndStatIn = {
+--- server/dda/voxware/auvoxware.c.orig        2009-02-26 10:16:00.000000000 
+0900
++++ server/dda/voxware/auvoxware.c     2011-10-06 18:21:41.000000000 +0900
+@@ -245,8 +245,13 @@
      256,                        /* fragSize */
      3,                          /* minFrags */
      32,                         /* maxFrags */
@@ -16,7 +16,7 @@
      O_RDONLY,                   /* howToOpen */
      1,                          /* autoOpen */
      0,                          /* forceRate */
-@@ -266,7 +271,11 @@ SndStat sndStatOut = {
+@@ -266,7 +271,11 @@
      256,                        /* fragSize */
      3,                          /* minFrags */
      32,                         /* maxFrags */
@@ -28,7 +28,7 @@
      "/dev/mixer",               /* mixer */
      O_WRONLY,                   /* howToOpen */
      1,                          /* autoOpen */
-@@ -875,7 +884,11 @@ openDevice(AuBool wait)
+@@ -875,7 +884,11 @@
          if (sndStatOut.fd == -1) {
              while ((sndStatOut.fd = open(sndStatOut.device,
                                           sndStatOut.
@@ -40,43 +40,34 @@
                                           0666)) == -1 && wait) {
                  osLogMsg("openDevice: waiting on output device\n");
                  sleep(1);
-@@ -1372,7 +1385,7 @@ disableProcessFlow(void)
+@@ -1372,7 +1385,7 @@
  }
  
  
--#if defined(__GNUC__) && !defined(linux) && !defined(USL) && 
!defined(__CYGWIN__)
-+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && 
!defined(__CYGWIN__) && !defined(__powerpc__)
+-#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && 
!defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__)
++#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && 
!defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) && 
!defined(__powerpc__)
  inline
  #endif
          static void
-@@ -1387,7 +1400,7 @@ monoToStereoLinearSigned16LSB(AuUint32 n
+@@ -1387,7 +1400,7 @@
      }
  }
  
--#if defined(__GNUC__) && !defined(linux) && !defined(USL) && 
!defined(__CYGWIN__)
-+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && 
!defined(__CYGWIN__) && !defined(__powerpc__)
+-#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && 
!defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__)
++#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && 
!defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) &&  
!defined(__powerpc__)
  inline
  #endif
          static void
-@@ -1450,7 +1463,7 @@ writePhysicalOutputsMono(void)
+@@ -1450,7 +1463,7 @@
      AuUnBlockAudio(l);
  }
  
--#if defined(__GNUC__) && !defined(linux) && !defined(USL) && 
!defined(__CYGWIN__)
-+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && 
!defined(__CYGWIN__) && !defined(__powerpc__)
+-#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && 
!defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__)
++#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && 
!defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) && 
!defined(__powerpc__)
  inline
  #endif
          static void
-@@ -1465,7 +1478,7 @@ stereoToMonoLinearSigned16LSB(AuUint32 n
-     }
- }
- 
--#if defined(__GNUC__) && !defined(linux) && !defined(USL) && 
!defined(__CYGWIN__)
-+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && 
!defined(__CYGWIN__) && !defined(__powerpc__)
- inline
- #endif
-         static void
-@@ -1880,7 +1893,11 @@ AuInitPhysicalDevices(void)
+@@ -1880,7 +1893,11 @@
                               sndStatOut.device, sndStatOut.howToOpen);
  
                  if ((fd = open(sndStatOut.device,

>Unformatted: