update to hydrogen 0.9.4.2. changes include:

- more jack support (not enabled)
- qt3 -> qt4 update (including a major UI update)
- support for more instruments
- better midi support
- many bug fixes
- multi-layer instrument support
- multiple concurrent patterns
- FLAC support
- autosave support
- drumkit manager
- much better pattern support/ui/editing

thanks to wiz@ for help getting this right.

5 files changed, 395 insertions, 119 deletions

diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 0a9cdae84d5..857961b084a 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2011/01/13 13:37:03 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2011/04/28 10:27:38 mrg Exp $
 
-DISTNAME=	hydrogen-0.8.0
-PKGREVISION=	10
+DISTNAME=	hydrogen-0.9.4.2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hydrogen/}
 
@@ -13,23 +12,27 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake
-GNU_CONFIGURE=	yes
+USE_TOOLS+=	pkg-config
 
-CONFIGURE_ARGS+=	--disable-alsa-seq
-CONFIGURE_ARGS+=	--disable-jack-support
+BUILD_DEPENDS+=		scons>=0.98:../../devel/scons
+BUILD_DEPENDS+=		subversion-base>=1.0:../../devel/subversion-base
 
-.include "../../mk/bsd.prefs.mk"
+MAKE_ENV+=	QTDIR=${PREFIX}/qt4 PATH=$$PATH:${PREFIX}/qt4/bin
+SCONS_ARGS=	libarchive=1 jack=0 lrdf=0 alsa=0 QTDIR=/usr/pkg/qt4
+
+do-build:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons DESTDIR=${DESTDIR} prefix=${PREFIX} ${SCONS_ARGS}
 
-.if ${X11_TYPE} != "native" || exists(${X11BASE}/include/X11/extensions/Xinerama.h)
-.include "../../x11/libXinerama/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-xinerama
-.endif
+do-install:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons DESTDIR=${DESTDIR} prefix=${PREFIX} ${SCONS_ARGS} install
+
+.include "../../mk/bsd.prefs.mk"
 
-.include "../../audio/libhydrogen/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/hydrogen/PLIST b/audio/hydrogen/PLIST
index c0afb0ba6b5..e8b8c04e4a9 100644
--- a/audio/hydrogen/PLIST
+++ b/audio/hydrogen/PLIST
@@ -1,101 +1,320 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:32:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/04/28 10:27:38 mrg Exp $
 bin/hydrogen
