[pkgsrc/trunk]: pkgsrc/audio/moc-devel Add an option to use the new jack-deve...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/50dddd0c3ffa
branches:  trunk
changeset: 540834:50dddd0c3ffa
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Tue Apr 08 01:52:41 2008 +0000

description:
Add an option to use the new jack-devel package. Bump revision.

diffstat:

 audio/moc-devel/Makefile   |   3 ++-
 audio/moc-devel/options.mk |  21 ++++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diffs (55 lines):

diff -r 9e6779b9488b -r 50dddd0c3ffa audio/moc-devel/Makefile
--- a/audio/moc-devel/Makefile  Tue Apr 08 01:45:24 2008 +0000
+++ b/audio/moc-devel/Makefile  Tue Apr 08 01:52:41 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/04/07 16:10:37 bjs Exp $
+# $NetBSD: Makefile,v 1.2 2008/04/08 01:52:41 bjs Exp $
 
 DISTNAME=              moc-2.5.0-alpha3
 PKGNAME=               ${DISTNAME:S/-alpha/./:moc%=moc-devel%}
+PKGREVISION=           1
 CATEGORIES=            audio
 MASTER_SITES=          ftp://ftp.daper.net/pub/soft/moc/unstable/
 EXTRACT_SUFX=          .tar.bz2
diff -r 9e6779b9488b -r 50dddd0c3ffa audio/moc-devel/options.mk
--- a/audio/moc-devel/options.mk        Tue Apr 08 01:45:24 2008 +0000
+++ b/audio/moc-devel/options.mk        Tue Apr 08 01:52:41 2008 +0000
@@ -1,20 +1,35 @@
-# $NetBSD: options.mk,v 1.1.1.1 2008/04/07 16:10:37 bjs Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/08 01:52:41 bjs Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.moc
-PKG_SUPPORTED_OPTIONS= sndfile flac vorbis speex curl samplerate
+PKG_SUPPORTED_OPTIONS= sndfile flac vorbis speex curl samplerate jack
 PKG_SUGGESTED_OPTIONS= sndfile flac vorbis curl
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mjack)
+CONFIGURE_ARGS+=       --with-jack
+###
+### Resampling support is usually required with jack.
+###
+.  include "../../audio/jack-devel/buildlink3.mk"
+.  if empty(PKG_OPTIONS:Msamplerate)
+PKG_OPTIONS+=          samplerate
+.  endif
+.else
+CONFIGURE_ARGS+=       --without-jack
+.endif
+
 .if !empty(PKG_OPTIONS:Msamplerate)
 CONFIGURE_ARGS+=       --with-samplerate
+.  if empty(PKG_OPTIONS:Msndfile)
 PKG_OPTIONS+=          sndfile
+.  endif
 .  include "../../audio/libsamplerate/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-samplerate
 .endif
 
-.if !empty(PKG_OPTIONS:Msndfile) || !empty(PKG_OPTIONS:Msamplerate)
+.if !empty(PKG_OPTIONS:Msndfile)
 PLIST_SUBST+=          SNDFILE=
 CONFIGURE_ARGS+=       --with-sndfile
 .  include "../../audio/libsndfile/buildlink3.mk"