Sat Jan 5 12:57:22 2013 UTC ()
(1) Bump version 1.9.1 to 1.9.3 based on PR pkg/45449
   ChangeLog attached at the bottom of this Log.

(2) patches/patch-ag
    Delete the first chunk, upstream included the first one.
    Comments added from cvs log (1.4)

(3) patches/patch-ah
    # fix for "libpthread: Unlocking unlocked mutex" seen on NetBSD-4
    removed (upstream included).

(4) Comments added for
    patches/patch-aa
      -- Add NetBSDArchitecture and DragonFlyArchitecture
    patches/patch-ab
      -- (1.9) Convert -lossaudio to portable $(LIBOSSAUDIO)
	      Make this work with audio/oss again.
      -- (1.13) Add NetBSDArchitecture
      -- (1.14) In server/Imakefile add a target for $(VOXWARELIBS) that call make for
	the targets directory.
	This should fix the occasional problem were make complains with
	"don't know how to make dda/voxware/libvoxware.a"
      -- (1.5) Taking care nasd.conf (etc)
    patches/patch-ae
      -- Honor ${PKG_SYSCONFDIR}, see SUBST in Makefile.
    patches/patch-af
      -- Don't build/install auscope.

(5) PLIST.client
    PLIST.server
    Convert IMAKE_MANNEWSUFFIX to IMAKE_MAN_SUFFIX which
    pkglint flagged and by reading the thread starting with
      http://mail-index.netbsd.org/tech-pkg/2005/12/06/0034.html
   (Please correct this part if some OS'en get problems.)
  -----
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.
  -----


(mef)
diff -r1.89 -r1.90 pkgsrc/audio/nas/Makefile
diff -r1.9 -r1.10 pkgsrc/audio/nas/PLIST.clients
diff -r1.3 -r1.4 pkgsrc/audio/nas/PLIST.server
diff -r1.28 -r1.29 pkgsrc/audio/nas/distinfo
diff -r1.12 -r1.13 pkgsrc/audio/nas/patches/patch-aa
diff -r1.14 -r1.15 pkgsrc/audio/nas/patches/patch-ab
diff -r1.13 -r1.14 pkgsrc/audio/nas/patches/patch-ad
diff -r1.3 -r1.4 pkgsrc/audio/nas/patches/patch-ae
diff -r1.2 -r1.3 pkgsrc/audio/nas/patches/patch-af
diff -r1.7 -r1.8 pkgsrc/audio/nas/patches/patch-ag
diff -r1.1 -r0 pkgsrc/audio/nas/patches/patch-ah

cvs diff -r1.89 -r1.90 pkgsrc/audio/nas/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/nas/Makefile 2012/10/02 23:48:01 1.89
+++ pkgsrc/audio/nas/Makefile 2013/01/05 12:57:21 1.90
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.89 2012/10/02 23:48:01 asau Exp $ 1# $NetBSD: Makefile,v 1.90 2013/01/05 12:57:21 mef Exp $
2 2
3DISTNAME= nas-1.9.1.src 3DISTNAME= nas-1.9.3.src
4PKGNAME= ${DISTNAME:S/.src//} 4PKGNAME= ${DISTNAME:S/.src//}
5PKGREVISION= 3 
6CATEGORIES= audio 5CATEGORIES= audio
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nas/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nas/}
8 7
9MAINTAINER= markd@NetBSD.org 8MAINTAINER= markd@NetBSD.org
10HOMEPAGE= http://nas.sourceforge.net/ 9HOMEPAGE= http://nas.sourceforge.net/
11COMMENT= Network Audio System 10COMMENT= Network Audio System
12LICENSE= mit # with no-advertisement clause 11LICENSE= mit # with no-advertisement clause
13 12
14PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
15 14
16# 1) uses dia library before it is built 15# 1) uses dia library before it is built
17# 2) make succeeds even with failures, making this problem non-obvious 16# 2) make succeeds even with failures, making this problem non-obvious
18MAKE_JOBS_SAFE= no 17MAKE_JOBS_SAFE= no

cvs diff -r1.9 -r1.10 pkgsrc/audio/nas/PLIST.clients (expand / switch to unified diff)

--- pkgsrc/audio/nas/PLIST.clients 2009/06/14 17:32:19 1.9
+++ pkgsrc/audio/nas/PLIST.clients 2013/01/05 12:57:21 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST.clients,v 1.9 2009/06/14 17:32:19 joerg Exp $ 1@comment $NetBSD: PLIST.clients,v 1.10 2013/01/05 12:57:21 mef Exp $
2bin/auconvert 2bin/auconvert
3bin/auctl 3bin/auctl
4bin/audemo 4bin/audemo
5bin/audial 5bin/audial
6bin/auedit 6bin/auedit
7bin/auinfo 7bin/auinfo
8bin/aupanel 8bin/aupanel
9bin/auphone 9bin/auphone
10bin/auplay 10bin/auplay
11bin/aurecord 11bin/aurecord
12bin/autool 12bin/autool
13bin/auwave 13bin/auwave
14bin/checkmail 14bin/checkmail
@@ -33,43 +33,43 @@ include/audio/audioutil.h @@ -33,43 +33,43 @@ include/audio/audioutil.h
33include/audio/fileutil.h 33include/audio/fileutil.h
34include/audio/mutex.h 34include/audio/mutex.h
35include/audio/release.h 35include/audio/release.h
36include/audio/snd.h 36include/audio/snd.h
37include/audio/sound.h 37include/audio/sound.h
38include/audio/soundlib.h 38include/audio/soundlib.h
39include/audio/voc.h 39include/audio/voc.h
40include/audio/wave.h 40include/audio/wave.h
41lib/X11/AuErrorDB 41lib/X11/AuErrorDB
42lib/libaudio.a 42lib/libaudio.a
43lib/libaudio.so 43lib/libaudio.so
44lib/libaudio.so.2 44lib/libaudio.so.2
45lib/libaudio.so.2.4 45lib/libaudio.so.2.4
46${IMAKE_MAN_DIR}/auconvert.${IMAKE_MANNEWSUFFIX} 46${IMAKE_MAN_DIR}/auconvert.${IMAKE_MAN_SUFFIX}
47${IMAKE_MAN_DIR}/auctl.${IMAKE_MANNEWSUFFIX} 47${IMAKE_MAN_DIR}/auctl.${IMAKE_MAN_SUFFIX}
48${IMAKE_MAN_DIR}/audemo.${IMAKE_MANNEWSUFFIX} 48${IMAKE_MAN_DIR}/audemo.${IMAKE_MAN_SUFFIX}
49${IMAKE_MAN_DIR}/audial.${IMAKE_MANNEWSUFFIX} 49${IMAKE_MAN_DIR}/audial.${IMAKE_MAN_SUFFIX}
50${IMAKE_MAN_DIR}/auedit.${IMAKE_MANNEWSUFFIX} 50${IMAKE_MAN_DIR}/auedit.${IMAKE_MAN_SUFFIX}
51${IMAKE_MAN_DIR}/auinfo.${IMAKE_MANNEWSUFFIX} 51${IMAKE_MAN_DIR}/auinfo.${IMAKE_MAN_SUFFIX}
52${IMAKE_MAN_DIR}/aupanel.${IMAKE_MANNEWSUFFIX} 52${IMAKE_MAN_DIR}/aupanel.${IMAKE_MAN_SUFFIX}
53${IMAKE_MAN_DIR}/auphone.${IMAKE_MANNEWSUFFIX} 53${IMAKE_MAN_DIR}/auphone.${IMAKE_MAN_SUFFIX}
54${IMAKE_MAN_DIR}/auplay.${IMAKE_MANNEWSUFFIX} 54${IMAKE_MAN_DIR}/auplay.${IMAKE_MAN_SUFFIX}
55${IMAKE_MAN_DIR}/aurecord.${IMAKE_MANNEWSUFFIX} 55${IMAKE_MAN_DIR}/aurecord.${IMAKE_MAN_SUFFIX}
56${IMAKE_MAN_DIR}/autool.${IMAKE_MANNEWSUFFIX} 56${IMAKE_MAN_DIR}/autool.${IMAKE_MAN_SUFFIX}
57${IMAKE_MAN_DIR}/auwave.${IMAKE_MANNEWSUFFIX} 57${IMAKE_MAN_DIR}/auwave.${IMAKE_MAN_SUFFIX}
58${IMAKE_MAN_DIR}/checkmail.${IMAKE_MANNEWSUFFIX} 58${IMAKE_MAN_DIR}/checkmail.${IMAKE_MAN_SUFFIX}
59${IMAKE_MAN_DIR}/issndfile.${IMAKE_MANNEWSUFFIX} 59${IMAKE_MAN_DIR}/issndfile.${IMAKE_MAN_SUFFIX}
60${IMAKE_MAN_DIR}/nas.${IMAKE_MANNEWSUFFIX} 60${IMAKE_MAN_DIR}/nas.${IMAKE_MAN_SUFFIX}
61${IMAKE_MAN_DIR}/playbucket.${IMAKE_MANNEWSUFFIX} 61${IMAKE_MAN_DIR}/playbucket.${IMAKE_MAN_SUFFIX}
62${IMAKE_MAN_DIR}/soundtoh.${IMAKE_MANNEWSUFFIX} 62${IMAKE_MAN_DIR}/soundtoh.${IMAKE_MAN_SUFFIX}
63${IMAKE_LIBMAN_DIR}/AuAnyEvent.${IMAKE_LIBMAN_SUFFIX} 63${IMAKE_LIBMAN_DIR}/AuAnyEvent.${IMAKE_LIBMAN_SUFFIX}
64${IMAKE_LIBMAN_DIR}/AuBucketAttributes.${IMAKE_LIBMAN_SUFFIX} 64${IMAKE_LIBMAN_DIR}/AuBucketAttributes.${IMAKE_LIBMAN_SUFFIX}
65${IMAKE_LIBMAN_DIR}/AuCloseServer.${IMAKE_LIBMAN_SUFFIX} 65${IMAKE_LIBMAN_DIR}/AuCloseServer.${IMAKE_LIBMAN_SUFFIX}
66${IMAKE_LIBMAN_DIR}/AuConvertDataToShort.${IMAKE_LIBMAN_SUFFIX} 66${IMAKE_LIBMAN_DIR}/AuConvertDataToShort.${IMAKE_LIBMAN_SUFFIX}
67${IMAKE_LIBMAN_DIR}/AuConvertShortToData.${IMAKE_LIBMAN_SUFFIX} 67${IMAKE_LIBMAN_DIR}/AuConvertShortToData.${IMAKE_LIBMAN_SUFFIX}
68${IMAKE_LIBMAN_DIR}/AuCreateBucket.${IMAKE_LIBMAN_SUFFIX} 68${IMAKE_LIBMAN_DIR}/AuCreateBucket.${IMAKE_LIBMAN_SUFFIX}
69${IMAKE_LIBMAN_DIR}/AuCreateFlow.${IMAKE_LIBMAN_SUFFIX} 69${IMAKE_LIBMAN_DIR}/AuCreateFlow.${IMAKE_LIBMAN_SUFFIX}
70${IMAKE_LIBMAN_DIR}/AuDataFormats.${IMAKE_LIBMAN_SUFFIX} 70${IMAKE_LIBMAN_DIR}/AuDataFormats.${IMAKE_LIBMAN_SUFFIX}
71${IMAKE_LIBMAN_DIR}/AuDataTypes.${IMAKE_LIBMAN_SUFFIX} 71${IMAKE_LIBMAN_DIR}/AuDataTypes.${IMAKE_LIBMAN_SUFFIX}
72${IMAKE_LIBMAN_DIR}/AuDefineToFormat.${IMAKE_LIBMAN_SUFFIX} 72${IMAKE_LIBMAN_DIR}/AuDefineToFormat.${IMAKE_LIBMAN_SUFFIX}
73${IMAKE_LIBMAN_DIR}/AuDestroyBucket.${IMAKE_LIBMAN_SUFFIX} 73${IMAKE_LIBMAN_DIR}/AuDestroyBucket.${IMAKE_LIBMAN_SUFFIX}
74${IMAKE_LIBMAN_DIR}/AuDestroyFlow.${IMAKE_LIBMAN_SUFFIX} 74${IMAKE_LIBMAN_DIR}/AuDestroyFlow.${IMAKE_LIBMAN_SUFFIX}
75${IMAKE_LIBMAN_DIR}/AuDeviceAttributes.${IMAKE_LIBMAN_SUFFIX} 75${IMAKE_LIBMAN_DIR}/AuDeviceAttributes.${IMAKE_LIBMAN_SUFFIX}

cvs diff -r1.3 -r1.4 pkgsrc/audio/nas/PLIST.server (expand / switch to unified diff)

--- pkgsrc/audio/nas/PLIST.server 2009/06/14 17:32:19 1.3
+++ pkgsrc/audio/nas/PLIST.server 2013/01/05 12:57:21 1.4
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1@comment $NetBSD: PLIST.server,v 1.3 2009/06/14 17:32:19 joerg Exp $ 1@comment $NetBSD: PLIST.server,v 1.4 2013/01/05 12:57:21 mef Exp $
2bin/nasd 2bin/nasd
3${IMAKE_MAN_DIR}/nasd.${IMAKE_MANNEWSUFFIX} 3${IMAKE_MAN_DIR}/nasd.${IMAKE_MAN_SUFFIX}
4${IMAKE_FILEMAN_DIR}/nasd.conf.${IMAKE_FILEMAN_SUFFIX} 4${IMAKE_FILEMAN_DIR}/nasd.conf.${IMAKE_FILEMAN_SUFFIX}
5share/examples/nas/nasd.conf.eg 5share/examples/nas/nasd.conf.eg
6share/examples/rc.d/nasd 6share/examples/rc.d/nasd

cvs diff -r1.28 -r1.29 pkgsrc/audio/nas/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/nas/distinfo 2012/01/30 01:34:38 1.28
+++ pkgsrc/audio/nas/distinfo 2013/01/05 12:57:22 1.29
@@ -1,13 +1,12 @@ @@ -1,13 +1,12 @@
1$NetBSD: distinfo,v 1.28 2012/01/30 01:34:38 sbd Exp $ 1$NetBSD: distinfo,v 1.29 2013/01/05 12:57:22 mef Exp $
2 2
3SHA1 (nas-1.9.1.src.tar.gz) = 1207a821676ca1b763a47e3c278262a64a626ba3 3SHA1 (nas-1.9.3.src.tar.gz) = dca770ddd10936ad1f19bf3c51f941c10d7bf84b
4RMD160 (nas-1.9.1.src.tar.gz) = 6d6aa05ae2376fbc8ff3145b73da1d28b190a856 4RMD160 (nas-1.9.3.src.tar.gz) = 693c97658885a9bea02b27376c3a5a142b49e57a
5Size (nas-1.9.1.src.tar.gz) = 1454523 bytes 5Size (nas-1.9.3.src.tar.gz) = 1485222 bytes
6SHA1 (patch-aa) = f407891f0207d789c0e5bf7a455fd7798ce01fde 6SHA1 (patch-aa) = 9389ce078ed15019d82e79683dd184b61ca1be5c
7SHA1 (patch-ab) = 2929b5477f21cd82ef8b5f0fb3039ea9a6e7b2c0 7SHA1 (patch-ab) = 1c2ec778589a6818336b74e134268d0d269b143c
8SHA1 (patch-ac) = 48f6c6791bde679774fd534012e8da2cf6e1e781 8SHA1 (patch-ac) = 48f6c6791bde679774fd534012e8da2cf6e1e781
9SHA1 (patch-ad) = b889775d66e1de80fc9bc2563f9cc0ebf720ad71 9SHA1 (patch-ad) = 0a0887b87a9690e9a2a156ed840e9dfccc1f8c6c
10SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543 10SHA1 (patch-ae) = 2e88c42f849ec2e3eb942f79d05065ec8ddd1a9e
11SHA1 (patch-af) = c08e0e2e6bfe6fd3aed7171dfd16a4df99a0b66a 11SHA1 (patch-af) = 9e387f88504d6ef18ad4210af24702de61efbf1a
12SHA1 (patch-ag) = 73959e05169d6b1ed658228cddbca86e62e142be 12SHA1 (patch-ag) = c43bab8c87efa5c770dd084d67ffa9897350810f
13SHA1 (patch-ah) = 62e0538441f4375b93169906e1cdc82ab045e5c5 

cvs diff -r1.12 -r1.13 pkgsrc/audio/nas/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/nas/patches/patch-aa 2009/07/09 19:10:25 1.12
+++ pkgsrc/audio/nas/patches/patch-aa 2013/01/05 12:57:22 1.13
@@ -1,24 +1,27 @@ @@ -1,24 +1,27 @@
1$NetBSD: patch-aa,v 1.12 2009/07/09 19:10:25 hasso Exp $ 1$NetBSD: patch-aa,v 1.13 2013/01/05 12:57:22 mef Exp $
2 2
3--- lib/audio/Imakefile.orig 2006-08-14 03:10:05.000000000 +0200 3(1) Add NetBSDArchitecture and DragonFlyArchitecture
 4
 5--- lib/audio/Imakefile.orig 2006-08-14 03:10:05.000000000 +0200
4+++ lib/audio/Imakefile 6+++ lib/audio/Imakefile
5@@ -150,14 +150,14 @@ XAULIB =  7@@ -150,14 +150,16 @@
6 XAULIB = -lXau 8 XAULIB = -lXau
7 #endif 9 #endif
8  10
9-#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(__FreeBSD_kernel__) 11-#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(SunArchitecture) || defined(__FreeBSD_kernel__) || defined(DarwinArchitecture)
10+#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(__FreeBSD_kernel__) || defined(NetBSDArchitecture) || defined(DragonFlyArchitecture) 12+#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(SunArchitecture) || defined(__FreeBSD_kernel__) || defined(DarwinArchitecture) || defined(NetBSDArchitecture) || defined(DragonFlyArchitecture)
11 REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) -lm  13 REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) -lm
12-#endif 14-#endif
13- 15
14-#if defined(cygwinArchitecture) 16-#if defined(cygwinArchitecture)
 17+
