Fri Mar 14 21:17:12 2014 UTC ()
Don't pull unused header file in. This fixes build on FreeBSD 9-10.


(asau)
diff -r1.31 -r1.32 pkgsrc/audio/nas/distinfo
diff -r1.14 -r1.15 pkgsrc/audio/nas/patches/patch-ad
cvs diff -r1.31 -r1.32 pkgsrc/audio/nas/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/nas/distinfo 2013/07/07 05:45:15 1.31
+++ pkgsrc/audio/nas/distinfo 2014/03/14 21:17:12 1.32
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.31 2013/07/07 05:45:15 ryoon Exp $ 1$NetBSD: distinfo,v 1.32 2014/03/14 21:17:12 asau Exp $
2 2
3SHA1 (nas-1.9.3.src.tar.gz) = dca770ddd10936ad1f19bf3c51f941c10d7bf84b 3SHA1 (nas-1.9.3.src.tar.gz) = dca770ddd10936ad1f19bf3c51f941c10d7bf84b
4RMD160 (nas-1.9.3.src.tar.gz) = 693c97658885a9bea02b27376c3a5a142b49e57a 4RMD160 (nas-1.9.3.src.tar.gz) = 693c97658885a9bea02b27376c3a5a142b49e57a
5Size (nas-1.9.3.src.tar.gz) = 1485222 bytes 5Size (nas-1.9.3.src.tar.gz) = 1485222 bytes
6SHA1 (patch-aa) = 3d198d97c1133358a7544d923ac6c48b38fdae19 6SHA1 (patch-aa) = 3d198d97c1133358a7544d923ac6c48b38fdae19
7SHA1 (patch-ab) = 848b151e4814c434dc628c649910d96e1cf8750e 7SHA1 (patch-ab) = 848b151e4814c434dc628c649910d96e1cf8750e
8SHA1 (patch-ac) = 02bc1eb18f8cc7155fed861ed4b953c1316283ea 8SHA1 (patch-ac) = 02bc1eb18f8cc7155fed861ed4b953c1316283ea
9SHA1 (patch-ad) = 0a0887b87a9690e9a2a156ed840e9dfccc1f8c6c 9SHA1 (patch-ad) = bef3e9fe82487766240931bbbed0213e3fe1c2c3
10SHA1 (patch-ae) = 2e88c42f849ec2e3eb942f79d05065ec8ddd1a9e 10SHA1 (patch-ae) = 2e88c42f849ec2e3eb942f79d05065ec8ddd1a9e
11SHA1 (patch-af) = 9e387f88504d6ef18ad4210af24702de61efbf1a 11SHA1 (patch-af) = 9e387f88504d6ef18ad4210af24702de61efbf1a
12SHA1 (patch-ag) = c43bab8c87efa5c770dd084d67ffa9897350810f 12SHA1 (patch-ag) = c43bab8c87efa5c770dd084d67ffa9897350810f
13SHA1 (patch-server_dia_auservertype.h) = 8ee2d064797837a1fcfd6c1389e09879f015cc9b 13SHA1 (patch-server_dia_auservertype.h) = 8ee2d064797837a1fcfd6c1389e09879f015cc9b
cvs diff -r1.14 -r1.15 pkgsrc/audio/nas/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/audio/nas/patches/patch-ad 2013/01/05 12:57:22 1.14
+++ pkgsrc/audio/nas/patches/patch-ad 2014/03/14 21:17:12 1.15
@@ -1,17 +1,27 @@ @@ -1,17 +1,27 @@
1$NetBSD: patch-ad,v 1.14 2013/01/05 12:57:22 mef Exp $ 1$NetBSD: patch-ad,v 1.15 2014/03/14 21:17:12 asau 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@@ -183,7 +183,9 @@ static int debug_msg_indentation = 0;
 6 # else
 7 # include <machine/soundcard.h>
 8 # endif
 9+/* PC Speaker functions seem to be unused here
 10 # include <machine/pcaudioio.h>
 11+*/
 12 #else
 13 # ifdef __NetBSD__
 14 # include <sys/ioctl.h>
5@@ -245,8 +245,13 @@ SndStat sndStatIn = { 15@@ -245,8 +245,13 @@ SndStat sndStatIn = {
6 256, /* fragSize */ 16 256, /* fragSize */
7 3, /* minFrags */ 17 3, /* minFrags */
8 32, /* maxFrags */ 18 32, /* maxFrags */
9+#if defined(__NetBSD__) 19+#if defined(__NetBSD__)
10+ "@DEVOSSAUDIO@", /* device */ 20+ "@DEVOSSAUDIO@", /* device */
11+ "/dev/mixer", /* mixer */ 21+ "/dev/mixer", /* mixer */
12+#else 22+#else
13 "/dev/dsp1", /* device */ 23 "/dev/dsp1", /* device */
14 "/dev/mixer1", /* mixer */ 24 "/dev/mixer1", /* mixer */
15+#endif 25+#endif
16 O_RDONLY, /* howToOpen */ 26 O_RDONLY, /* howToOpen */
17 1, /* autoOpen */ 27 1, /* autoOpen */