pkg/41307: libsndfile can optionally build an octave module (patch)

[rumcic%gmail.com@localhost]

>Number:         41307
>Category:       pkg
>Synopsis:       libsndfile can optionally build an octave module (patch)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Apr 29 22:35:00 +0000 2009
>Originator:     Rumko
>Release:        /
>Organization:
>Environment:
DragonFly rumko.rumko.net 2.3.0-DEVELOPMENT DragonFly 2.3.0-DEVELOPMENT #431: 
Mon Apr 27 21:19:37 CEST 2009     
root%rumko.rumko.net@localhost:/usr/obj/usr/src/sys/MYPRECIOUS  i386
>Description:
libsndfile can optionally build an octave module. Problem is, if you have 
octave installed, libsndfile detects it, but we might not want to
>How-To-Repeat:
install octave, install libsndfile
>Fix:
Note: added gmake to USE_TOOLS ... it's needed when compiling the octave module 
due to usage of $+ ... it does not affect building libsndfile without octave

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libsndfile/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- Makefile    4 Mar 2009 16:47:05 -0000       1.49
+++ Makefile    29 Apr 2009 22:30:08 -0000
@@ -13,7 +13,7 @@

 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
-USE_TOOLS=             pkg-config
+USE_TOOLS=             pkg-config gmake
 PKGCONFIG_OVERRIDE=    sndfile.pc.in
 GNU_CONFIGURE=         yes

Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/audio/libsndfile/options.mk,v
retrieving revision 1.5
diff -u -r1.5 options.mk
--- options.mk  24 Jul 2008 22:39:30 -0000      1.5
+++ options.mk  29 Apr 2009 22:30:08 -0000
@@ -1,6 +1,7 @@
 # $NetBSD: options.mk,v 1.5 2008/07/24 22:39:30 obache Exp $

 PKG_OPTIONS_VAR=       PKG_OPTIONS.libsndfile
+PKG_SUPPORTED_OPTIONS= octave
 PKG_OPTIONS_OPTIONAL_GROUPS=   output
 PKG_OPTIONS_GROUP.output=      oss sun

@@ -23,6 +24,13 @@

 .include "../../mk/bsd.options.mk"

+.if !empty(PKG_OPTIONS:Moctave)
+USE_LANGUAGES=         fortran
+.include "../../math/octave/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-octave
+.endif
+
 .if !empty(PKG_OPTIONS:Moss)
 .include "../../mk/oss.buildlink3.mk"
 OSS_DEFS=      -DDEV_DSP=\"${DEVOSSAUDIO:Q}\" -DUSE_OSS=1