update to hydrogen 0.9.5.1. slightly clean up the netbsd port.

2011-02-19 the hydrogen team <hydrogen-devel@lists.sourceforge.net>
        * Release 0.9.5.1
        * Compatible with linux 3.0 kernels
        * Compiles now with gcc 4.7
        * Added greek translation
        * Updated czech translation
        * Few small bugfixes

2011-03-15 the hydrogen team <hydrogen-devel@lists.sourceforge.net>

        * Release 0.9.5
        * load playlists at startup
        * midi-learn works now with shift-click on some gui elements
        * multi-track export
        * LADI support
        * maximum number of bars is now configurable
        * added czech translation
        * fixed serveral export song failures
        * added ogg, flac, aiff export support
        * added some new commandline parameter for no_gui version
        * added rubberband-cli support
        * several improvements on sample editor
        * added NO_GUI_SUPPORT to build a version of hydrogen without a gui
        * added support for app bundles on OSX
        * non destructive sample editor
        * piano roll editor
        * instrument midi out
        * destructive midi recording
        * support for midi "note off" messages
        * virtual patterns
        * time line to change song tempo and add tags
        * director
        * and at least several small changes
        * Xml handling is now done by QtXml instead of TinyXML
        * improved support for non-ascii filenames / strings
        * remove direct dependencies to libflac

4 files changed, 44 insertions, 36 deletions

diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 9a614f22c11..10d9d227988 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.32 2012/10/08 23:01:11 adam Exp $
+# $NetBSD: Makefile,v 1.33 2012/11/13 23:26:23 mrg Exp $
 
-DISTNAME=	hydrogen-0.9.4.2
-PKGREVISION=	9
+DISTNAME=	hydrogen-0.9.5.1
+#PKGREVISION=	9
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hydrogen/}
 
-MAINTAINER=	chris.wareham@btinternet.com
+MAINTAINER=	mrg@eterna.com.au
 HOMEPAGE=	http://www.hydrogen-music.org/
 COMMENT=	Real time drum machine/sequencer
 
diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo
index 6d71609ac45..6d85e7ff58b 100644
--- a/audio/hydrogen/distinfo
+++ b/audio/hydrogen/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2012/06/28 07:32:36 sbd Exp $
+$NetBSD: distinfo,v 1.6 2012/11/13 23:26:23 mrg Exp $
 
-SHA1 (hydrogen-0.9.4.2.tar.gz) = 7b20e40e90c4c1abdda8900109a5983a314719a9
-RMD160 (hydrogen-0.9.4.2.tar.gz) = cebf63fb851aa61f149fee75145e59a091cba551
-Size (hydrogen-0.9.4.2.tar.gz) = 3860898 bytes
-SHA1 (patch-aa) = 7717b25ab65d90d5f185034fc76d1b80a19daf20
-SHA1 (patch-ab) = 41cfbf8b72661381e1ecf04cec09e85e0c7e3288
+SHA1 (hydrogen-0.9.5.1.tar.gz) = f389fdb853c77718c45141f6a895c06acdcbd2be
+RMD160 (hydrogen-0.9.5.1.tar.gz) = 2bf6280a07e4e45643815376ad94b35146ace772
+Size (hydrogen-0.9.5.1.tar.gz) = 5515314 bytes
+SHA1 (patch-aa) = fe11208e3d9ce3538d2fc7c340ae41ede275a34b
+SHA1 (patch-ab) = b532ec96fbc9ff796f9b1facd7ba38a1d9c9361f
diff --git a/audio/hydrogen/patches/patch-aa b/audio/hydrogen/patches/patch-aa
index 89043cf8420..d8a61e12350 100644
--- a/audio/hydrogen/patches/patch-aa
+++ b/audio/hydrogen/patches/patch-aa
@@ -1,45 +1,56 @@
-$NetBSD: patch-aa,v 1.3 2012/06/28 07:32:37 sbd Exp $
+$NetBSD: patch-aa,v 1.4 2012/11/13 23:26:23 mrg Exp $
 
-diff -ru Sconstruct.orig Sconstruct
---- Sconstruct.orig	2010-09-19 15:36:25.000000000 +0000
-+++ Sconstruct
-@@ -47,7 +47,7 @@ def get_platform_flags( opts ):
+--- Sconstruct.orig	2012-02-19 13:54:05.000000000 -0800
++++ Sconstruct	2012-11-13 13:39:48.000000000 -0800
+@@ -47,7 +47,7 @@
  
  	env = Environment( options = opts )
  
