From f449e104a48f564a64051318f7b8806e572b444c Mon Sep 17 00:00:00 2001
From: dbj <dbj@pkgsrc.org>
Date: Tue, 3 Feb 2009 09:39:16 +0000
Subject: fix problems with missing -lXau on darwin and solaris (at least) by
 providing a default define of SharedLibX which causes it to use a shared
 libaudio if the installed imake templates don't define it

---
 audio/nas/distinfo         |  4 ++--
 audio/nas/patches/patch-ag | 26 ++++++++++++--------------
 2 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'audio')

diff --git a/audio/nas/distinfo b/audio/nas/distinfo
index b3902026fd9..b8c218a8ec0 100644
--- a/audio/nas/distinfo
+++ b/audio/nas/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2009/01/26 11:50:54 sketch Exp $
+$NetBSD: distinfo,v 1.26 2009/02/03 09:39:16 dbj Exp $
 
 SHA1 (nas-1.9.1.src.tar.gz) = 1207a821676ca1b763a47e3c278262a64a626ba3
 RMD160 (nas-1.9.1.src.tar.gz) = 6d6aa05ae2376fbc8ff3145b73da1d28b190a856
@@ -9,5 +9,5 @@ SHA1 (patch-ac) = 48f6c6791bde679774fd534012e8da2cf6e1e781
 SHA1 (patch-ad) = b889775d66e1de80fc9bc2563f9cc0ebf720ad71
 SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543
 SHA1 (patch-af) = c08e0e2e6bfe6fd3aed7171dfd16a4df99a0b66a
-SHA1 (patch-ag) = f21238b0f2e9aabd438ca0d66367d6c9c45dbd76
+SHA1 (patch-ag) = 73959e05169d6b1ed658228cddbca86e62e142be
 SHA1 (patch-ah) = 62e0538441f4375b93169906e1cdc82ab045e5c5
diff --git a/audio/nas/patches/patch-ag b/audio/nas/patches/patch-ag
index 0a8b1346c30..e453160ead9 100644
--- a/audio/nas/patches/patch-ag
+++ b/audio/nas/patches/patch-ag
@@ -1,20 +1,18 @@
-$NetBSD: patch-ag,v 1.6 2009/01/26 11:50:54 sketch Exp $
+$NetBSD: patch-ag,v 1.7 2009/02/03 09:39:16 dbj Exp $
 
---- config/NetAudio.tmpl.orig	Sat Jun 16 20:03:20 2007
-+++ config/NetAudio.tmpl	Mon Jan 26 11:42:48 2009
-@@ -155,7 +155,11 @@
+--- config/NetAudio.tmpl.orig	2007-06-16 12:03:20.000000000 -0700
++++ config/NetAudio.tmpl	2009-02-03 00:57:54.000000000 -0800
+@@ -55,6 +55,9 @@ EXTRA_LOAD_FLAGS=/link /nodefaultlib:lib
  
- 
- #else /* SharedLibAudio */
-+#ifdef SunArchitecture
-+ LOCAL_LDFLAGS = -lXau
-+#else
-  LOCAL_LDFLAGS =
+ #define DebugLibX		NO
+ #define ProfileLibX		NO
++#ifndef SharedLibX
++#define SharedLibX              YES
 +#endif
-       DEPAULIB = _AuUseCat($(USRLIBDIR),$(AUSRC),/Lib(audio))
-          AULIB = LoaderLibPrefix _AuUse(-laudio,$(DEPAULIB))
- #endif /* SharedLibAudio */
-@@ -287,6 +291,8 @@
+ 
+ #if HasSharedLibraries
+ #define NormalLibAudio          NormalLibX
+@@ -287,6 +290,8 @@ AuComplexProgramTarget(program)
  release.h: $(TOP)/RELEASE				    		    @@\
  	@echo "static const char *release = \"`cat $(TOP)/RELEASE`\";" > $@   @@\
  						    			    @@\
-- 
cgit v1.2.3