From 7e341abfcc63e7b7a44a71b55b0c7c64ed63861c Mon Sep 17 00:00:00 2001
From: obache <obache@pkgsrc.org>
Date: Thu, 24 Jul 2008 22:39:30 +0000
Subject: Fix improper PKG_SUGGESTED_OPTIONS and fix build failure on some
 platforms.

* Should not try to use OSS for unknown OSes, PR 39197,
  only for having buitin OSS.
* for Solaris, ${OPSYS} != "Solaris", it's "SunOS".
  Fixed to use sunaudio instead of oss.

Bump PKGREVISION.
---
 audio/libsndfile/Makefile   |  4 ++--
 audio/libsndfile/options.mk | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index f26ef39544d..c03e485d302 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2008/04/07 15:36:19 bjs Exp $
+# $NetBSD: Makefile,v 1.46 2008/07/24 22:39:30 obache Exp $
 
 DISTNAME=	libsndfile-1.0.17
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mega-nerd.com/libsndfile/
 
diff --git a/audio/libsndfile/options.mk b/audio/libsndfile/options.mk
index 43ed751ffc1..d735349df20 100644
--- a/audio/libsndfile/options.mk
+++ b/audio/libsndfile/options.mk
@@ -1,13 +1,23 @@
-# $NetBSD: options.mk,v 1.4 2008/04/07 15:36:19 bjs Exp $
+# $NetBSD: options.mk,v 1.5 2008/07/24 22:39:30 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.libsndfile
 PKG_OPTIONS_OPTIONAL_GROUPS=	output
 PKG_OPTIONS_GROUP.output=	oss sun
 
-SNDFILE_OUTPUT.${OPSYS}?=	oss
 SNDFILE_OUTPUT.NetBSD=		sun
 SNDFILE_OUTPUT.OpenBSD=		sun
-SNDFILE_OUTPUT.Solaris=		sun
+SNDFILE_OUTPUT.SunOS=		sun
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if !defined(SNDFILE_OUTPUT.${OPSYS})
+CHECK_BUILTIN.oss:=	yes
+.  include "../../mk/oss.builtin.mk"
+CHECK_BUILTIN.oss:=	no
+.  if defined(IS_BUILTIN.oss) && !empty(IS_BUILTIN.oss:M[yY][eE][sS])
+SNDFILE_OUTPUT.${OPSYS}?=	oss
+.  endif
+.endif
 
 PKG_SUGGESTED_OPTIONS=		${SNDFILE_OUTPUT.${OPSYS}}
 
-- 
cgit v1.2.3