15+#elif defined(cygwinArchitecture) 18+#elif defined(cygwinArchitecture)
16 REQUIREDLIBS = $(LDPRELIB) $(XAUTHLIB) $(XTOOLLIB) $(XONLYLIB) 19 REQUIREDLIBS = $(LDPRELIB) $(XAUTHLIB) $(XTOOLLIB) $(XONLYLIB)
17 STD_INCLUDES = -I/usr/include 20 STD_INCLUDES = -I/usr/include
18-#endif  21-#endif
19+#else 22+#else
20+REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) 23+REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB)
21+#endif 24+#endif
22  25
23  26
24 #if DoSharedLib 27 #if DoSharedLib

cvs diff -r1.14 -r1.15 pkgsrc/audio/nas/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/audio/nas/patches/patch-ab 2012/01/30 01:34:38 1.14
+++ pkgsrc/audio/nas/patches/patch-ab 2013/01/05 12:57:22 1.15
@@ -1,36 +1,49 @@ @@ -1,36 +1,49 @@
1$NetBSD: patch-ab,v 1.14 2012/01/30 01:34:38 sbd Exp $ 1$NetBSD: patch-ab,v 1.15 2013/01/05 12:57:22 mef Exp $
 2
 3(1.9) Convert -lossaudio to portable $(LIBOSSAUDIO)
 4 Make this work with audio/oss again.
 5
 6(1.13) Add NetBSDArchitecture
 7
 8(1.14) In server/Imakefile add a target for $(VOXWARELIBS) that call make for
 9the targets directory.
 10
 11This should fix the occasional problem were make complains with
 12"don't know how to make dda/voxware/libvoxware.a"
 13
 14(1.5) Taking care nasd.conf (etc)
