From 501cb5240401d2cc0ee1c6b06c061cc394c14e33 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 3 Dec 2002 09:13:39 +0000
Subject: Ensure that the voxware (OSS) audio server is built on NetBSD/sparc.

---
 audio/nas/Makefile         |  8 +++++---
 audio/nas/distinfo         |  4 ++--
 audio/nas/patches/patch-ab | 11 ++++++++++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 2d730ad7c15..94e9cce9d80 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/11/28 11:40:45 markd Exp $
+# $NetBSD: Makefile,v 1.21 2002/12/03 09:13:39 jlam Exp $
 # FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp
 #
 
@@ -37,10 +37,12 @@ pre-configure:
 	done
 
 PLIST_SRC=	${PKGDIR}/PLIST.clients
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc"
+.if (${MACHINE_ARCH} == "i386") || \
+    (${MACHINE_ARCH} == "sparc")
 .  include "../../mk/ossaudio.buildlink2.mk"
+EGDIR=		${PREFIX}/share/examples/nas
 PLIST_SRC+=	${PKGDIR}/PLIST.voxware
-CONF_FILES=	${PREFIX}/share/examples/nas/nasd.conf.eg ${PKG_SYSCONFDIR}/nasd.conf
+CONF_FILES=	${EGDIR}/nasd.conf.eg ${PKG_SYSCONFDIR}/nasd.conf
 .endif
 
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/audio/nas/distinfo b/audio/nas/distinfo
index 9f11d0d5400..d2ecb3ba0e0 100644
--- a/audio/nas/distinfo
+++ b/audio/nas/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2002/12/03 09:03:07 jlam Exp $
+$NetBSD: distinfo,v 1.7 2002/12/03 09:13:39 jlam Exp $
 
 SHA1 (nas-1.6.src.tar.gz) = cba0fae4be38cdad9b84e79cbabb8cad2b44bbe0
 Size (nas-1.6.src.tar.gz) = 1099385 bytes
-SHA1 (patch-ab) = 30ec8e4bede3f442c4d72c1630a157ec656a391a
+SHA1 (patch-ab) = 777e5d1e9beaa1a4837a70e7dbc522eb1cb78f9c
 SHA1 (patch-ac) = 36f8ee0ec494e9d6a7994780c608c7a5fbf2114d
 SHA1 (patch-ad) = c8e77228282cdd4de5d9686e88a260e286c6bf80
 SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543
diff --git a/audio/nas/patches/patch-ab b/audio/nas/patches/patch-ab
index 16c12543fbc..7c66b837e4f 100644
--- a/audio/nas/patches/patch-ab
+++ b/audio/nas/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.9 2002/12/03 09:03:08 jlam Exp $
+$NetBSD: patch-ab,v 1.10 2002/12/03 09:13:39 jlam Exp $
 
 --- server/Imakefile.orig	Tue Jul 23 18:49:33 2002
 +++ server/Imakefile
@@ -11,6 +11,15 @@ $NetBSD: patch-ab,v 1.9 2002/12/03 09:03:08 jlam Exp $
  #endif
  
             CBRT =
+@@ -99,7 +99,7 @@ RCMANDIR = $(MANDIR)
+ #endif
+ 
+ 
+-#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture)
++#if defined(i386SVR4Architecture) || defined(NetBSDArchitecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture)
+ # define CanBuildAuServer	YES
+ 
+ # if defined(LinuxArchitecture)
 @@ -224,6 +224,7 @@ clean::
  	$(RM) $(ALL)
  
-- 
cgit v1.2.3