--	if sys.platform == "linux2" or sys.platform == "darwin":
-+	if sys.platform == "linux2" or sys.platform == "darwin" or sys.platform[:6] == "netbsd":
+-	if sys.platform == "linux2" or sys.platform == "linux3" or sys.platform == "darwin":
++	if sys.platform == "linux2" or sys.platform == "linux3" or sys.platform == "darwin" or sys.platform[:6] == "netbsd":
  		if str(env['debug']) == "1":
  			cppflags += ['-Wall',  '-g2', '-ggdb', '-O0'] 
  			for flag in env["optflags"].split(" "):
-@@ -73,6 +73,11 @@ def get_platform_flags( opts ):
+@@ -75,6 +75,12 @@
+ 		    if str(env['bundle']) == "1": cppflags.append('-DBUNDLE_SUPPORT')
  
  		cppflags.append('-DLADSPA_SUPPORT')
- 		
++
 +		includes.append( env['prefix'] + "/include" )
 +		ldflags.append( "-L" + env['prefix'] + "/lib" )
 +		ldflags.append( "-Wl,-R," + env['prefix'] + "/lib" )
 +		# XXX: this should go in py4.py but i'm not sure where
 +		ldflags.append( "-Wl,-R," + env['prefix'] + "/qt4/lib" )
+ 		
  
- 
- 	if str(env['libarchive']) == "1": cppflags.append('-DLIBARCHIVE_SUPPORT')
-@@ -87,6 +92,9 @@ def get_platform_flags( opts ):
- 	if sys.platform == 'linux2':
+ 	if str(env['gui']) == "0": cppflags.append('-DNO_GUI_SUPPORT')
+@@ -96,6 +102,10 @@
  		ldflags.append('-lasound')
+ 	#	ldflags.append('-lrubberband')
  
 +	elif sys.platform[:6] == 'netbsd':
++		cppflags.append('-pthread')
 +		ldflags.append('-lossaudio')
 +
  	elif sys.platform == "win32":
  		includes.append( '3rdparty\libsndfile-1_0_17' )
  		includes.append( 'build\pthreads\include' )
-@@ -269,7 +277,7 @@ def get_hydrogen_gui( lib_hydrogen , opt
- 	if str(env['lash']) == "1":
- 	        env.ParseConfig('pkg-config --cflags --libs lash-1.0')
- 
--	if sys.platform == "darwin" or sys.platform == "linux2":
-+	if sys.platform == "darwin" or sys.platform == "linux2" or sys.platform[:6] == "netbsd":
+@@ -283,6 +293,9 @@
  		env.Append( LIBS = ["z"] )
+ 		env.Append( LIBS = ["pthread"] )
  
++	if sys.platform[:6] == "netbsd":
++		env.Append( LIBS = ["z"] )
++
  	if sys.platform == "darwin" and str(env['coreaudio']) == "1":
+ 		env.Append( LINKFLAGS = ['-framework','ApplicationServices'])
+ 		env.Append( LINKFLAGS = ['-framework','AudioUnit'])
+@@ -380,7 +393,7 @@
+ 
+ includes, a , b = get_platform_flags( opts )
+ 
+-env = Environment(options = opts, CPPPATH = includes)
++env = Environment(options = opts, ENV=os.environ, CPPPATH = includes)
+ 
+ 
+ Help(opts.GenerateHelpText(env))
diff --git a/audio/hydrogen/patches/patch-ab b/audio/hydrogen/patches/patch-ab
index 0c5b3c51431..6a60a3133f3 100644
--- a/audio/hydrogen/patches/patch-ab
+++ b/audio/hydrogen/patches/patch-ab
@@ -1,14 +1,11 @@
-$NetBSD: patch-ab,v 1.2 2012/03/26 13:59:40 joerg Exp $
-
-diff -ru qt4.py.orig qt4.py
---- qt4.py.orig	2009-08-08 04:35:13.000000000 -0700
-+++ qt4.py	2011-03-03 22:47:22.000000000 -0800
+--- qt4.py.orig	2012-01-21 04:06:58.000000000 -0800
++++ qt4.py	2012-11-13 02:59:06.000000000 -0800
 @@ -444,7 +444,7 @@
  		try : self.AppendUnique(CPPDEFINES=moduleDefines[module])
  		except: pass
  	debugSuffix = ''
--	if sys.platform == "linux2" and not crosscompiling :
-+	if (sys.platform[:6] == "netbsd" and not crosscompiling) or (sys.platform == "linux2" and not crosscompiling) :
+-	if sys.platform.startswith("linux") and not crosscompiling :
++	if (sys.platform.startswith("linux") and not crosscompiling) or (sys.platform.startswith("netbsd") and not crosscompiling):
  		if debug : debugSuffix = '_debug'
  		for module in modules :
  			if module not in pclessModules : continue