Sun Apr 26 06:32:00 2020 UTC ()
audio/nas: fix obvious path error in nasd.conf.eg

The path /dev//dev/audio does not make sense.


(rillig)
diff -r1.101 -r1.102 pkgsrc/audio/nas/Makefile
diff -r1.36 -r1.37 pkgsrc/audio/nas/distinfo
diff -r1.9 -r1.10 pkgsrc/audio/nas/patches/patch-ac
cvs diff -r1.101 -r1.102 pkgsrc/audio/nas/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/nas/Makefile 2020/03/20 11:57:23 1.101
+++ pkgsrc/audio/nas/Makefile 2020/04/26 06:32:00 1.102
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.101 2020/03/20 11:57:23 nia Exp $ 1# $NetBSD: Makefile,v 1.102 2020/04/26 06:32:00 rillig Exp $
2 2
3DISTNAME= nas-1.9.4.src 3DISTNAME= nas-1.9.4.src
4PKGNAME= ${DISTNAME:S/.src//} 4PKGNAME= ${DISTNAME:S/.src//}
 5PKGREVISION= 1
5CATEGORIES= audio 6CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nas/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nas/}
7 8
8MAINTAINER= markd@NetBSD.org 9MAINTAINER= markd@NetBSD.org
9HOMEPAGE= http://nas.sourceforge.net/ 10HOMEPAGE= http://nas.sourceforge.net/
10COMMENT= Network Audio System 11COMMENT= Network Audio System
11LICENSE= mit # with no-advertisement clause 12LICENSE= mit # with no-advertisement clause
12 13
13# 1) uses dia library before it is built 14# 1) uses dia library before it is built
14# 2) make succeeds even with failures, making this problem non-obvious 15# 2) make succeeds even with failures, making this problem non-obvious
15MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
16 17
17WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 18WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
cvs diff -r1.36 -r1.37 pkgsrc/audio/nas/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/nas/distinfo 2018/03/24 11:09:41 1.36
+++ pkgsrc/audio/nas/distinfo 2020/04/26 06:32:00 1.37
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.36 2018/03/24 11:09:41 spz Exp $ 1$NetBSD: distinfo,v 1.37 2020/04/26 06:32:00 rillig Exp $
2 2
3SHA1 (nas-1.9.4.src.tar.gz) = a251c5b771f9d7fa98f65e5830a039b28f8a6995 3SHA1 (nas-1.9.4.src.tar.gz) = a251c5b771f9d7fa98f65e5830a039b28f8a6995
4RMD160 (nas-1.9.4.src.tar.gz) = 9622263075b1d24fb27dd06c9edecc91ac3157ae 4RMD160 (nas-1.9.4.src.tar.gz) = 9622263075b1d24fb27dd06c9edecc91ac3157ae
5SHA512 (nas-1.9.4.src.tar.gz) = 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb 5SHA512 (nas-1.9.4.src.tar.gz) = 3f8bd60f8ce0f25a2605af17caaadfe4f21223ba4cd3fa02078d1427b17cdf33ebda887e5dc30cd68eb7f64bfad80aafc9071ff0a26f0d3a4a93caacac03b5bb
6Size (nas-1.9.4.src.tar.gz) = 1464598 bytes 6Size (nas-1.9.4.src.tar.gz) = 1464598 bytes
7SHA1 (patch-aa) = 3d198d97c1133358a7544d923ac6c48b38fdae19 7SHA1 (patch-aa) = 3d198d97c1133358a7544d923ac6c48b38fdae19
8SHA1 (patch-ab) = 848b151e4814c434dc628c649910d96e1cf8750e 8SHA1 (patch-ab) = 848b151e4814c434dc628c649910d96e1cf8750e
9SHA1 (patch-ac) = 02bc1eb18f8cc7155fed861ed4b953c1316283ea 9SHA1 (patch-ac) = 348c34feb5b5da95ba4d1df79e5dcb79880dbfd8
10SHA1 (patch-ad) = bef3e9fe82487766240931bbbed0213e3fe1c2c3 10SHA1 (patch-ad) = bef3e9fe82487766240931bbbed0213e3fe1c2c3
11SHA1 (patch-ae) = 2e88c42f849ec2e3eb942f79d05065ec8ddd1a9e 11SHA1 (patch-ae) = 2e88c42f849ec2e3eb942f79d05065ec8ddd1a9e
12SHA1 (patch-af) = 9e387f88504d6ef18ad4210af24702de61efbf1a 12SHA1 (patch-af) = 9e387f88504d6ef18ad4210af24702de61efbf1a
13SHA1 (patch-ag) = bd7d41acba8c38f133318380155dff30a7d32994 13SHA1 (patch-ag) = bd7d41acba8c38f133318380155dff30a7d32994
14SHA1 (patch-clients_audio_auconvert_Imakefile) = 423e6123111fdc1c10943b2d73b0214ca037fdaa 14SHA1 (patch-clients_audio_auconvert_Imakefile) = 423e6123111fdc1c10943b2d73b0214ca037fdaa
15SHA1 (patch-server_dia_auservertype.h) = 8ee2d064797837a1fcfd6c1389e09879f015cc9b 15SHA1 (patch-server_dia_auservertype.h) = 8ee2d064797837a1fcfd6c1389e09879f015cc9b
16SHA1 (patch-server_dia_lex.l) = dbfbf4adcad53034d633d59959d08a7464774b85 16SHA1 (patch-server_dia_lex.l) = dbfbf4adcad53034d633d59959d08a7464774b85
cvs diff -r1.9 -r1.10 pkgsrc/audio/nas/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/audio/nas/patches/patch-ac 2013/07/07 05:45:15 1.9
+++ pkgsrc/audio/nas/patches/patch-ac 2020/04/26 06:32:00 1.10
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: patch-ac,v 1.9 2013/07/07 05:45:15 ryoon Exp $ 1$NetBSD: patch-ac,v 1.10 2020/04/26 06:32:00 rillig Exp $
2 2
3--- server/nasd.conf.eg.orig Thu Feb 26 01:16:01 2009 3--- server/nasd.conf.eg.orig Thu Feb 26 01:16:01 2009
4+++ server/nasd.conf.eg 4+++ server/nasd.conf.eg
5@@ -44,7 +44,7 @@ OutDevType "EXT" 5@@ -44,7 +44,7 @@ OutDevType "EXT"
6  6
7 inputsection 7 inputsection
8  8
9- device "/dev/dsp1" # The input device, usually 9- device "/dev/dsp1" # The input device, usually
10+ device "/dev/@DEVOSSAUDIO@1" # The input device, usually 10+ device "@DEVOSSAUDIO@1" # The input device, usually
11 mixer "/dev/mixer1" # mixer device 11 mixer "/dev/mixer1" # mixer device
12 gain 50 # default input gain (0-100) 12 gain 50 # default input gain (0-100)
13 maxrate 44100 13 maxrate 44100
14@@ -62,7 +62,7 @@ end 14@@ -62,7 +62,7 @@ end
15  15
16 # These are used by voxware only for now. 16 # These are used by voxware only for now.
17 outputsection 17 outputsection
18- device "/dev/dsp" # The output device, usually 18- device "/dev/dsp" # The output device, usually
19+ device "@DEVOSSAUDIO@" # The output device, usually 19+ device "@DEVOSSAUDIO@" # The output device, usually
20 mixer "/dev/mixer" # mixer device 20 mixer "/dev/mixer" # mixer device
21 gain 50 # default output gain (0-100) 21 gain 50 # default output gain (0-100)
22 maxrate 44100 # CD quality. 22 maxrate 44100 # CD quality.
23@@ -88,7 +88,7 @@ end 23@@ -88,7 +88,7 @@ end