[pkgsrc/pkgsrc-2008Q2]: pkgsrc/audio/libsndfile pullup ticket #2464 - request...

[rtr <rtr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c6d11a12429a
branches:  pkgsrc-2008Q2
changeset: 544212:c6d11a12429a
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Sat Jul 26 01:34:36 2008 +0000

description:
pullup ticket #2464 - requested by obache
libsndfile: fix for failure on some platforms

revisions pulled up:
pkgsrc/audio/libsndfile/Makefile        1.46
pkgsrc/audio/libsndfile/options.mk      1.5

   Module Name: pkgsrc
   Committed By:        obache
   Date:                Thu Jul 24 22:39:30 UTC 2008

   Modified Files:
        pkgsrc/audio/libsndfile: Makefile options.mk

   Log Message:
   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.

diffstat:

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

diffs (43 lines):

diff -r 4f66187bd821 -r c6d11a12429a audio/libsndfile/Makefile
--- a/audio/libsndfile/Makefile Fri Jul 25 10:07:07 2008 +0000
+++ b/audio/libsndfile/Makefile Sat Jul 26 01:34:36 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2008/04/07 15:36:19 bjs Exp $
+# $NetBSD: Makefile,v 1.45.4.1 2008/07/26 01:34:36 rtr Exp $
 
 DISTNAME=      libsndfile-1.0.17
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    audio
 MASTER_SITES=  http://www.mega-nerd.com/libsndfile/
 
diff -r 4f66187bd821 -r c6d11a12429a audio/libsndfile/options.mk
--- a/audio/libsndfile/options.mk       Fri Jul 25 10:07:07 2008 +0000
+++ b/audio/libsndfile/options.mk       Sat Jul 26 01:34:36 2008 +0000
@@ -1,13 +1,23 @@
-# $NetBSD: options.mk,v 1.4 2008/04/07 15:36:19 bjs Exp $
+# $NetBSD: options.mk,v 1.4.4.1 2008/07/26 01:34:36 rtr 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}}