diff options
author | jlam <jlam> | 2001-07-14 13:35:12 +0000 |
---|---|---|
committer | jlam <jlam> | 2001-07-14 13:35:12 +0000 |
commit | 6304ff7147d6f1e6241d63c4af91a9166f32ce37 (patch) | |
tree | afa5cdc78e8d58e4912569a0912cfa8e8462196a /audio/nas | |
parent | 2b9d2171d3cd1e09af1a60da9ec181f93701a4f1 (diff) | |
download | pkgsrc-6304ff7147d6f1e6241d63c4af91a9166f32ce37.tar.gz |
Update nas to the latest stable release 1.4.2. Changes from 1.4 include
major bugfixes in the clients and bumping the major version of the library.
Diffstat (limited to 'audio/nas')
-rw-r--r-- | audio/nas/Makefile | 12 | ||||
-rw-r--r-- | audio/nas/distinfo | 12 | ||||
-rw-r--r-- | audio/nas/patches/patch-aa | 8 | ||||
-rw-r--r-- | audio/nas/patches/patch-ab | 10 | ||||
-rw-r--r-- | audio/nas/patches/patch-ad | 34 | ||||
-rw-r--r-- | audio/nas/pkg/PLIST.clients | 6 |
6 files changed, 40 insertions, 42 deletions
diff --git a/audio/nas/Makefile b/audio/nas/Makefile index 092e7b0da09..af9734732e0 100644 --- a/audio/nas/Makefile +++ b/audio/nas/Makefile @@ -1,11 +1,13 @@ -# $NetBSD: Makefile,v 1.13 2001/07/02 21:29:34 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2001/07/14 13:35:12 jlam Exp $ # FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp # -DISTNAME= nas-1.4.src +DISTNAME= nas-1.4.2.src PKGNAME= ${DISTNAME:S/.src//} +WRKSRC= ${WRKDIR}/${PKGNAME} CATEGORIES= audio -MASTER_SITES= ${MASTER_SITE_XCONTRIB:=audio/nas/} +MASTER_SITES= http://radscan.com/nas/ \ + ${MASTER_SITE_XCONTRIB:=audio/nas/} MAINTAINER= packages@netbsd.org HOMEPAGE= http://radscan.com/nas.html @@ -15,10 +17,6 @@ USE_BUILDLINK_ONLY= # defined USE_IMAKE= # defined USE_X11BASE= # defined -WRKSRC= ${WRKDIR}/${PKGNAME} - -.include "../../mk/bsd.prefs.mk" - PLIST_SRC= ${PKGDIR}/PLIST.clients .if ${MACHINE_ARCH} == "i386" PLIST_SRC+= ${PKGDIR}/PLIST.voxware diff --git a/audio/nas/distinfo b/audio/nas/distinfo index 477aaf7a0be..c28afb35faa 100644 --- a/audio/nas/distinfo +++ b/audio/nas/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 12:14:36 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/07/14 13:35:12 jlam Exp $ -SHA1 (nas-1.4.src.tar.gz) = f17462e1bbb0e0657d5765c25adcd898069d11cb -Size (nas-1.4.src.tar.gz) = 806363 bytes -SHA1 (patch-aa) = 208537a671751ea59cc9ebe9152b9695e2decbd1 -SHA1 (patch-ab) = 17f9eee9e78430fdd7649ca4741f780621d992f7 +SHA1 (nas-1.4.2.src.tar.gz) = 39634818e5719a850eecf751bbccd98758721e4b +Size (nas-1.4.2.src.tar.gz) = 816938 bytes +SHA1 (patch-aa) = 344776f3bd3e24664c5cb675aea047b7de645f00 +SHA1 (patch-ab) = b6ab1bc67bb46e5ef483a3da6010097b6349745b SHA1 (patch-ac) = 5fe9a1fa688d95a3b201c50e1b309224a8429797 -SHA1 (patch-ad) = 87b457884ef37a303abc443a385b304c0786d727 +SHA1 (patch-ad) = b0d5bfac931ce859734006ce9642cd251af6ba88 diff --git a/audio/nas/patches/patch-aa b/audio/nas/patches/patch-aa index f3fb11b0c85..5c484ed9ab6 100644 --- a/audio/nas/patches/patch-aa +++ b/audio/nas/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2000/08/04 01:31:56 jlam Exp $ +$NetBSD: patch-aa,v 1.5 2001/07/14 13:35:13 jlam Exp $ ---- config/NetAudio.tmpl.orig Sat Mar 4 21:40:50 2000 -+++ config/NetAudio.tmpl Thu Aug 3 21:03:54 2000 -@@ -207,7 +207,7 @@ +--- config/NetAudio.tmpl.orig Sun Mar 18 15:36:39 2001 ++++ config/NetAudio.tmpl +@@ -222,7 +222,7 @@ #define AuInstallManPage(file,destdir) AuInstallManPageLong(file,destdir,file) #define AuInstallManPageLong(file,destdir,dest) @@\ diff --git a/audio/nas/patches/patch-ab b/audio/nas/patches/patch-ab index 39eff837da0..aed63af1657 100644 --- a/audio/nas/patches/patch-ab +++ b/audio/nas/patches/patch-ab @@ -1,15 +1,15 @@ -$NetBSD: patch-ab,v 1.5 2000/08/04 01:31:56 jlam Exp $ +$NetBSD: patch-ab,v 1.6 2001/07/14 13:35:13 jlam Exp $ ---- server/Imakefile.orig Sat Feb 12 15:22:43 2000 -+++ server/Imakefile Thu Aug 3 21:03:54 2000 -@@ -207,10 +207,11 @@ +--- server/Imakefile.orig Tue Dec 12 23:45:48 2000 ++++ server/Imakefile +@@ -217,10 +217,11 @@ $(RM) $(ALL) ETCDIR = NasConfigSearchPath + EGDIR = ${PREFIX}/share/examples/nas InstallManPage(nasd,$(MANDIR)) - InstallManPage(nasd.conf,$(MANDIR)) + InstallManPage(nasd.conf,$(RCMANDIR)) -InstallNonExecFile(nasd.conf.eg,$(ETCDIR)) +InstallNonExecFile(nasd.conf.eg,$(EGDIR)) diff --git a/audio/nas/patches/patch-ad b/audio/nas/patches/patch-ad index c46622a89cc..8a4c04d71a3 100644 --- a/audio/nas/patches/patch-ad +++ b/audio/nas/patches/patch-ad @@ -1,28 +1,28 @@ -$NetBSD: patch-ad,v 1.6 2000/09/12 16:49:23 fredb Exp $ +$NetBSD: patch-ad,v 1.7 2001/07/14 13:35:13 jlam Exp $ ---- server/dda/voxware/auvoxware.c.orig Sat Mar 4 20:40:55 2000 -+++ server/dda/voxware/auvoxware.c Tue Sep 12 11:41:20 2000 +--- server/dda/voxware/auvoxware.c.orig Thu Oct 5 20:39:16 2000 ++++ server/dda/voxware/auvoxware.c @@ -224,7 +224,11 @@ - 256, - 3, - 32, -+#ifdef __NetBSD__ -+ "/dev/audio", + 256, /* fragSize */ + 3, /* minFrags */ + 32, /* maxFrags */ ++#if defined(__NetBSD__) ++ "/dev/audio", /* device */ +#else - "/dev/dsp1", + "/dev/dsp1", /* device */ +#endif - 0 + 0 /* isPCSpeaker */ }, sndStatOut = { @@ -237,7 +241,11 @@ - 256, - 3, - 32, -+#ifdef __NetBSD__ -+ "/dev/audio", + 256, /* fragSize */ + 3, /* minFrags */ + 32, /* maxFrags */ ++#if defined(__NetBSD__) ++ "/dev/audio", /* device */ +#else - "/dev/dsp", + "/dev/dsp", /* device */ +#endif - 0 + 0 /* isPCSpeaker */ }; diff --git a/audio/nas/pkg/PLIST.clients b/audio/nas/pkg/PLIST.clients index 027f38c33e7..4b7f130aae9 100644 --- a/audio/nas/pkg/PLIST.clients +++ b/audio/nas/pkg/PLIST.clients @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.clients,v 1.2 2001/01/04 15:10:20 agc Exp $ +@comment $NetBSD: PLIST.clients,v 1.3 2001/07/14 13:35:13 jlam Exp $ bin/auconvert bin/auctl bin/audemo @@ -40,8 +40,8 @@ include/audio/wave.h lib/X11/AuErrorDB lib/libaudio.a lib/libaudio.so -lib/libaudio.so.1 -lib/libaudio.so.1.4 +lib/libaudio.so.2 +lib/libaudio.so.2.1 man/cat1/auconvert.0 man/cat1/auctl.0 man/cat1/audemo.0 |