Update to 1.0.9. Set LICENSE to gnu-lgpl-v2.

Features and improvements

    * New PulseAudio? driver (Josh Green)
    * New Jack MIDI driver (Josh Green)
    * New CoreMIDI driver (Pedro Lopez-Cabanillas)
    * Portaudio driver re-written for Portaudio 19 (Josh Green)
    * Support for OS/2 including Dart audio driver (KO Myung-Hun)
    * RPN GM MIDI messages now handled for Bend Range, Fine Tune
    and Coarse Tune (Josh Green)
    * MIDI channel pressure now handled (Bernat Arlandis i Mañó)
    * MIDI Program/Bank instrument fallback selection logic (Josh
    Green and thanks also to Jimmy)
    * Added midi.portname setting to ALSA sequencer, -p command
    line switch (Nicolas Boulicault)
    * Added midi.winmidi.device setting to winmidi driver (Pedro
    Lopez-Cabanillas)
    * Updated Max/MSP FluidSynth binding (Norbert Schnell)

Synthesis Changes

    * Volume attenuation SoundFont generator now behaves more like
    EMU10K1 (S. Christian Collins)
    * Stop forcing velocity based filtering (S. Christian Collins)
    * Fixes to linear/bipolar/positive and convex/bipolar/positive
    modulator functions (S. Christian Collins)
    * Added fix to properly search for percussion instrument (Josh
    Green)
    * Force velocity envelope value to be that of the previous
    stage when switching from decay to sustain (S. Christian Collins)
    * Filter calculation now uses synthesizer sample rate rather
    than fixed at 44100 (S. Christian Collins)

Bug fixes

    * Fixed Jack driver in "audio.jack.multi=yes" mode and Jack
    audio driver cleanup (Bernat Arlandis i Mañó and Pedro
    Lopez-Cabanillas)
    * Wrong tempo changes (ticket #22 - Pedro Lopez-Cabanillas)
    * Crash bug fix related to using certain modulators in a preset
    (S. Christian Collins)
    * Fix to non-option command line argument processing when not
    using readline (Pedro Lopez-Cabanillas)
    * dsound device can't be selected (Ticket #16 - Pedro
    Lopez-Cabanillas)
    * Minor build fixes (Josh Green)
    * Fixed compilation under MSVC 2008 and older (Pedro
    Lopez-Cabanillas)

Misc. stuff

    * Updated README-OSX build instructions (Ebrahim Mayat)
    * FluidSynth fink package accepted for Mac OS X (Ebrahim Mayat)
    * Minor fixes to FluidSynth man page (Sven Hoexter)

4 files changed, 21 insertions, 19 deletions

diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index 108b1638cb6..e0e8f5e9e46 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2008/06/12 02:14:14 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/13 22:08:21 wiz Exp $
 
-DISTNAME=	fluidsynth-1.0.8
+DISTNAME=	fluidsynth-1.0.9
 CATEGORIES=	audio
 MASTER_SITES=	http://savannah.nongnu.org/download/fluid/
 
@@ -8,6 +8,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/fluid/
 COMMENT=	Software synthesizer based on SoundFont2
 
+LICENSE=	gnu-lgpl-v2
+
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/audio/fluidsynth/distinfo b/audio/fluidsynth/distinfo
index 5e0a77a1c91..3022a83075c 100644
--- a/audio/fluidsynth/distinfo
+++ b/audio/fluidsynth/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2007/12/16 15:18:29 adam Exp $
+$NetBSD: distinfo,v 1.8 2009/05/13 22:08:21 wiz Exp $
 
-SHA1 (fluidsynth-1.0.8.tar.gz) = 1f5fd9964a7212f772905724497abd46ab1e2536
-RMD160 (fluidsynth-1.0.8.tar.gz) = 1f647625ed8937f480401836f3b6f7819fa46ab9
-Size (fluidsynth-1.0.8.tar.gz) = 1267922 bytes
+SHA1 (fluidsynth-1.0.9.tar.gz) = fed8dcd8a816981e1e30ac8818a45949eb4f59c0
+RMD160 (fluidsynth-1.0.9.tar.gz) = 077ecb13000ee58ebc0cfcde65323a7a1128f1e2
+Size (fluidsynth-1.0.9.tar.gz) = 927002 bytes
 SHA1 (patch-aa) = 5a45b13669c928a10f6bddc0bfdd351a7cd863fc
 SHA1 (patch-ab) = 5bd951cdbc23fc69a5bd6cd09418505ee8447235
 SHA1 (patch-ac) = 8b4b9b5bad17d06b77f725d50fa0b98867103228