2 15
3--- server/Imakefile.orig 2007-06-16 19:03:22.000000000 +0000 16--- server/Imakefile.orig 2007-06-16 19:03:22.000000000 +0000
4+++ server/Imakefile 17+++ server/Imakefile
5@@ -61,7 +61,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/ 18@@ -61,7 +61,7 @@
6 #endif 19 #endif
7  20
8 #ifdef NetBSDArchitecture 21 #ifdef NetBSDArchitecture
9- SYSLIBS = -lossaudio 22- SYSLIBS = -lossaudio
10+ SYSLIBS = $(LIBOSSAUDIO) 23+ SYSLIBS = $(LIBOSSAUDIO)
11 #endif 24 #endif
12  25
13 CBRT = 26 CBRT =
14@@ -96,7 +96,7 @@ ALL1 = nasd 27@@ -96,7 +96,7 @@
15 #endif 28 #endif
16  29
17  30
18-#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__) 31-#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
19+#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__) 32+#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
20 # define CanBuildAuServer YES 33 # define CanBuildAuServer YES
21  34
22 # if defined(cygwinArchitecture) 35 #if !defined(GNUMachArchitecture)
23@@ -204,23 +204,34 @@ dirs: FRC @@\ 36@@ -206,23 +206,34 @@
24 $(MAKE) $(MFLAGS) PassCDebugFlags all @@\ 37 $(MAKE) $(MFLAGS) PassCDebugFlags all @@\
25 @@\ 38 @@\
26 FRC: 39 FRC:
27+ 40+
28 #endif /* ForceSubdirs */ 41 #endif /* ForceSubdirs */
29 #endif /* Project X < 5 */ 42 #endif /* Project X < 5 */
30  43
31 ForceSubdirs($(DEPDIRS) $(SUBDIRS)) 44 ForceSubdirs($(DEPDIRS) $(SUBDIRS))
32  45
33+$(VOXWARELIBS): 46+$(VOXWARELIBS):
34+ @echo "making all in $(CURRENT_DIR)/${@D}..." 47+ @echo "making all in $(CURRENT_DIR)/${@D}..."
35+ @(cd ${@D} && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\  48+ @(cd ${@D} && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\
36+ PassCDebugFlags all) || exit $$? 49+ PassCDebugFlags all) || exit $$?