-man/man1/hydrogen.1
-share/hydrogen/img/about/aboutLogo.png
-share/hydrogen/img/icon16.png
-share/hydrogen/img/icon32.png
-share/hydrogen/img/mdiBackground.png
-share/hydrogen/img/mixerPanel/btn_load_off.png
-share/hydrogen/img/mixerPanel/btn_load_over.png
-share/hydrogen/img/mixerPanel/btn_mute_off.png
-share/hydrogen/img/mixerPanel/btn_mute_on.png
-share/hydrogen/img/mixerPanel/btn_mute_over.png
-share/hydrogen/img/mixerPanel/btn_on_off.png
-share/hydrogen/img/mixerPanel/btn_on_on.png
-share/hydrogen/img/mixerPanel/btn_on_over.png
-share/hydrogen/img/mixerPanel/btn_play_off.png
-share/hydrogen/img/mixerPanel/btn_play_on.png
-share/hydrogen/img/mixerPanel/btn_play_over.png
-share/hydrogen/img/mixerPanel/btn_solo_off.png
-share/hydrogen/img/mixerPanel/btn_solo_on.png
-share/hydrogen/img/mixerPanel/btn_solo_over.png
-share/hydrogen/img/mixerPanel/fader_background.png
-share/hydrogen/img/mixerPanel/fader_knob.png
-share/hydrogen/img/mixerPanel/fader_leds.png
-share/hydrogen/img/mixerPanel/masterMixerline_background.png
-share/hydrogen/img/mixerPanel/mixer_background.png
-share/hydrogen/img/mixerPanel/mixerline_background.png
-share/hydrogen/img/mixerPanel/mixerline_label_background.png
-share/hydrogen/img/mixerPanel/panFader_background.png
-share/hydrogen/img/patternEditor/editor_background.png
-share/hydrogen/img/patternEditor/hearBtn_off.png
-share/hydrogen/img/patternEditor/hearBtn_on.png
-share/hydrogen/img/patternEditor/hearBtn_over.png
-share/hydrogen/img/patternEditor/patternEditor_background.png
-share/hydrogen/img/patternEditor/tickPosition.png
-share/hydrogen/img/playerControlPanel/background.png
-share/hydrogen/img/playerControlPanel/btn_live_off.png
-share/hydrogen/img/playerControlPanel/btn_live_on.png
-share/hydrogen/img/playerControlPanel/btn_live_over.png
-share/hydrogen/img/playerControlPanel/btn_loop_off.png
-share/hydrogen/img/playerControlPanel/btn_loop_on.png
-share/hydrogen/img/playerControlPanel/btn_loop_over.png
-share/hydrogen/img/playerControlPanel/btn_play_off.png
-share/hydrogen/img/playerControlPanel/btn_play_on.png
-share/hydrogen/img/playerControlPanel/btn_play_over.png
-share/hydrogen/img/playerControlPanel/btn_song_off.png
-share/hydrogen/img/playerControlPanel/btn_song_on.png
-share/hydrogen/img/playerControlPanel/btn_song_over.png
-share/hydrogen/img/playerControlPanel/btn_stop_off.png
-share/hydrogen/img/playerControlPanel/btn_stop_on.png
-share/hydrogen/img/playerControlPanel/btn_stop_over.png
-share/hydrogen/img/songEditor/downBtn_off.png
-share/hydrogen/img/songEditor/downBtn_on.png
-share/hydrogen/img/songEditor/downBtn_over.png
-share/hydrogen/img/songEditor/newPatternBtn_off.png
-share/hydrogen/img/songEditor/newPatternBtn_on.png
-share/hydrogen/img/songEditor/newPatternBtn_over.png
-share/hydrogen/img/songEditor/patternIcon.png
-share/hydrogen/img/songEditor/patternListIcon.png
-share/hydrogen/img/songEditor/patternSequenceIcon.png
-share/hydrogen/img/songEditor/playingIcon.png
-share/hydrogen/img/songEditor/songFuncBtn_off.png
-share/hydrogen/img/songEditor/songFuncBtn_on.png
-share/hydrogen/img/songEditor/songFuncBtn_over.png
-share/hydrogen/img/songEditor/songIcon.png
-share/hydrogen/img/songEditor/upBtn_off.png
-share/hydrogen/img/songEditor/upBtn_on.png
-share/hydrogen/img/songEditor/upBtn_over.png
-share/hydrogen/img/splash/splash.png
-share/hydrogen/manual/img/AudioEngineInfoDialog.png
-share/hydrogen/manual/img/CreateNewPattern.png
-share/hydrogen/manual/img/DrumkitExport.png
-share/hydrogen/manual/img/DrumkitImport.png
-share/hydrogen/manual/img/DrumkitLoad.png
-share/hydrogen/manual/img/DrumkitSave.png
-share/hydrogen/manual/img/MainModeLive.png
-share/hydrogen/manual/img/MainModeSong.png
-share/hydrogen/manual/img/MainPlay.png
-share/hydrogen/manual/img/MainRecord.png
-share/hydrogen/manual/img/MainStop.png
-share/hydrogen/manual/img/Mixer.png
-share/hydrogen/manual/img/MixerDelay.png
-share/hydrogen/manual/img/MixerLoadSample.png
-share/hydrogen/manual/img/MixerMute.png
-share/hydrogen/manual/img/MixerPan.png
-share/hydrogen/manual/img/MixerPlayTest.png
-share/hydrogen/manual/img/MixerSolo.png
-share/hydrogen/manual/img/MovePatternDown.png
-share/hydrogen/manual/img/MovePatternUp.png
-share/hydrogen/manual/img/PatternEditor.png
-share/hydrogen/manual/img/PreferencesAppearance.png
-share/hydrogen/manual/img/PreferencesAudioSystem.png
-share/hydrogen/manual/img/PreferencesMidiSystem.png
-share/hydrogen/manual/img/SongEditor.png
-share/hydrogen/manual/img/SongLoop.png
-share/hydrogen/manual/img/SongOperations.png
-share/hydrogen/manual/img/TutorialEnd.png
-share/hydrogen/manual/img/TutorialStart.png
-share/hydrogen/manual/manual.html
-share/hydrogen/manual/manual_en.html
-share/hydrogen/manual/manual_it.html
+share/applications/hydrogen.desktop
+share/hydrogen/data/DefaultSong.h2song
+share/hydrogen/data/click.wav
+share/hydrogen/data/demo_songs/GM_kit_Diddley.h2song
+share/hydrogen/data/demo_songs/GM_kit_Jazzy.h2song
+share/hydrogen/data/demo_songs/GM_kit_demo1.h2song
+share/hydrogen/data/demo_songs/GM_kit_demo2.h2song
+share/hydrogen/data/demo_songs/GM_kit_demo3.h2song
+share/hydrogen/data/demo_songs/TR808kit-demo.h2song
+share/hydrogen/data/demo_songs/tutorial_georgyporgy.h2song
+share/hydrogen/data/drumkits/GMkit/clap_Dry_c.flac
+share/hydrogen/data/drumkits/GMkit/cra_Jazz.flac
+share/hydrogen/data/drumkits/GMkit/cra_Rock_a.flac
+share/hydrogen/data/drumkits/GMkit/cym_Jazz.flac
+share/hydrogen/data/drumkits/GMkit/cym_Rock_b.flac
+share/hydrogen/data/drumkits/GMkit/drumkit.xml
+share/hydrogen/data/drumkits/GMkit/emptySample.flac
+share/hydrogen/data/drumkits/GMkit/hhc_Dry_a.flac
+share/hydrogen/data/drumkits/GMkit/hhc_Rock_b.flac
+share/hydrogen/data/drumkits/GMkit/hhp_Dry_a.flac
+share/hydrogen/data/drumkits/GMkit/kick_Dry_b.flac
+share/hydrogen/data/drumkits/GMkit/misc_Cowbell.flac
+share/hydrogen/data/drumkits/GMkit/sn_Jazz_c.flac
+share/hydrogen/data/drumkits/GMkit/sn_Wet_b.flac
+share/hydrogen/data/drumkits/GMkit/stick_Woody.flac
+share/hydrogen/data/drumkits/GMkit/tom_Rock_hi.flac
+share/hydrogen/data/drumkits/GMkit/tom_Rock_lo.flac
+share/hydrogen/data/drumkits/GMkit/tom_Rock_mid.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Clap.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Clave.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Conga.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Cowbell.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Cymbal.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Hat_Closed.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Hat_Open.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Hat_Pedal.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Kick_Long.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Kick_Short.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Shaker.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Snare_1.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Snare_2.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Tom_Hi.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Tom_Low.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/808_Tom_Mid.flac
+share/hydrogen/data/drumkits/TR808EmulationKit/drumkit.xml
+share/hydrogen/data/emptySample.wav
+share/hydrogen/data/hydrogen.default.conf
+share/hydrogen/data/i18n/hydrogen.ca.ts
+share/hydrogen/data/i18n/hydrogen.de.qm
+share/hydrogen/data/i18n/hydrogen.de.ts
+share/hydrogen/data/i18n/hydrogen.es.qm
+share/hydrogen/data/i18n/hydrogen.es.ts
+share/hydrogen/data/i18n/hydrogen.fr.qm
+share/hydrogen/data/i18n/hydrogen.fr.ts
+share/hydrogen/data/i18n/hydrogen.hr.qm
+share/hydrogen/data/i18n/hydrogen.hr.ts
+share/hydrogen/data/i18n/hydrogen.hu_HU.qm
+share/hydrogen/data/i18n/hydrogen.hu_HU.ts
+share/hydrogen/data/i18n/hydrogen.it.qm
+share/hydrogen/data/i18n/hydrogen.it.ts
+share/hydrogen/data/i18n/hydrogen.ja.qm
+share/hydrogen/data/i18n/hydrogen.ja.ts
+share/hydrogen/data/i18n/hydrogen.nl.qm
+share/hydrogen/data/i18n/hydrogen.nl.ts
+share/hydrogen/data/i18n/hydrogen.pl.qm
+share/hydrogen/data/i18n/hydrogen.pl.ts
+share/hydrogen/data/i18n/hydrogen.pt_BR.qm
+share/hydrogen/data/i18n/hydrogen.pt_BR.ts
+share/hydrogen/data/i18n/hydrogen.ru.qm
+share/hydrogen/data/i18n/hydrogen.ru.ts
+share/hydrogen/data/i18n/hydrogen.sv.qm
+share/hydrogen/data/i18n/hydrogen.sv.ts
+share/hydrogen/data/img/gray/about/aboutLogo.png
+share/hydrogen/data/img/gray/audiFileBrowser/go-home.png
+share/hydrogen/data/img/gray/audiFileBrowser/go-up.png
+share/hydrogen/data/img/gray/audiFileBrowser/player_play.png
+share/hydrogen/data/img/gray/audiFileBrowser/player_stop.png
+share/hydrogen/data/img/gray/drumkitManager/background_options.png
+share/hydrogen/data/img/gray/drumkitManager/btn_export_off.png
+share/hydrogen/data/img/gray/drumkitManager/btn_export_on.png
+share/hydrogen/data/img/gray/drumkitManager/btn_export_over.png
+share/hydrogen/data/img/gray/drumkitManager/btn_import_off.png
+share/hydrogen/data/img/gray/drumkitManager/btn_import_on.png
+share/hydrogen/data/img/gray/drumkitManager/btn_import_over.png
+share/hydrogen/data/img/gray/drumkitManager/btn_new_off.png
+share/hydrogen/data/img/gray/drumkitManager/btn_new_on.png
+share/hydrogen/data/img/gray/drumkitManager/btn_new_over.png
+share/hydrogen/data/img/gray/drumkitManager/btn_save_off.png
+share/hydrogen/data/img/gray/drumkitManager/btn_save_on.png
+share/hydrogen/data/img/gray/drumkitManager/btn_save_over.png
+share/hydrogen/data/img/gray/icon16.png
+share/hydrogen/data/img/gray/icon24.png
+share/hydrogen/data/img/gray/icon32.png
+share/hydrogen/data/img/gray/icon48.png
+share/hydrogen/data/img/gray/icon64.png
+share/hydrogen/data/img/gray/instrumentEditor/bypass_off.png
+share/hydrogen/data/img/gray/instrumentEditor/bypass_on.png
+share/hydrogen/data/img/gray/instrumentEditor/bypass_over.png
+share/hydrogen/data/img/gray/instrumentEditor/deleteLayer_off.png
+share/hydrogen/data/img/gray/instrumentEditor/deleteLayer_on.png
+share/hydrogen/data/img/gray/instrumentEditor/deleteLayer_over.png
+share/hydrogen/data/img/gray/instrumentEditor/instrumentTab.png
+share/hydrogen/data/img/gray/instrumentEditor/instrumentTab_top.png
+share/hydrogen/data/img/gray/instrumentEditor/instrument_show_off.png
+share/hydrogen/data/img/gray/instrumentEditor/instrument_show_on.png
+share/hydrogen/data/img/gray/instrumentEditor/layerTab.png
+share/hydrogen/data/img/gray/instrumentEditor/library_show_off.png
+share/hydrogen/data/img/gray/instrumentEditor/library_show_on.png
+share/hydrogen/data/img/gray/instrumentEditor/loadLayer_off.png
+share/hydrogen/data/img/gray/instrumentEditor/loadLayer_on.png
+share/hydrogen/data/img/gray/instrumentEditor/loadLayer_over.png
+share/hydrogen/data/img/gray/instrumentEditor/speaker.png
+share/hydrogen/data/img/gray/lcd/LCDLargeFontSet.png
+share/hydrogen/data/img/gray/lcd/LCDLargeGrayFontSet.png
+share/hydrogen/data/img/gray/lcd/LCDSmallBlueFontSet.png
+share/hydrogen/data/img/gray/lcd/LCDSmallGrayFontSet.png
+share/hydrogen/data/img/gray/lcd/LCDSmallRedFontSet.png
+share/hydrogen/data/img/gray/lcd/LCDSpinBox_down_off.png
+share/hydrogen/data/img/gray/lcd/LCDSpinBox_down_on.png
+share/hydrogen/data/img/gray/lcd/LCDSpinBox_down_over.png
+share/hydrogen/data/img/gray/lcd/LCDSpinBox_up_off.png
+share/hydrogen/data/img/gray/lcd/LCDSpinBox_up_on.png
+share/hydrogen/data/img/gray/lcd/LCDSpinBox_up_over.png
+share/hydrogen/data/img/gray/mdiBackground.png
+share/hydrogen/data/img/gray/mixerPanel/background_FX.png
+share/hydrogen/data/img/gray/mixerPanel/btn_edit_off.png
+share/hydrogen/data/img/gray/mixerPanel/btn_edit_on.png
+share/hydrogen/data/img/gray/mixerPanel/btn_edit_over.png
+share/hydrogen/data/img/gray/mixerPanel/btn_load_off.png
+share/hydrogen/data/img/gray/mixerPanel/btn_load_over.png
+share/hydrogen/data/img/gray/mixerPanel/btn_mute_off.png
+share/hydrogen/data/img/gray/mixerPanel/btn_mute_on.png
+share/hydrogen/data/img/gray/mixerPanel/btn_mute_over.png
+share/hydrogen/data/img/gray/mixerPanel/btn_on_off.png
+share/hydrogen/data/img/gray/mixerPanel/btn_on_on.png
+share/hydrogen/data/img/gray/mixerPanel/btn_on_over.png
+share/hydrogen/data/img/gray/mixerPanel/btn_play_off.png
+share/hydrogen/data/img/gray/mixerPanel/btn_play_on.png
+share/hydrogen/data/img/gray/mixerPanel/btn_play_over.png
+share/hydrogen/data/img/gray/mixerPanel/btn_solo_off.png
+share/hydrogen/data/img/gray/mixerPanel/btn_solo_on.png
+share/hydrogen/data/img/gray/mixerPanel/btn_solo_over.png
+share/hydrogen/data/img/gray/mixerPanel/bypass_off.png
+share/hydrogen/data/img/gray/mixerPanel/bypass_on.png
+share/hydrogen/data/img/gray/mixerPanel/bypass_over.png
+share/hydrogen/data/img/gray/mixerPanel/edit_off.png
+share/hydrogen/data/img/gray/mixerPanel/edit_on.png
+share/hydrogen/data/img/gray/mixerPanel/edit_over.png
+share/hydrogen/data/img/gray/mixerPanel/fader_background.png
+share/hydrogen/data/img/gray/mixerPanel/fader_knob.png
+share/hydrogen/data/img/gray/mixerPanel/fader_leds.png
+share/hydrogen/data/img/gray/mixerPanel/fxline_background.png
+share/hydrogen/data/img/gray/mixerPanel/knob_images.png
+share/hydrogen/data/img/gray/mixerPanel/led_trigger_off.png
+share/hydrogen/data/img/gray/mixerPanel/led_trigger_on.png
+share/hydrogen/data/img/gray/mixerPanel/masterMixer_background.png
+share/hydrogen/data/img/gray/mixerPanel/masterMixer_leds.png
+share/hydrogen/data/img/gray/mixerPanel/masterMixerline_background.png
+share/hydrogen/data/img/gray/mixerPanel/master_mute_off.png
+share/hydrogen/data/img/gray/mixerPanel/master_mute_on.png
+share/hydrogen/data/img/gray/mixerPanel/master_mute_over.png
+share/hydrogen/data/img/gray/mixerPanel/mixer_background.png
+share/hydrogen/data/img/gray/mixerPanel/mixerline_background.png
+share/hydrogen/data/img/gray/mixerPanel/mixerline_background_on.png
+share/hydrogen/data/img/gray/mixerPanel/mixerline_label_background.png
+share/hydrogen/data/img/gray/mixerPanel/mixerline_text_background.png
+share/hydrogen/data/img/gray/mixerPanel/panFader_background.png
+share/hydrogen/data/img/gray/mixerPanel/rotary_center_images.png
+share/hydrogen/data/img/gray/mixerPanel/rotary_images.png
+share/hydrogen/data/img/gray/mixerPanel/showFX_off.png
+share/hydrogen/data/img/gray/mixerPanel/showFX_on.png
+share/hydrogen/data/img/gray/mixerPanel/showFX_over.png
+share/hydrogen/data/img/gray/mixerPanel/showMixer_off.png
+share/hydrogen/data/img/gray/mixerPanel/showMixer_on.png
+share/hydrogen/data/img/gray/mixerPanel/showMixer_over.png
+share/hydrogen/data/img/gray/mixerPanel/showPeaks_off.png
+share/hydrogen/data/img/gray/mixerPanel/showPeaks_on.png
+share/hydrogen/data/img/gray/mixerPanel/showPeaks_over.png
+share/hydrogen/data/img/gray/patternEditor/background_channel.png
+share/hydrogen/data/img/gray/patternEditor/background_rec-new.png
+share/hydrogen/data/img/gray/patternEditor/background_rec.png
+share/hydrogen/data/img/gray/patternEditor/background_res-new.png
+share/hydrogen/data/img/gray/patternEditor/background_res.png
+share/hydrogen/data/img/gray/patternEditor/background_zoom-new.png
+share/hydrogen/data/img/gray/patternEditor/background_zoom.png
+share/hydrogen/data/img/gray/patternEditor/btn_dropdown_off.png
+share/hydrogen/data/img/gray/patternEditor/btn_dropdown_on.png
+share/hydrogen/data/img/gray/patternEditor/btn_dropdown_over.png
+share/hydrogen/data/img/gray/patternEditor/btn_hear_off.png
+share/hydrogen/data/img/gray/patternEditor/btn_hear_on.png
+share/hydrogen/data/img/gray/patternEditor/btn_mute_off.png
+share/hydrogen/data/img/gray/patternEditor/btn_mute_on.png
+share/hydrogen/data/img/gray/patternEditor/btn_quant_off.png
+share/hydrogen/data/img/gray/patternEditor/btn_quant_on.png
+share/hydrogen/data/img/gray/patternEditor/btn_quant_over.png
+share/hydrogen/data/img/gray/patternEditor/btn_record_off.png
+share/hydrogen/data/img/gray/patternEditor/btn_record_on.png
+share/hydrogen/data/img/gray/patternEditor/btn_record_over.png
+share/hydrogen/data/img/gray/patternEditor/btn_solo_off.png
+share/hydrogen/data/img/gray/patternEditor/btn_solo_on.png
+share/hydrogen/data/img/gray/patternEditor/editor_top.png
+share/hydrogen/data/img/gray/patternEditor/instrument_line.png
+share/hydrogen/data/img/gray/patternEditor/instrument_line_selected.png
+share/hydrogen/data/img/gray/patternEditor/tickPosition.png
+share/hydrogen/data/img/gray/playerControlPanel/background.png
+share/hydrogen/data/img/gray/playerControlPanel/background_BPM.png
+share/hydrogen/data/img/gray/playerControlPanel/background_Control.png
+share/hydrogen/data/img/gray/playerControlPanel/background_Jack.png
+share/hydrogen/data/img/gray/playerControlPanel/background_Mode.png
+share/hydrogen/data/img/gray/playerControlPanel/bbt_off.png
+share/hydrogen/data/img/gray/playerControlPanel/bbt_on.png
+share/hydrogen/data/img/gray/playerControlPanel/bc_off.old.png
+share/hydrogen/data/img/gray/playerControlPanel/bc_off.png
+share/hydrogen/data/img/gray/playerControlPanel/bc_on.old.png
+share/hydrogen/data/img/gray/playerControlPanel/bc_on.png
+share/hydrogen/data/img/gray/playerControlPanel/beatConter_BG.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_ffwd_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_ffwd_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_ffwd_over.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_loop_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_loop_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_loop_over.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_metronome_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_metronome_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_metronome_over.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_mmc_space_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_mmc_space_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_mode_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_mode_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_mode_over.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_play_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_play_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_play_over.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_rwd_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_rwd_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_rwd_over.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_set_play_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_set_play_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showDrumkitManager_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showDrumkitManager_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showDrumkitManager_over.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showInstrumentEditor_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showInstrumentEditor_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showInstrumentEditor_over.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showMixer_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showMixer_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showMixer_over.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showPatternEditor_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showPatternEditor_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showPatternEditor_over.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showSongEditor_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showSongEditor_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_showSongEditor_over.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_stop_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_stop_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_stop_over.png
+share/hydrogen/data/img/gray/playerControlPanel/cpuLoad_back.png
+share/hydrogen/data/img/gray/playerControlPanel/cpuLoad_leds.png
+share/hydrogen/data/img/gray/playerControlPanel/icn_metronome_off.png
+share/hydrogen/data/img/gray/playerControlPanel/icn_metronome_on.png
+share/hydrogen/data/img/gray/playerControlPanel/icn_pause.png
+share/hydrogen/data/img/gray/playerControlPanel/icn_play.png
+share/hydrogen/data/img/gray/playerControlPanel/jackMasterBtn_off.png
+share/hydrogen/data/img/gray/playerControlPanel/jackMasterBtn_on.png
+share/hydrogen/data/img/gray/playerControlPanel/jackMasterBtn_over.png
+share/hydrogen/data/img/gray/playerControlPanel/jackTransportBtn_off.png
+share/hydrogen/data/img/gray/playerControlPanel/jackTransportBtn_on.png
+share/hydrogen/data/img/gray/playerControlPanel/jackTransportBtn_over.png
+share/hydrogen/data/img/gray/playerControlPanel/lcd_background.png
+share/hydrogen/data/img/gray/playerControlPanel/metronome_down.png
+share/hydrogen/data/img/gray/playerControlPanel/metronome_off.png
+share/hydrogen/data/img/gray/playerControlPanel/metronome_up.png
+share/hydrogen/data/img/gray/playerControlPanel/midiActivity_back.png
+share/hydrogen/data/img/gray/playerControlPanel/midiActivity_on.png
+share/hydrogen/data/img/gray/playerControlPanel/onoff.png
+share/hydrogen/data/img/gray/playerControlPanel/playlist_background_Control.png
+share/hydrogen/data/img/gray/playerControlPanel/statusLED_off.png
+share/hydrogen/data/img/gray/playerControlPanel/statusLED_on.png
+share/hydrogen/data/img/gray/preferencesDialog/rec.png
+share/hydrogen/data/img/gray/skin_btn_off.png
+share/hydrogen/data/img/gray/skin_btn_on.png
+share/hydrogen/data/img/gray/skin_btn_over.png
+share/hydrogen/data/img/gray/songEditor/bg_topPanel.png
+share/hydrogen/data/img/gray/songEditor/btn_clear_off.png
+share/hydrogen/data/img/gray/songEditor/btn_clear_on.png
+share/hydrogen/data/img/gray/songEditor/btn_clear_over.png
+share/hydrogen/data/img/gray/songEditor/btn_down_off.png
+share/hydrogen/data/img/gray/songEditor/btn_down_on.png
+share/hydrogen/data/img/gray/songEditor/btn_down_over.png
+share/hydrogen/data/img/gray/songEditor/btn_draw_off.png
+share/hydrogen/data/img/gray/songEditor/btn_draw_on.png
+share/hydrogen/data/img/gray/songEditor/btn_draw_over.png
+share/hydrogen/data/img/gray/songEditor/btn_followPH_off.png
+share/hydrogen/data/img/gray/songEditor/btn_followPH_on.png
+share/hydrogen/data/img/gray/songEditor/btn_followPH_over.png
+share/hydrogen/data/img/gray/songEditor/btn_minus_off.png
+share/hydrogen/data/img/gray/songEditor/btn_minus_on.png
+share/hydrogen/data/img/gray/songEditor/btn_minus_over.png
+share/hydrogen/data/img/gray/songEditor/btn_mode_off.png
+share/hydrogen/data/img/gray/songEditor/btn_mode_on.png
+share/hydrogen/data/img/gray/songEditor/btn_mode_over.png
+share/hydrogen/data/img/gray/songEditor/btn_new_off.png
+share/hydrogen/data/img/gray/songEditor/btn_new_on.png
+share/hydrogen/data/img/gray/songEditor/btn_new_over.png
+share/hydrogen/data/img/gray/songEditor/btn_select_off.png
+share/hydrogen/data/img/gray/songEditor/btn_select_on.png
+share/hydrogen/data/img/gray/songEditor/btn_select_over.png
+share/hydrogen/data/img/gray/songEditor/btn_up_off.png
+share/hydrogen/data/img/gray/songEditor/btn_up_on.png
+share/hydrogen/data/img/gray/songEditor/btn_up_over.png
+share/hydrogen/data/img/gray/songEditor/playingPattern_off.png
+share/hydrogen/data/img/gray/songEditor/playingPattern_on.png
+share/hydrogen/data/img/gray/songEditor/songEditorLabelABG.png
+share/hydrogen/data/img/gray/songEditor/songEditorLabelBG.png
+share/hydrogen/data/img/gray/songEditor/songEditorLabelSBG.png
+share/hydrogen/data/img/gray/splash/splash.png
+share/hydrogen/data/img/gray/waveDisplay/background.png
+share/hydrogen/data/img/gray/waveDisplay/bgsamplewavedisplay.png
diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo
index 4aa2b0e224f..234428a20a3 100644
--- a/audio/hydrogen/distinfo
+++ b/audio/hydrogen/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:46 agc Exp $
+$NetBSD: distinfo,v 1.3 2011/04/28 10:27:38 mrg Exp $
 
