Fix build on OpenBSD/amd64 5.2.

* Add OpenBSD conditionals
* Add workaround for library link

6 files changed, 59 insertions, 26 deletions

diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 0386b83bb33..90f6c1cac84 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2013/01/05 12:57:21 mef Exp $
+# $NetBSD: Makefile,v 1.91 2013/01/06 03:21:46 ryoon Exp $
 
 DISTNAME=	nas-1.9.3.src
 PKGNAME=	${DISTNAME:S/.src//}
@@ -86,6 +86,16 @@ CONF_FILES=	${EGDIR}/nasd.conf.eg ${PKG_SYSCONFDIR}/nasd.conf
 pre-configure:
 	cd ${WRKSRC}/config && ${SETENV} ${CONFIGURE_ENV} ./configure
 
+# XXX OpenBSD 2.9 or later does not use lib/X11/config/bsdLib.rules,
+# XXX the rule in OpenBSDLib.rules does not do the following.
+# XXX PLIST should be splitted?
+.if ${OPSYS} == "OpenBSD"
+post-install:
+	cd ${DESTDIR}${PREFIX}/lib && \
+		${LN} -s libaudio.so.2.4 libaudio.so.2 && \
+		${LN} -s libaudio.so.2 libaudio.so
+.endif
+
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/nas/distinfo b/audio/nas/distinfo
index 796609db388..5620fda8a1b 100644
--- a/audio/nas/distinfo
+++ b/audio/nas/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.29 2013/01/05 12:57:22 mef Exp $
+$NetBSD: distinfo,v 1.30 2013/01/06 03:21:46 ryoon Exp $
 
 SHA1 (nas-1.9.3.src.tar.gz) = dca770ddd10936ad1f19bf3c51f941c10d7bf84b
 RMD160 (nas-1.9.3.src.tar.gz) = 693c97658885a9bea02b27376c3a5a142b49e57a
 Size (nas-1.9.3.src.tar.gz) = 1485222 bytes
-SHA1 (patch-aa) = 9389ce078ed15019d82e79683dd184b61ca1be5c
-SHA1 (patch-ab) = 1c2ec778589a6818336b74e134268d0d269b143c
-SHA1 (patch-ac) = 48f6c6791bde679774fd534012e8da2cf6e1e781
+SHA1 (patch-aa) = 3d198d97c1133358a7544d923ac6c48b38fdae19
+SHA1 (patch-ab) = 848b151e4814c434dc628c649910d96e1cf8750e
+SHA1 (patch-ac) = 6ac629690d82afbb3ce2f73f604b64fd8697a71c
 SHA1 (patch-ad) = 0a0887b87a9690e9a2a156ed840e9dfccc1f8c6c
 SHA1 (patch-ae) = 2e88c42f849ec2e3eb942f79d05065ec8ddd1a9e
 SHA1 (patch-af) = 9e387f88504d6ef18ad4210af24702de61efbf1a
 SHA1 (patch-ag) = c43bab8c87efa5c770dd084d67ffa9897350810f
+SHA1 (patch-server_dia_auservertype.h) = 8ee2d064797837a1fcfd6c1389e09879f015cc9b
diff --git a/audio/nas/patches/patch-aa b/audio/nas/patches/patch-aa
index 18d3b84e168..b18cb28037f 100644
--- a/audio/nas/patches/patch-aa
+++ b/audio/nas/patches/patch-aa
@@ -1,15 +1,24 @@
-$NetBSD: patch-aa,v 1.13 2013/01/05 12:57:22 mef Exp $
+$NetBSD: patch-aa,v 1.14 2013/01/06 03:21:47 ryoon Exp $
 
 (1) Add NetBSDArchitecture and DragonFlyArchitecture
 
---- lib/audio/Imakefile.orig   2006-08-14 03:10:05.000000000 +0200
+--- lib/audio/Imakefile.orig	Wed Jan 26 16:10:17 2011
 +++ lib/audio/Imakefile
-@@ -150,14 +150,16 @@
+@@ -59,7 +59,7 @@
+ #endif
+ 
+ XCOMM JET - hmmm.
+-#if (defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(BSDArchitecture)) && defined(HasBSD44Sockets)
++#if (defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(BSDArchitecture) || defined(OpenBSDArchitecture)) && defined(HasBSD44Sockets)
+  EXTRA_DEFINES = -DBSD44SOCKETS
+ #endif
+ 
+@@ -150,14 +150,16 @@ XAULIB = 
  XAULIB = -lXau
  #endif
  
 -#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(SunArchitecture) || defined(__FreeBSD_kernel__) || defined(DarwinArchitecture)
-+#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(SunArchitecture) || defined(__FreeBSD_kernel__) || defined(DarwinArchitecture) || defined(NetBSDArchitecture) || defined(DragonFlyArchitecture)
++#if defined(LinuxArchitecture) || defined(GNUArchitecture) || defined(SunArchitecture) || defined(__FreeBSD_kernel__) || defined(DarwinArchitecture) || defined(NetBSDArchitecture) || defined(DragonFlyArchitecture) || defined(OpenBSDArchitecture)
  REQUIREDLIBS = -L$(USRLIBDIR) -lXt $(XAULIB) -lm 
 -#endif
  
diff --git a/audio/nas/patches/patch-ab b/audio/nas/patches/patch-ab
index 87211bb4c27..63eb1e15646 100644
--- a/audio/nas/patches/patch-ab
+++ b/audio/nas/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.15 2013/01/05 12:57:22 mef Exp $
+$NetBSD: patch-ab,v 1.16 2013/01/06 03:21:47 ryoon Exp $
 
 (1.9) Convert -lossaudio to portable $(LIBOSSAUDIO)
       Make this work with audio/oss again.
@@ -13,27 +13,29 @@ This should fix the occasional problem were make complains with
 
 (1.5) Taking care nasd.conf (etc)
 
---- server/Imakefile.orig	2007-06-16 19:03:22.000000000 +0000
+--- server/Imakefile.orig	Thu Feb 26 01:16:01 2009
 +++ server/Imakefile
-@@ -61,7 +61,7 @@
+@@ -60,8 +60,8 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/12/06 01:33:07
+         SYSLIBS =
  #endif
  
- #ifdef NetBSDArchitecture
+-#ifdef NetBSDArchitecture
 -        SYSLIBS = -lossaudio
++#if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture)
 +        SYSLIBS = $(LIBOSSAUDIO)
  #endif
  
             CBRT =
-@@ -96,7 +96,7 @@
+@@ -96,7 +96,7 @@ ALL1 = nasd
  #endif
  
  
 -#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
-+#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
++#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__) || defined(OpenBSDArchitecture)
  # define CanBuildAuServer	YES
  
  #if !defined(GNUMachArchitecture)
-@@ -206,23 +206,34 @@
+@@ -206,23 +206,34 @@ dirs: FRC								@@\
  	$(MAKE) $(MFLAGS) PassCDebugFlags all				@@\
  									@@\
  FRC:
diff --git a/audio/nas/patches/patch-ac b/audio/nas/patches/patch-ac
index 86bcc53d8c6..7da10c832f4 100644
--- a/audio/nas/patches/patch-ac
+++ b/audio/nas/patches/patch-ac
@@ -1,28 +1,26 @@
-$NetBSD: patch-ac,v 1.7 2008/10/14 12:47:11 markd Exp $
+$NetBSD: patch-ac,v 1.8 2013/01/06 03:21:47 ryoon Exp $
 
---- server/nasd.conf.eg.orig	Tue Oct  8 16:08:02 2002
+--- server/nasd.conf.eg.orig	Thu Feb 26 01:16:01 2009
 +++ server/nasd.conf.eg
-@@ -29,8 +29,8 @@
+@@ -44,7 +44,7 @@ OutDevType	"EXT"
  
  inputsection
  
 -	device		"/dev/dsp1"		# The input device, usually
--	mixer		"/dev/mixer1"		# mixer device
-+	device		"@DEVOSSAUDIO@1"		# The input device, usually
-+	mixer		"/dev/mixer1"		# mixer device
++	device		"/dev/@DEVOSSAUDIO@1"		# The input device, usually
+ 	mixer		"/dev/mixer1"		# mixer device
          gain            50                      # default input gain (0-100)
  	maxrate		44100
- 	minrate		4000			# Kind of redundant
-@@ -47,7 +47,7 @@
+@@ -62,7 +62,7 @@ end
  
  # These are used by voxware only for now.
  outputsection
 -	device		"/dev/dsp"		# The output device, usually
-+	device		"@DEVOSSAUDIO@"		# The output device, usually
++	device		"@DEVOSSAUDIO@ 		# The output device, usually
  	mixer		"/dev/mixer"		# mixer device
          gain            50                      # default output gain (0-100)
  	maxrate		44100			# CD quality.
-@@ -73,7 +73,7 @@
+@@ -88,7 +88,7 @@ end
  #
  #
  #outputsection
diff --git a/audio/nas/patches/patch-server_dia_auservertype.h b/audio/nas/patches/patch-server_dia_auservertype.h
new file mode 100644
index 00000000000..fa70a3b5558
--- /dev/null
+++ b/audio/nas/patches/patch-server_dia_auservertype.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-server_dia_auservertype.h,v 1.1 2013/01/06 03:21:47 ryoon Exp $
+
+--- server/dia/auservertype.h.orig	Thu Feb 26 01:16:01 2009
++++ server/dia/auservertype.h
+@@ -14,7 +14,7 @@
+ # define SGI_SERVER
+ #endif /* sgi */
+ 
+-#if defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(linux) || (defined(SVR4) && (defined(SYSV386) || defined(i386))) || defined(__CYGWIN__)
++#if defined(__DragonFly__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(linux) || (defined(SVR4) && (defined(SYSV386) || defined(i386))) || defined(__CYGWIN__) || defined(__OpenBSD__)
+ # define VOXWARE_SERVER
+ #endif /* voxware */
+