Mon Jan 30 01:34:39 2012 UTC ()
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"


(sbd)
diff -r1.27 -r1.28 pkgsrc/audio/nas/distinfo
diff -r1.13 -r1.14 pkgsrc/audio/nas/patches/patch-ab
cvs diff -r1.27 -r1.28 pkgsrc/audio/nas/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/nas/distinfo 2009/07/09 19:10:25 1.27
+++ pkgsrc/audio/nas/distinfo 2012/01/30 01:34:38 1.28
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.27 2009/07/09 19:10:25 hasso Exp $ 1$NetBSD: distinfo,v 1.28 2012/01/30 01:34:38 sbd Exp $
2 2
3SHA1 (nas-1.9.1.src.tar.gz) = 1207a821676ca1b763a47e3c278262a64a626ba3 3SHA1 (nas-1.9.1.src.tar.gz) = 1207a821676ca1b763a47e3c278262a64a626ba3
4RMD160 (nas-1.9.1.src.tar.gz) = 6d6aa05ae2376fbc8ff3145b73da1d28b190a856 4RMD160 (nas-1.9.1.src.tar.gz) = 6d6aa05ae2376fbc8ff3145b73da1d28b190a856
5Size (nas-1.9.1.src.tar.gz) = 1454523 bytes 5Size (nas-1.9.1.src.tar.gz) = 1454523 bytes
6SHA1 (patch-aa) = f407891f0207d789c0e5bf7a455fd7798ce01fde 6SHA1 (patch-aa) = f407891f0207d789c0e5bf7a455fd7798ce01fde
7SHA1 (patch-ab) = d424b0970bd23584629f6a9bebea8b8c014462b5 7SHA1 (patch-ab) = 2929b5477f21cd82ef8b5f0fb3039ea9a6e7b2c0
8SHA1 (patch-ac) = 48f6c6791bde679774fd534012e8da2cf6e1e781 8SHA1 (patch-ac) = 48f6c6791bde679774fd534012e8da2cf6e1e781
9SHA1 (patch-ad) = b889775d66e1de80fc9bc2563f9cc0ebf720ad71 9SHA1 (patch-ad) = b889775d66e1de80fc9bc2563f9cc0ebf720ad71
10SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543 10SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543
11SHA1 (patch-af) = c08e0e2e6bfe6fd3aed7171dfd16a4df99a0b66a 11SHA1 (patch-af) = c08e0e2e6bfe6fd3aed7171dfd16a4df99a0b66a
12SHA1 (patch-ag) = 73959e05169d6b1ed658228cddbca86e62e142be 12SHA1 (patch-ag) = 73959e05169d6b1ed658228cddbca86e62e142be
13SHA1 (patch-ah) = 62e0538441f4375b93169906e1cdc82ab045e5c5 13SHA1 (patch-ah) = 62e0538441f4375b93169906e1cdc82ab045e5c5
cvs diff -r1.13 -r1.14 pkgsrc/audio/nas/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/audio/nas/patches/patch-ab 2007/05/05 21:31:10 1.13
+++ pkgsrc/audio/nas/patches/patch-ab 2012/01/30 01:34:38 1.14
@@ -1,36 +1,51 @@ @@ -1,36 +1,51 @@
1$NetBSD: patch-ab,v 1.13 2007/05/05 21:31:10 markd Exp $ 1$NetBSD: patch-ab,v 1.14 2012/01/30 01:34:38 sbd Exp $
2 2
3--- server/Imakefile.orig 2006-08-14 13:04:17.000000000 +1200 3--- server/Imakefile.orig 2007-06-16 19:03:22.000000000 +0000
4+++ server/Imakefile 4+++ server/Imakefile
5@@ -61,7 +61,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/ 5@@ -61,7 +61,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/
6 #endif 6 #endif
7  7
8 #ifdef NetBSDArchitecture 8 #ifdef NetBSDArchitecture
9- SYSLIBS = -lossaudio 9- SYSLIBS = -lossaudio
10+ SYSLIBS = $(LIBOSSAUDIO) 10+ SYSLIBS = $(LIBOSSAUDIO)
11 #endif 11 #endif
12  12
13 CBRT = 13 CBRT =
14@@ -96,7 +96,7 @@ ALL1 = nasd 14@@ -96,7 +96,7 @@ ALL1 = nasd
15 #endif 15 #endif
16  16
17  17
18-#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__) 18-#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__) 19+#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 20 # define CanBuildAuServer YES
21  21
22 # if defined(cygwinArchitecture) 22 # if defined(cygwinArchitecture)
23@@ -213,14 +213,19 @@ clean:: 23@@ -204,23 +204,34 @@ dirs: FRC @@\
 24 $(MAKE) $(MFLAGS) PassCDebugFlags all @@\
 25 @@\
 26 FRC:
 27+
 28 #endif /* ForceSubdirs */
 29 #endif /* Project X < 5 */
 30
 31 ForceSubdirs($(DEPDIRS) $(SUBDIRS))
 32
 33+$(VOXWARELIBS):
 34+ @echo "making all in $(CURRENT_DIR)/${@D}..."
 35+ @(cd ${@D} && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\
 36+ PassCDebugFlags all) || exit $$?
 37+
 38 clean::
24 $(RM) $(ALL) 39 $(RM) $(ALL)
25  40
26 ETCDIR = NasConfigSearchPath 41 ETCDIR = NasConfigSearchPath
27+ EGDIR = ${PREFIX}/share/examples/nas 42+ EGDIR = ${PREFIX}/share/examples/nas
28  43
29 InstallManPage(nasd,$(MANDIR)) 44 InstallManPage(nasd,$(MANDIR))
30 #ifdef InstallGenManPage 45 #ifdef InstallGenManPage
31 InstallGenManPage(nasd.conf,$(FILEMANDIR),$(FILEMANSUFFIX)) 46 InstallGenManPage(nasd.conf,$(FILEMANDIR),$(FILEMANSUFFIX))
32 #else 47 #else
33+#ifdef InstallNamedTarget 48+#ifdef InstallNamedTarget
34+InstallNamedTarget(install.man,nasd.conf.man,$(INSTMANFLAGS),$(FILEMANDIR),nasd.conf.$(FILEMANSUFFIX)) 49+InstallNamedTarget(install.man,nasd.conf.man,$(INSTMANFLAGS),$(FILEMANDIR),nasd.conf.$(FILEMANSUFFIX))
35+#else 50+#else
36 InstallManPage(nasd.conf,$(FILEMANDIR)) 51 InstallManPage(nasd.conf,$(FILEMANDIR))