-SHA1 (hydrogen-0.8.0.tar.gz) = c3e3b09f661451a313c6d10c4dae76831b9cbf44
-RMD160 (hydrogen-0.8.0.tar.gz) = 5a246b728ca837987f4a5a15d42053d36c3848b1
-Size (hydrogen-0.8.0.tar.gz) = 1578054 bytes
+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) = a1290b71fd9e7db51ca22fcadb29ce53f8a5c10a
+SHA1 (patch-ab) = 080bf2b4250658a17677537f9b542f4ffc9fd7b6
diff --git a/audio/hydrogen/patches/patch-aa b/audio/hydrogen/patches/patch-aa
new file mode 100644
index 00000000000..da4411c9e2d
--- /dev/null
+++ b/audio/hydrogen/patches/patch-aa
@@ -0,0 +1,38 @@
+$NetBSD: patch-aa,v 1.1 2011/04/28 10:27:39 mrg Exp $
+
+diff -ru Sconstruct.orig Sconstruct
+--- Sconstruct.orig	2010-09-19 08:36:25.000000000 -0700
++++ Sconstruct	2011-03-04 17:40:28.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 == "netbsd5":
+ 		if str(env['debug']) == "1":
+ 			cppflags += ['-Wall',  '-g2', '-ggdb', '-O0'] 
+ 			for flag in env["optflags"].split(" "):
+@@ -87,6 +87,14 @@
+ 	if sys.platform == 'linux2':
+ 		ldflags.append('-lasound')
+ 
++	if sys.platform == 'netbsd5':
++		includes.append( env['prefix'] + "/include" )
++		ldflags.append('-lossaudio')
++		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" )
++
+ 	elif sys.platform == "win32":
+ 		includes.append( '3rdparty\libsndfile-1_0_17' )
+ 		includes.append( 'build\pthreads\include' )
+@@ -269,7 +277,7 @@
+ 	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 == "netbsd5":
+ 		env.Append( LIBS = ["z"] )
+ 
+ 	if sys.platform == "darwin" and str(env['coreaudio']) == "1":
diff --git a/audio/hydrogen/patches/patch-ab b/audio/hydrogen/patches/patch-ab
new file mode 100644
index 00000000000..59b9e601c32
--- /dev/null
+++ b/audio/hydrogen/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2011/04/28 10:27:39 mrg 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
+@@ -444,7 +444,7 @@
+ 		try : self.AppendUnique(CPPDEFINES=moduleDefines[module])
+ 		except: pass
+ 	debugSuffix = ''
+-	if sys.platform == "linux2" and not crosscompiling :
++	if (sys.platform == "netbsd5" and not crosscompiling) or (sys.platform == "linux2" and not crosscompiling) :
+ 		if debug : debugSuffix = '_debug'
+ 		for module in modules :
+ 			if module not in pclessModules : continue