build fixes for NetBSD

3 files changed, 43 insertions, 6 deletions

diff --git a/audio/nas/distinfo b/audio/nas/distinfo
index 970afbadff9..fc9606d60be 100644
--- a/audio/nas/distinfo
+++ b/audio/nas/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2017/01/04 10:34:10 jperkin Exp $
+$NetBSD: distinfo,v 1.36 2018/03/24 11:09:41 spz Exp $
 
 SHA1 (nas-1.9.4.src.tar.gz) = a251c5b771f9d7fa98f65e5830a039b28f8a6995
 RMD160 (nas-1.9.4.src.tar.gz) = 9622263075b1d24fb27dd06c9edecc91ac3157ae
@@ -10,6 +10,7 @@ SHA1 (patch-ac) = 02bc1eb18f8cc7155fed861ed4b953c1316283ea
 SHA1 (patch-ad) = bef3e9fe82487766240931bbbed0213e3fe1c2c3
 SHA1 (patch-ae) = 2e88c42f849ec2e3eb942f79d05065ec8ddd1a9e
 SHA1 (patch-af) = 9e387f88504d6ef18ad4210af24702de61efbf1a
-SHA1 (patch-ag) = c43bab8c87efa5c770dd084d67ffa9897350810f
+SHA1 (patch-ag) = bd7d41acba8c38f133318380155dff30a7d32994
+SHA1 (patch-clients_audio_auconvert_Imakefile) = 423e6123111fdc1c10943b2d73b0214ca037fdaa
 SHA1 (patch-server_dia_auservertype.h) = 8ee2d064797837a1fcfd6c1389e09879f015cc9b
 SHA1 (patch-server_dia_lex.l) = dbfbf4adcad53034d633d59959d08a7464774b85
diff --git a/audio/nas/patches/patch-ag b/audio/nas/patches/patch-ag
index 39d16c883a5..db27d824f17 100644
--- a/audio/nas/patches/patch-ag
+++ b/audio/nas/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.8 2013/01/05 12:57:22 mef Exp $
+$NetBSD: patch-ag,v 1.9 2018/03/24 11:09:41 spz Exp $
 
 (from cvs log for 1.4)
 date: 2006/01/11 11:32:38;  author: markd;  state: Exp;  lines: +12 -14
@@ -7,9 +7,30 @@ symlink, so create the actual release.h file at the includes stage as
 the depends stage is too late (server/os is before lib/audio).
 Fixes PR pkg/32098 from Gilles Dauphin.
 
---- config/NetAudio.tmpl.orig	2007-06-16 12:03:20.000000000 -0700
-+++ config/NetAudio.tmpl	2009-02-03 00:57:54.000000000 -0800
-@@ -287,6 +290,8 @@ AuComplexProgramTarget(program)
+-L$(AUSRC): make sure -laudio gets found when building clients before
+the package has been installed
+
+--- ./config/NetAudio.tmpl.orig	2013-04-27 00:41:00.000000000 +0000
++++ ./config/NetAudio.tmpl
+@@ -178,7 +178,7 @@ EXTRA_LOAD_FLAGS=/link /nodefaultlib:lib
+ /* place #ifdef's for other architectures around these lines */
+  LOCAL_LDFLAGS = _AuUse(-L$(USRLIBDIR), -L$(AUSRC) -L$(USRLIBDIR))
+       DEPAULIB =
+-         AULIB = -laudio
++         AULIB = -L$(AUSRC) -laudio
+ 
+ #endif /* SunArchitecture */
+ 
+@@ -186,7 +186,7 @@ EXTRA_LOAD_FLAGS=/link /nodefaultlib:lib
+ #else /* SharedLibAudio */
+  LOCAL_LDFLAGS =
+       DEPAULIB = _AuUseCat($(USRLIBDIR),$(AUSRC),/Lib(audio))
+-         AULIB = LoaderLibPrefix _AuUse(-laudio,$(DEPAULIB))
++         AULIB = -L$(AUSRC) LoaderLibPrefix _AuUse(-laudio,$(DEPAULIB))
+ #endif /* SharedLibAudio */
+ 
+   AUDIODEPLIBS = $(DEPAULIB) $(DEPXTOOLLIB) $(DEPXLIB)
+@@ -316,6 +316,8 @@ AuComplexProgramTarget(program)
  release.h: $(TOP)/RELEASE				    		    @@\
  	@echo "static const char *release = \"`cat $(TOP)/RELEASE`\";" > $@   @@\
  						    			    @@\
diff --git a/audio/nas/patches/patch-clients_audio_auconvert_Imakefile b/audio/nas/patches/patch-clients_audio_auconvert_Imakefile
new file mode 100644
index 00000000000..c8e7f4ae21c
--- /dev/null
+++ b/audio/nas/patches/patch-clients_audio_auconvert_Imakefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-clients_audio_auconvert_Imakefile,v 1.1 2018/03/24 11:09:41 spz Exp $
+
+build fix for NetBSD (and probably the other added systems too)
+
+--- clients/audio/auconvert/Imakefile.orig	2013-04-27 00:41:00.000000000 +0000
++++ clients/audio/auconvert/Imakefile
+@@ -24,7 +24,7 @@
+ 
+ #include "../../../config/NetAudio.tmpl"
+ 
+-#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(GNUArchitecture)
++#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(__DragonFly__) || defined(GNUArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture)
+  EXTRA_DEFINES = -DHAS_MKSTEMP
+ #endif
+