cvs diff -r1.13 -r1.14 pkgsrc/audio/nas/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/audio/nas/patches/patch-ad 2008/10/14 12:47:11 1.13
+++ pkgsrc/audio/nas/patches/patch-ad 2013/01/05 12:57:22 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ad,v 1.13 2008/10/14 12:47:11 markd Exp $ 1$NetBSD: patch-ad,v 1.14 2013/01/05 12:57:22 mef Exp $
2 2
3--- server/dda/voxware/auvoxware.c.orig 2007-11-11 12:40:47.000000000 +1300 3--- server/dda/voxware/auvoxware.c.orig 2007-11-11 12:40:47.000000000 +1300
4+++ server/dda/voxware/auvoxware.c 4+++ server/dda/voxware/auvoxware.c
5@@ -245,8 +245,13 @@ SndStat sndStatIn = { 5@@ -245,8 +245,13 @@ SndStat sndStatIn = {
6 256, /* fragSize */ 6 256, /* fragSize */
7 3, /* minFrags */ 7 3, /* minFrags */
8 32, /* maxFrags */ 8 32, /* maxFrags */
9+#if defined(__NetBSD__) 9+#if defined(__NetBSD__)
10+ "@DEVOSSAUDIO@", /* device */ 10+ "@DEVOSSAUDIO@", /* device */
11+ "/dev/mixer", /* mixer */ 11+ "/dev/mixer", /* mixer */
12+#else 12+#else
13 "/dev/dsp1", /* device */ 13 "/dev/dsp1", /* device */
14 "/dev/mixer1", /* mixer */ 14 "/dev/mixer1", /* mixer */
@@ -34,55 +34,46 @@ $NetBSD: patch-ad,v 1.13 2008/10/14 12:4 @@ -34,55 +34,46 @@ $NetBSD: patch-ad,v 1.13 2008/10/14 12:4
34 sndStatOut. 34 sndStatOut.
35+#if defined(__FreeBSD__) || defined(__NetBSD__) 35+#if defined(__FreeBSD__) || defined(__NetBSD__)
36+ howToOpen | extramode, 36+ howToOpen | extramode,
37+#else 37+#else
38 howToOpen | O_SYNC | extramode, 38 howToOpen | O_SYNC | extramode,
39+#endif 39+#endif
40 0666)) == -1 && wait) { 40 0666)) == -1 && wait) {
41 osLogMsg("openDevice: waiting on output device\n"); 41 osLogMsg("openDevice: waiting on output device\n");
42 sleep(1); 42 sleep(1);
43@@ -1372,7 +1385,7 @@ disableProcessFlow(void) 43@@ -1372,7 +1385,7 @@ disableProcessFlow(void)
44 } 44 }
45  45
46  46
47-#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) 47-#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__)
48+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__) 48+#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__)
49 inline 49 inline
50 #endif 50 #endif
51 static void 51 static void
52@@ -1387,7 +1400,7 @@ monoToStereoLinearSigned16LSB(AuUint32 n 52@@ -1387,7 +1400,7 @@ monoToStereoLinearSigned16LSB(AuUint32 n
53 } 53 }
54 } 54 }
55  55
56-#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) 56-#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__)
57+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__) 57+#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__)
58 inline 58 inline
59 #endif 59 #endif
60 static void 60 static void
61@@ -1450,7 +1463,7 @@ writePhysicalOutputsMono(void) 61@@ -1450,7 +1463,7 @@ writePhysicalOutputsMono(void)
62 AuUnBlockAudio(l); 62 AuUnBlockAudio(l);
63 } 63 }
64  64
65-#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) 65-#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__)
66+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__) 66+#if defined(__GNUC__) && !defined(linux) && !defined(__GNU__) && !defined(__GLIBC__) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__)
67 inline 
68 #endif 
69 static void 
70@@ -1465,7 +1478,7 @@ stereoToMonoLinearSigned16LSB(AuUint32 n 
71 } 
72 } 
73  
74-#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) 
75+#if defined(__GNUC__) && !defined(linux) && !defined(USL) && !defined(__CYGWIN__) && !defined(__powerpc__) 
76 inline 67 inline
77 #endif 68 #endif
78 static void 69 static void
79@@ -1880,7 +1893,11 @@ AuInitPhysicalDevices(void) 70@@ -1880,7 +1893,11 @@ AuInitPhysicalDevices(void)
80 sndStatOut.device, sndStatOut.howToOpen); 71 sndStatOut.device, sndStatOut.howToOpen);
81  72
82 if ((fd = open(sndStatOut.device, 73 if ((fd = open(sndStatOut.device,
83+#if defined(__FreeBSD__) || defined(__NetBSD__) 74+#if defined(__FreeBSD__) || defined(__NetBSD__)
84+ sndStatOut.howToOpen | extramode, 75+ sndStatOut.howToOpen | extramode,
85+#else 76+#else
86 sndStatOut.howToOpen | O_SYNC | extramode, 77 sndStatOut.howToOpen | O_SYNC | extramode,
87+#endif 78+#endif
88 0)) == -1) { 79 0)) == -1) {

cvs diff -r1.3 -r1.4 pkgsrc/audio/nas/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/audio/nas/patches/patch-ae 2002/11/28 11:40:46 1.3
+++ pkgsrc/audio/nas/patches/patch-ae 2013/01/05 12:57:22 1.4
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1$NetBSD: patch-ae,v 1.3 2002/11/28 11:40:46 markd Exp $ 1$NetBSD: patch-ae,v 1.4 2013/01/05 12:57:22 mef Exp $
 2
 3Honor ${PKG_SYSCONFDIR}, see SUBST in Makefile.
2 4
3--- config/NetAudio.def.orig Sun Feb 24 17:39:08 2002 5--- config/NetAudio.def.orig Sun Feb 24 17:39:08 2002
4+++ config/NetAudio.def 6+++ config/NetAudio.def
5@@ -8,6 +8,6 @@ 7@@ -8,6 +8,6 @@
6  8
7 XCOMM Directory where NAS will look for it's config file(s) 9 XCOMM Directory where NAS will look for it's config file(s)
8 #ifndef NasConfigSearchPath 10 #ifndef NasConfigSearchPath
9-#define NasConfigSearchPath /etc/nas/ 11-#define NasConfigSearchPath /etc/nas/
10+#define NasConfigSearchPath @PKG_SYSCONFDIR@/ 12+#define NasConfigSearchPath @PKG_SYSCONFDIR@/
11 #endif 13 #endif
12  14

cvs diff -r1.2 -r1.3 pkgsrc/audio/nas/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/audio/nas/patches/patch-af 2007/03/24 13:45:05 1.2
+++ pkgsrc/audio/nas/patches/patch-af 2013/01/05 12:57:22 1.3
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: patch-af,v 1.2 2007/03/24 13:45:05 markd Exp $ 1$NetBSD: patch-af,v 1.3 2013/01/05 12:57:22 mef Exp $
 2
 3Don't build/install auscope.
2 4
3--- clients/audio/Imakefile.orig 2007-03-25 00:47:25.000000000 +1200 5--- clients/audio/Imakefile.orig 2007-03-25 00:47:25.000000000 +1200
4+++ clients/audio/Imakefile 6+++ clients/audio/Imakefile
5@@ -29,7 +29,7 @@ 7@@ -29,7 +29,7 @@
6  8
7 SUBDIRS = widgets \ 9 SUBDIRS = widgets \
8 auconvert auctl audemo audial auedit auinfo aupanel auplay \ 10 auconvert auctl audemo audial auedit auinfo aupanel auplay \
9- aurecord autool auwave auphone auscope \ 11- aurecord autool auwave auphone auscope \
10+ aurecord autool auwave auphone \ 12+ aurecord autool auwave auphone \
11 util examples 13 util examples
12  14
13 MakeSubdirs($(SUBDIRS)) 15 MakeSubdirs($(SUBDIRS))

cvs diff -r1.7 -r1.8 pkgsrc/audio/nas/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/audio/nas/patches/patch-ag 2009/02/03 09:39:16 1.7
+++ pkgsrc/audio/nas/patches/patch-ag 2013/01/05 12:57:22 1.8
@@ -1,23 +1,20 @@ @@ -1,23 +1,20 @@
1$NetBSD: patch-ag,v 1.7 2009/02/03 09:39:16 dbj Exp $ 1$NetBSD: patch-ag,v 1.8 2013/01/05 12:57:22 mef Exp $
 2
 3(from cvs log for 1.4)
 4date: 2006/01/11 11:32:38; author: markd; state: Exp; lines: +12 -14
 5Some makedepend's object if a referenced header file is a dangling
 6symlink, so create the actual release.h file at the includes stage as
 7the depends stage is too late (server/os is before lib/audio).
 8Fixes PR pkg/32098 from Gilles Dauphin.
2 9
3--- config/NetAudio.tmpl.orig 2007-06-16 12:03:20.000000000 -0700 10--- config/NetAudio.tmpl.orig 2007-06-16 12:03:20.000000000 -0700
4+++ config/NetAudio.tmpl 2009-02-03 00:57:54.000000000 -0800 11+++ config/NetAudio.tmpl 2009-02-03 00:57:54.000000000 -0800
5@@ -55,6 +55,9 @@ EXTRA_LOAD_FLAGS=/link /nodefaultlib:lib 
6  
7 #define DebugLibX NO 
8 #define ProfileLibX NO 
9+#ifndef SharedLibX 
10+#define SharedLibX YES 
11+#endif 
12  
13 #if HasSharedLibraries 
14 #define NormalLibAudio NormalLibX 
15@@ -287,6 +290,8 @@ AuComplexProgramTarget(program) 12@@ -287,6 +290,8 @@ AuComplexProgramTarget(program)
16 release.h: $(TOP)/RELEASE @@\ 13 release.h: $(TOP)/RELEASE @@\
17 @echo "static const char *release = \"`cat $(TOP)/RELEASE`\";" > $@ @@\ 14 @echo "static const char *release = \"`cat $(TOP)/RELEASE`\";" > $@ @@\
18 @@\ 15 @@\
19+includes:: release.h @@\ 16+includes:: release.h @@\
20+ @@\ 17+ @@\
21 depend:: release.h @@\ 18 depend:: release.h @@\
22 @@\ 19 @@\
23 clean:: @@\ 20 clean:: @@\

File Deleted: pkgsrc/audio/nas/patches/Attic/patch-ah