-SHA1 (patch-ad) = 2a02680082b86c4cd0f6e5ff54ccf69a865fcf1e
-SHA1 (patch-ae) = 44d56acc0288220a865548a883094e6b4fc891eb
+SHA1 (patch-ad) = 01c32d97c8ff02ba34e0bf903206c74b5b69d92c
+SHA1 (patch-ae) = 666286cb52c8cedeb1de5c863f9d9f9e81ef2e86
diff --git a/audio/fluidsynth/patches/patch-ad b/audio/fluidsynth/patches/patch-ad
index 1cd8eb61388..e050e5f9d8b 100644
--- a/audio/fluidsynth/patches/patch-ad
+++ b/audio/fluidsynth/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2007/12/16 15:18:29 adam Exp $
+$NetBSD: patch-ad,v 1.3 2009/05/13 22:08:21 wiz Exp $
 
---- src/fluid_sys.h.orig	2007-11-11 20:30:20.000000000 +0100
+--- src/fluid_sys.h.orig	2009-02-04 07:29:24.000000000 +0000
 +++ src/fluid_sys.h
-@@ -268,7 +268,7 @@ extern fluid_profile_data_t fluid_profil
+@@ -284,7 +284,7 @@ extern fluid_profile_data_t fluid_profil
      sample data.
   */
  
--#if HAVE_SYS_MMAN_H
-+#if HAVE_SYS_MMAN_H && !defined(__INTERIX)
+-#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__)
++#if defined(HAVE_SYS_MMAN_H) && !defined(__OS2__) && !defined(__INTERIX)
  #define fluid_mlock(_p,_n)      mlock(_p, _n)
  #define fluid_munlock(_p,_n)    munlock(_p,_n)
  #else
diff --git a/audio/fluidsynth/patches/patch-ae b/audio/fluidsynth/patches/patch-ae
index ac38ee6225b..050cf27d5c0 100644
--- a/audio/fluidsynth/patches/patch-ae
+++ b/audio/fluidsynth/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.3 2007/12/16 15:18:29 adam Exp $
+$NetBSD: patch-ae,v 1.4 2009/05/13 22:08:21 wiz Exp $
 
---- src/fluidsynth.c.orig	2007-11-11 11:09:48.000000000 +0100
+--- src/fluidsynth.c.orig	2009-02-04 07:45:02.000000000 +0000
 +++ src/fluidsynth.c
 @@ -212,9 +212,9 @@ int main(int argc, char** argv)
    int audio_channels = 0;
    int with_server = 0;
    int dump = 0;
 -  int connect_lash = 1;
-   char *optchars = "a:C:c:df:G:g:hijK:L:lm:no:R:r:sVvz:";
+   char *optchars = "a:C:c:df:G:g:hijK:L:lm:no:p:R:r:sVvz:";
  #ifdef LASH_ENABLED
 +  int connect_lash = 1;
    int enabled_lash = 0;		/* set to TRUE if lash gets enabled */
@@ -23,7 +23,7 @@ $NetBSD: patch-ae,v 1.3 2007/12/16 15:18:29 adam Exp $
        {"dump", 0, 0, 'd'},
        {"gain", 1, 0, 'g'},
        {"help", 0, 0, 'h'},
-@@ -343,9 +345,11 @@ int main(int argc, char** argv)
+@@ -344,9 +346,11 @@ int main(int argc, char** argv)
        audio_channels = atoi(optarg);
        fluid_settings_setint(settings, "synth.audio-channels", audio_channels);
        break;
@@ -35,7 +35,7 @@ $NetBSD: patch-ae,v 1.3 2007/12/16 15:18:29 adam Exp $
      case 'm':
        fluid_settings_setstr(settings, "midi.driver", optarg);
        break;
-@@ -417,6 +421,7 @@ int main(int argc, char** argv)
+@@ -421,6 +425,7 @@ int main(int argc, char** argv)
  #endif
  
  #ifdef LASH_ENABLED
@@ -43,7 +43,7 @@ $NetBSD: patch-ae,v 1.3 2007/12/16 15:18:29 adam Exp $
    /* connect to the lash server */
    if (connect_lash)
      {
-@@ -424,6 +429,7 @@ int main(int argc, char** argv)
+@@ -428,6 +433,7 @@ int main(int argc, char** argv)
        fluid_settings_setint (settings, "lash.enable", enabled_lash ? 1 : 0);
      }
  #endif