Import aubio-0.3.2 from wip/aubio

aubio is a tool designed for the extraction of annotations from audio
signals. Its features include segmenting a sound file before each of
its attacks, performing pitch detection, tapping the beat and
producing midi streams from live audio.

Because these tasks are difficult, we thought it was important to
gather them in a dedicated library. To increase the fun, we have made
these algorithms work in a causal way, so as to be used in real time
applications with as low delay as possible. Functions can be used
offline in sound editors and software samplers, or online in audio
effects and virtual instruments.

aubio currently provides the following features:
    - digital filters
    - phase vocoder
    - onset detection (several methods)
    - pitch tracking (several methods)
    - beat and tempo tracking
    - mel frequency cepstrum coefficients (MFCC)
    - transient / steady-state separation

14 files changed, 465 insertions, 0 deletions

diff --git a/audio/aubio/DESCR b/audio/aubio/DESCR
new file mode 100644
index 00000000000..efa8b810b87
--- /dev/null
+++ b/audio/aubio/DESCR
@@ -0,0 +1,20 @@
+aubio is a tool designed for the extraction of annotations from audio
+signals. Its features include segmenting a sound file before each of
+its attacks, performing pitch detection, tapping the beat and
+producing midi streams from live audio.
+
+Because these tasks are difficult, we thought it was important to
+gather them in a dedicated library. To increase the fun, we have made
+these algorithms work in a causal way, so as to be used in real time
+applications with as low delay as possible. Functions can be used
+offline in sound editors and software samplers, or online in audio
+effects and virtual instruments.
+
+aubio currently provides the following features:
+    - digital filters
+    - phase vocoder
+    - onset detection (several methods)
+    - pitch tracking (several methods)
+    - beat and tempo tracking
+    - mel frequency cepstrum coefficients (MFCC)
+    - transient / steady-state separation
diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile
new file mode 100644
index 00000000000..f9eaa1063eb
--- /dev/null
+++ b/audio/aubio/Makefile
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.1.1.1 2011/10/06 11:45:47 ryoon Exp $
+#
+
+DISTNAME=	aubio-0.3.2
+CATEGORIES=	audio
+MASTER_SITES=	http://aubio.org/pub/
+
+MAINTAINER=	pho@cielonegro.org
+HOMEPAGE=	http://aubio.org/
+COMMENT=	Extracting annotations from audio signals
+LICENSE=	gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+PKGCONFIG_OVERRIDE+=	aubio.pc.in
+
+# Python related variables:
+PY_PATCHPLIST=			yes
+PYTHON_PATCH_SCRIPTS=	python/aubiocut python/aubiopitch
+
+.include "options.mk"
+
+.include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../devel/swig/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
+.include "../../math/fftw/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/aubio/PLIST b/audio/aubio/PLIST
new file mode 100644
index 00000000000..2432a843ee6
--- /dev/null
+++ b/audio/aubio/PLIST
@@ -0,0 +1,128 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2011/10/06 11:45:47 ryoon Exp $
+bin/aubiocut
+bin/aubionotes
+bin/aubioonset
+bin/aubiopitch
+bin/aubiotrack
+include/aubio/aubio.h
+include/aubio/aubioext.h
+include/aubio/beattracking.h
+include/aubio/biquad.h
+include/aubio/config.h
+include/aubio/fft.h
+include/aubio/filter.h
+include/aubio/hist.h
+include/aubio/jackio.h
+include/aubio/mathutils.h
+include/aubio/midi/list.h
+include/aubio/midi/midi.h
+include/aubio/midi/midi_driver.h
+include/aubio/midi/midi_event.h
+include/aubio/midi/midi_file.h
+include/aubio/midi/midi_parser.h
+include/aubio/midi/midi_player.h
+include/aubio/midi/midi_track.h
+include/aubio/midi/timer.h
+include/aubio/onset.h
+include/aubio/onsetdetection.h
+include/aubio/peakpick.h
+include/aubio/phasevoc.h
+include/aubio/pitchdetection.h
+include/aubio/pitchfcomb.h
+include/aubio/pitchmcomb.h
+include/aubio/pitchschmitt.h
+include/aubio/pitchyin.h
+include/aubio/pitchyinfft.h
+include/aubio/resample.h
+include/aubio/sample.h
+include/aubio/scale.h
+include/aubio/sndfileio.h
+include/aubio/tempo.h
+include/aubio/tss.h
+include/aubio/types.h
+lib/libaubio.la
+lib/libaubioext.la
+lib/pkgconfig/aubio.pc
+${PYSITELIB}/aubio/__init__.py
+${PYSITELIB}/aubio/__init__.pyc
+${PYSITELIB}/aubio/__init__.pyo
+${PYSITELIB}/aubio/_aubiowrapper.la
+${PYSITELIB}/aubio/aubioclass.py
+${PYSITELIB}/aubio/aubioclass.pyc
+${PYSITELIB}/aubio/aubioclass.pyo
+${PYSITELIB}/aubio/aubiowrapper.py
+${PYSITELIB}/aubio/aubiowrapper.pyc
+${PYSITELIB}/aubio/aubiowrapper.pyo
+${PYSITELIB}/aubio/bench/__init__.py
+${PYSITELIB}/aubio/bench/__init__.pyc
+${PYSITELIB}/aubio/bench/__init__.pyo
+${PYSITELIB}/aubio/bench/broadcast.py
+${PYSITELIB}/aubio/bench/broadcast.pyc
+${PYSITELIB}/aubio/bench/broadcast.pyo
+${PYSITELIB}/aubio/bench/config.py
+${PYSITELIB}/aubio/bench/config.pyc
+${PYSITELIB}/aubio/bench/config.pyo
+${PYSITELIB}/aubio/bench/node.py
+${PYSITELIB}/aubio/bench/node.pyc
+${PYSITELIB}/aubio/bench/node.pyo
+${PYSITELIB}/aubio/bench/onset.py
+${PYSITELIB}/aubio/bench/onset.pyc
+${PYSITELIB}/aubio/bench/onset.pyo
+${PYSITELIB}/aubio/gnuplot.py
+${PYSITELIB}/aubio/gnuplot.pyc
+${PYSITELIB}/aubio/gnuplot.pyo
+${PYSITELIB}/aubio/median.py
+${PYSITELIB}/aubio/median.pyc
+${PYSITELIB}/aubio/median.pyo
+${PYSITELIB}/aubio/onsetcompare.py
+${PYSITELIB}/aubio/onsetcompare.pyc
+${PYSITELIB}/aubio/onsetcompare.pyo
+${PYSITELIB}/aubio/plot/__init__.py
+${PYSITELIB}/aubio/plot/__init__.pyc
+${PYSITELIB}/aubio/plot/__init__.pyo
+${PYSITELIB}/aubio/plot/keyboard.py
+${PYSITELIB}/aubio/plot/keyboard.pyc
+${PYSITELIB}/aubio/plot/keyboard.pyo
+${PYSITELIB}/aubio/task/__init__.py
+${PYSITELIB}/aubio/task/__init__.pyc
+${PYSITELIB}/aubio/task/__init__.pyo
+${PYSITELIB}/aubio/task/beat.py
+${PYSITELIB}/aubio/task/beat.pyc
+${PYSITELIB}/aubio/task/beat.pyo
+${PYSITELIB}/aubio/task/cut.py
+${PYSITELIB}/aubio/task/cut.pyc
+${PYSITELIB}/aubio/task/cut.pyo
+${PYSITELIB}/aubio/task/notes.py
+${PYSITELIB}/aubio/task/notes.pyc
+${PYSITELIB}/aubio/task/notes.pyo
+${PYSITELIB}/aubio/task/onset.py
+${PYSITELIB}/aubio/task/onset.pyc
+${PYSITELIB}/aubio/task/onset.pyo
+${PYSITELIB}/aubio/task/params.py
+${PYSITELIB}/aubio/task/params.pyc
+${PYSITELIB}/aubio/task/params.pyo
+${PYSITELIB}/aubio/task/pitch.py
+${PYSITELIB}/aubio/task/pitch.pyc
+${PYSITELIB}/aubio/task/pitch.pyo
+${PYSITELIB}/aubio/task/silence.py
+${PYSITELIB}/aubio/task/silence.pyc
+${PYSITELIB}/aubio/task/silence.pyo
+${PYSITELIB}/aubio/task/task.py
+${PYSITELIB}/aubio/task/task.pyc
+${PYSITELIB}/aubio/task/task.pyo
+${PYSITELIB}/aubio/task/utils.py
+${PYSITELIB}/aubio/task/utils.pyc
+${PYSITELIB}/aubio/task/utils.pyo
+${PYSITELIB}/aubio/txtfile.py
+${PYSITELIB}/aubio/txtfile.pyc
+${PYSITELIB}/aubio/txtfile.pyo
+${PYSITELIB}/aubio/web/__init__.py
+${PYSITELIB}/aubio/web/__init__.pyc
+${PYSITELIB}/aubio/web/__init__.pyo
+${PYSITELIB}/aubio/web/browser.py
+${PYSITELIB}/aubio/web/browser.pyc
+${PYSITELIB}/aubio/web/browser.pyo
+${PYSITELIB}/aubio/web/html.py
+${PYSITELIB}/aubio/web/html.pyc
+${PYSITELIB}/aubio/web/html.pyo
+share/sounds/aubio/woodblock.aiff
diff --git a/audio/aubio/buildlink3.mk b/audio/aubio/buildlink3.mk
new file mode 100644
index 00000000000..78d7710a7b2
--- /dev/null
+++ b/audio/aubio/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/10/06 11:45:47 ryoon Exp $
+
+BUILDLINK_TREE+=	aubio
+
+.if !defined(AUBIO_BUILDLINK3_MK)
+AUBIO_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.aubio+=	aubio>=0.3.2
+BUILDLINK_PKGSRCDIR.aubio?=	../../audio/aubio
+
+.include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
+.endif	# AUBIO_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-aubio
diff --git a/audio/aubio/distinfo b/audio/aubio/distinfo
new file mode 100644
index 00000000000..6cc5c5471a3
--- /dev/null
+++ b/audio/aubio/distinfo
@@ -0,0 +1,13 @@
+$NetBSD: distinfo,v 1.1.1.1 2011/10/06 11:45:47 ryoon Exp $
+
+SHA1 (aubio-0.3.2.tar.gz) = 8ef7ccbf18a4fa6db712a9192acafc9c8d080978
+RMD160 (aubio-0.3.2.tar.gz) = 44e3bb8ab38aa715052466e7ae50123089914b5b
+Size (aubio-0.3.2.tar.gz) = 609006 bytes
+SHA1 (patch-python_aubio_Makefile.in) = 4d6b2bf9f6b1cc6661f4aa65f400a0c575c8aca5
+SHA1 (patch-python_aubio_bench_onset.py) = 1076258814ced4e91afcd0e5242b4de23c008211
+SHA1 (patch-python_aubio_gnuplot.py) = 7ed573a32f4443cf4a48ad32575e2d38d55889f2
+SHA1 (patch-python_aubio_plot_keyboard.py) = ae207a1f5a508b49d2815a1e3496d209b06ee351
+SHA1 (patch-python_aubio_task_beat.py) = 1413775da8b9982ab66604208f3d522eed270a90
+SHA1 (patch-python_aubio_task_notes.py) = d0c28c1d41519617a731cc7baed9105ff8453e42
+SHA1 (patch-python_aubio_task_onset.py) = 403879042e287edd332e56fd56f4255796665dd9
+SHA1 (patch-python_aubio_task_pitch.py) = ceb9d777f0ae91b261086d53f4cb24bdefb3a185
diff --git a/audio/aubio/options.mk b/audio/aubio/options.mk
new file mode 100644
index 00000000000..5cc04d02d94
--- /dev/null
+++ b/audio/aubio/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
+#
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.aubio
+PKG_SUPPORTED_OPTIONS=	jack alsa
+PKG_SUGGESTED_OPTIONS=	jack alsa
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mjack)
+.  include "../../audio/jack/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Malsa)
+.  include "../../audio/alsa-lib/buildlink3.mk"
+.  include "../../audio/jack/buildlink3.mk"
+.endif
diff --git a/audio/aubio/patches/patch-python_aubio_Makefile.in b/audio/aubio/patches/patch-python_aubio_Makefile.in
new file mode 100644
index 00000000000..c21f36c54cd
--- /dev/null
+++ b/audio/aubio/patches/patch-python_aubio_Makefile.in
@@ -0,0 +1,18 @@
+$NetBSD: patch-python_aubio_Makefile.in,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
+
+--- python/aubio/Makefile.in.orig	2006-10-10 14:41:06.000000000 +0000
++++ python/aubio/Makefile.in
+@@ -61,11 +61,11 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/aubio_wrap.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(_aubiowrapper_la_SOURCES)
+ DIST_SOURCES = $(_aubiowrapper_la_SOURCES)
diff --git a/audio/aubio/patches/patch-python_aubio_bench_onset.py b/audio/aubio/patches/patch-python_aubio_bench_onset.py
new file mode 100644
index 00000000000..a6970a89a1f
--- /dev/null
+++ b/audio/aubio/patches/patch-python_aubio_bench_onset.py
@@ -0,0 +1,60 @@
+$NetBSD: patch-python_aubio_bench_onset.py,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
+
+* After 2.6, with is reserved and must not be used as variable.
+
+--- python/aubio/bench/onset.py.orig	2006-07-26 23:27:19.000000000 +0000
++++ python/aubio/bench/onset.py
+@@ -111,7 +111,7 @@ class benchonset(bench):
+ 		for i in self.vlist:
+ 			gd.append(i['GD']) 
+ 			fp.append(i['FP']) 
+-		d.append(Gnuplot.Data(fp, gd, with='linespoints', 
++		d.append(Gnuplot.Data(fp, gd, with_='linespoints', 
+ 			title="%s %s" % (plottitle,i['mode']) ))
+ 
+ 	def plotplotroc(self,d,outplot=0,extension='ps'):
+@@ -147,7 +147,7 @@ class benchonset(bench):
+ 		for i in self.vlist:
+ 			x.append(i['prec']) 
+ 			y.append(i['recl']) 
+-		d.append(Gnuplot.Data(x, y, with='linespoints', 
++		d.append(Gnuplot.Data(x, y, with_='linespoints', 
+ 			title="%s %s" % (plottitle,i['mode']) ))
+ 
+ 	def plotplotpr(self,d,outplot=0,extension='ps'):
+@@ -172,7 +172,7 @@ class benchonset(bench):
+ 		for i in self.vlist:
+ 			x.append(i['thres']) 
+ 			y.append(i['dist']) 
+-		d.append(Gnuplot.Data(x, y, with='linespoints', 
++		d.append(Gnuplot.Data(x, y, with_='linespoints', 
+ 			title="%s %s" % (plottitle,i['mode']) ))
+ 
+ 	def plotplotfmeas(self,d,outplot="",extension='ps', title="F-measure"):
+@@ -205,7 +205,7 @@ class benchonset(bench):
+ 		for i in self.vlist:
+ 			x.append(i[var]) 
+ 			y.append(i['dist']) 
+-		d.append(Gnuplot.Data(x, y, with='linespoints', 
++		d.append(Gnuplot.Data(x, y, with_='linespoints', 
+ 			title="%s %s" % (plottitle,i['mode']) ))
+ 	
+ 	def plotplotfmeasvar(self,d,var,outplot="",extension='ps', title="F-measure"):
+@@ -244,7 +244,7 @@ class benchonset(bench):
+ 		total = v['Torig']
+ 		for i in range(len(per)): per[i] /= total/100.
+ 
+-		d.append(Gnuplot.Data(val, per, with='fsteps', 
++		d.append(Gnuplot.Data(val, per, with_='fsteps', 
+ 			title="%s %s" % (plottitle,v['mode']) ))
+ 		#d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (mean,smean))
+ 		#d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (amean,samean))
+@@ -275,7 +275,7 @@ class benchonset(bench):
+ 		total = v['Torig']
+ 		for i in range(len(per)): per[i] /= total/100.
+ 
+-		d.append(Gnuplot.Data(val, per, with='fsteps', 
++		d.append(Gnuplot.Data(val, per, with_='fsteps', 
+ 			title="%s %s" % (plottitle,v['mode']) ))
+ 		#d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (mean,smean))
+ 		#d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (amean,samean))
diff --git a/audio/aubio/patches/patch-python_aubio_gnuplot.py b/audio/aubio/patches/patch-python_aubio_gnuplot.py
new file mode 100644
index 00000000000..8f14db63b3d
--- /dev/null
+++ b/audio/aubio/patches/patch-python_aubio_gnuplot.py
@@ -0,0 +1,24 @@
+$NetBSD: patch-python_aubio_gnuplot.py,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
+
+* After 2.6, with is reserved and must not be used as variable.
+
+--- python/aubio/gnuplot.py.orig	2006-08-24 02:13:22.000000000 +0000
++++ python/aubio/gnuplot.py
+@@ -155,7 +155,7 @@ def make_audio_plot(time,data,maxpoints=
+   """ create gnuplot plot from an audio file """
+   import Gnuplot, Gnuplot.funcutils
+   x,y = downsample_audio(time,data,maxpoints=maxpoints)
+-  return Gnuplot.Data(x,y,with='lines')
++  return Gnuplot.Data(x,y,with_='lines')
+ 
+ def make_audio_envelope(time,data,maxpoints=10000):
+   """ create gnuplot plot from an audio file """
+@@ -165,7 +165,7 @@ def make_audio_envelope(time,data,maxpoi
+   x = [i.mean() for i in numarray.array(time).resize(len(time)/bufsize,bufsize)] 
+   y = [i.mean() for i in numarray.array(data).resize(len(time)/bufsize,bufsize)] 
+   x,y = downsample_audio(x,y,maxpoints=maxpoints)
+-  return Gnuplot.Data(x,y,with='lines')
++  return Gnuplot.Data(x,y,with_='lines')
+ 
+ def gnuplot_addargs(parser):
+   """ add common gnuplot argument to OptParser object """
diff --git a/audio/aubio/patches/patch-python_aubio_plot_keyboard.py b/audio/aubio/patches/patch-python_aubio_plot_keyboard.py
new file mode 100644
index 00000000000..4353252666a
--- /dev/null
+++ b/audio/aubio/patches/patch-python_aubio_plot_keyboard.py
@@ -0,0 +1,17 @@
+$NetBSD: patch-python_aubio_plot_keyboard.py,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
+
+* After 2.6, with is reserved and must not be used as variable.
+
+--- python/aubio/plot/keyboard.py.orig	2006-07-26 23:27:19.000000000 +0000
++++ python/aubio/plot/keyboard.py
+@@ -30,8 +30,8 @@ def draw_keyboard(firstnote = 21, lastno
+   yb      = [y0+(y1-y0)*2/3. for i in range(len(xb))]
+   ybdelta = [(y1-y0)*1/3. for i in range(len(xb))]
+ 
+-  whites  = Gnuplot.Data(xw,yw,xwdelta,ywdelta,with = 'boxxyerrorbars')
+-  blacks  = Gnuplot.Data(xb,yb,xbdelta,ybdelta,with = 'boxxyerrorbars fill solid')
++  whites  = Gnuplot.Data(xw,yw,xwdelta,ywdelta,with_ = 'boxxyerrorbars')
++  blacks  = Gnuplot.Data(xb,yb,xbdelta,ybdelta,with_ = 'boxxyerrorbars fill solid')
+ 
+   return blacks,whites
+ 
diff --git a/audio/aubio/patches/patch-python_aubio_task_beat.py b/audio/aubio/patches/patch-python_aubio_task_beat.py
new file mode 100644
index 00000000000..bd3a516bc8b
--- /dev/null
+++ b/audio/aubio/patches/patch-python_aubio_task_beat.py
@@ -0,0 +1,22 @@
+$NetBSD: patch-python_aubio_task_beat.py,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
+
+* After 2.6, with is reserved and must not be used as variable.
+
+--- python/aubio/task/beat.py.orig	2006-09-25 19:26:08.000000000 +0000
++++ python/aubio/task/beat.py
+@@ -247,7 +247,7 @@ class taskbeat(taskonset):
+ 
+ 	def plot(self,oplots,results):
+ 		import Gnuplot
+-		oplots.append(Gnuplot.Data(results,with='linespoints',title="auto"))
++		oplots.append(Gnuplot.Data(results,with_='linespoints',title="auto"))
+ 
+ 	def plotplot(self,wplot,oplots,outplot=None,extension=None,xsize=1.,ysize=1.,spectro=False):
+ 		import Gnuplot
+@@ -258,5 +258,5 @@ class taskbeat(taskonset):
+ 		#f = make_audio_plot(time,data)
+ 
+ 		g = gnuplot_create(outplot=outplot, extension=extension)
+-		oplots = [Gnuplot.Data(self.gettruth(),with='linespoints',title="orig")] + oplots
++		oplots = [Gnuplot.Data(self.gettruth(),with_='linespoints',title="orig")] + oplots
+ 		g.plot(*oplots)
diff --git a/audio/aubio/patches/patch-python_aubio_task_notes.py b/audio/aubio/patches/patch-python_aubio_task_notes.py
new file mode 100644
index 00000000000..eb04f26eee0
--- /dev/null
+++ b/audio/aubio/patches/patch-python_aubio_task_notes.py
@@ -0,0 +1,38 @@
+$NetBSD: patch-python_aubio_task_notes.py,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
+
+* After 2.6, with is reserved and must not be used as variable.
+
+--- python/aubio/task/notes.py.orig	2006-07-26 23:27:19.000000000 +0000
++++ python/aubio/task/notes.py
+@@ -95,15 +95,15 @@ class tasknotes(task):
+ 		import numarray
+ 		import Gnuplot
+ 
+-		oplots.append(Gnuplot.Data(now,freq,with='lines',
++		oplots.append(Gnuplot.Data(now,freq,with_='lines',
+ 			title=self.params.pitchmode))
+-		oplots.append(Gnuplot.Data(now,ifreq,with='lines',
++		oplots.append(Gnuplot.Data(now,ifreq,with_='lines',
+ 			title=self.params.pitchmode))
+ 
+ 		temponsets = []
+ 		for i in onset:
+ 			temponsets.append(i*1000)
+-		oplots.append(Gnuplot.Data(now,temponsets,with='impulses',
++		oplots.append(Gnuplot.Data(now,temponsets,with_='impulses',
+ 			title=self.params.pitchmode))
+ 
+ 	def plotplot(self,wplot,oplots,outplot=None,multiplot = 0):
+@@ -117,10 +117,10 @@ class tasknotes(task):
+ 		# check if ground truth exists
+ 		#timet,pitcht = self.gettruth()
+ 		#if timet and pitcht:
+-		#	oplots = [Gnuplot.Data(timet,pitcht,with='lines',
++		#	oplots = [Gnuplot.Data(timet,pitcht,with_='lines',
+ 		#		title='ground truth')] + oplots
+ 
+-		t = Gnuplot.Data(0,0,with='impulses') 
++		t = Gnuplot.Data(0,0,with_='impulses') 
+ 
+ 		g = gnuplot_init(outplot)
+ 		g('set title \'%s\'' % (re.sub('.*/','',self.input)))
diff --git a/audio/aubio/patches/patch-python_aubio_task_onset.py b/audio/aubio/patches/patch-python_aubio_task_onset.py
new file mode 100644
index 00000000000..8ad0f6a4f92
--- /dev/null
+++ b/audio/aubio/patches/patch-python_aubio_task_onset.py
@@ -0,0 +1,35 @@
+$NetBSD: patch-python_aubio_task_onset.py,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
+
+* After 2.6, with is reserved and must not be used as variable.
+
+--- python/aubio/task/onset.py.orig	2006-08-11 12:27:47.000000000 +0000
++++ python/aubio/task/onset.py
+@@ -103,7 +103,7 @@ class taskonset(task):
+ 		self.maxofunc = max(ofunc)
+ 		# onset detection function 
+ 		downtime = numarray.arange(len(ofunc))*self.params.step
+-		oplot.append(Gnuplot.Data(downtime,ofunc,with='lines',title=self.params.onsetmode))
++		oplot.append(Gnuplot.Data(downtime,ofunc,with_='lines',title=self.params.onsetmode))
+ 
+ 		# detected onsets
+ 		if not nplot:
+@@ -114,8 +114,8 @@ class taskonset(task):
+ 			#x1 = numarray.array(onsets)*self.params.step
+ 			#y1 = self.maxofunc*numarray.ones(len(onsets))
+ 			if x1:
+-				oplot.append(Gnuplot.Data(x1,y1,with='impulses'))
+-				wplot.append(Gnuplot.Data(x1,y1p,with='impulses'))
++				oplot.append(Gnuplot.Data(x1,y1,with_='impulses'))
++				wplot.append(Gnuplot.Data(x1,y1p,with_='impulses'))
+ 
+ 		oplots.append((oplot,self.params.onsetmode,self.maxofunc))
+ 
+@@ -128,7 +128,7 @@ class taskonset(task):
+ 			t_onsets = aubio.txtfile.read_datafile(datafile)
+ 			x2 = numarray.array(t_onsets).resize(len(t_onsets))
+ 			y2 = self.maxofunc*numarray.ones(len(t_onsets))
+-			wplot.append(Gnuplot.Data(x2,y2,with='impulses'))
++			wplot.append(Gnuplot.Data(x2,y2,with_='impulses'))
+ 			
+ 			tol = 0.050 
+ 
diff --git a/audio/aubio/patches/patch-python_aubio_task_pitch.py b/audio/aubio/patches/patch-python_aubio_task_pitch.py
new file mode 100644
index 00000000000..d2f671af961
--- /dev/null
+++ b/audio/aubio/patches/patch-python_aubio_task_pitch.py
@@ -0,0 +1,24 @@
+$NetBSD: patch-python_aubio_task_pitch.py,v 1.1.1.1 2011/10/06 11:45:48 ryoon Exp $
+
+* After 2.6, with is reserved and must not be used as variable.
+
+--- python/aubio/task/pitch.py.orig	2006-07-26 23:27:19.000000000 +0000
++++ python/aubio/task/pitch.py
+@@ -156,7 +156,7 @@ class taskpitch(task):
+ 
+ 		time = [ (i+self.params.pitchdelay)*self.params.step for i in range(len(pitch)) ]
+ 		pitch = [aubio_freqtomidi(i) for i in pitch]
+-		oplots.append(Gnuplot.Data(time,pitch,with='lines',
++		oplots.append(Gnuplot.Data(time,pitch,with_='lines',
+ 			title=self.params.pitchmode))
+ 		titles.append(self.params.pitchmode)
+ 
+@@ -170,7 +170,7 @@ class taskpitch(task):
+ 		if truth:
+ 			timet,pitcht = self.gettruth()
+ 			if timet and pitcht:
+-				oplots = [Gnuplot.Data(timet,pitcht,with='lines',
++				oplots = [Gnuplot.Data(timet,pitcht,with_='lines',
+ 					title='ground truth')] + oplots
+ 
+ 		g = gnuplot_create(outplot=outplot, extension=extension)