Update to 0.9.5

PR:		ports/156216
Submitted by:	Stas Timokhin (maintainer)

4 files changed, 81 insertions, 13 deletions

diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 9bfed51f42dd..f8c95646d86a 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hydrogen
-PORTVERSION=	0.9.4.2
+PORTVERSION=	0.9.5
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/Hydrogen/${MAJORVERSION}%20Sources
 
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile \
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-MAJORVERSION=	0.9.4
+MAJORVERSION=	0.9.5
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib gui linguist_build moc_build network qt3support rcc_build sql uic_build xml
 USE_SCONS=	yes
diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo
index 1578b84c1ba1..59b971b97790 100644
--- a/audio/hydrogen/distinfo
+++ b/audio/hydrogen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hydrogen-0.9.4.2.tar.gz) = 0be373b5d9b46dcfc111209b29ff7788aa84069fd53ad78b14bdf67d5c70b716
-SIZE (hydrogen-0.9.4.2.tar.gz) = 3860898
+SHA256 (hydrogen-0.9.5.tar.gz) = 963c73ef911ec9e7589e502d17df3b794dd027d7e99a36b5115a0bb51389d9c3
+SIZE (hydrogen-0.9.5.tar.gz) = 5239702
diff --git a/audio/hydrogen/files/patch-Sconstruct b/audio/hydrogen/files/patch-Sconstruct
index d98bc4b12069..624f7de9cc85 100644
--- a/audio/hydrogen/files/patch-Sconstruct
+++ b/audio/hydrogen/files/patch-Sconstruct
@@ -1,5 +1,5 @@
---- Sconstruct.orig	2009-09-08 04:31:13.000000000 +0700
-+++ Sconstruct	2010-07-05 13:55:33.000000000 +0700
+--- Sconstruct.orig	2011-03-15 18:22:35.000000000 +0600
++++ Sconstruct	2011-03-22 16:06:25.000000000 +0600
 @@ -47,7 +47,7 @@
  
  	env = Environment( options = opts )
@@ -9,14 +9,16 @@
  		if str(env['debug']) == "1":
  			cppflags += ['-Wall',  '-g2', '-ggdb', '-O0'] 
  			for flag in env["optflags"].split(" "):
-@@ -84,9 +84,11 @@
- 	if sys.platform == "darwin":
- 		ldflags.append( '-L/opt/local/lib' )
+@@ -91,11 +91,12 @@
+ 		includes.append( '/opt/local/include' )
+ 		includes.append( '/usr/local/include/jack' )
  
--	if sys.platform == 'linux2':
-+	if str(env['alsa']) == "1" and sys.platform > 'freebsd' :
+-	elif sys.platform == 'linux2':
++	elif str(env['alsa']) == "1" and sys.platform > 'freebsd' :
+ 		ldflags.append('-lpthread')
  		ldflags.append('-lasound')
- 
+ 	#	ldflags.append('-lrubberband')
+-
 +	elif sys.platform > 'freebsd' :
 +		print "Alsa disabled; nothing to do"
  	elif sys.platform == "win32":
diff --git a/audio/hydrogen/pkg-plist b/audio/hydrogen/pkg-plist
index b9cb8e25fff2..0715cf16917f 100644
--- a/audio/hydrogen/pkg-plist
+++ b/audio/hydrogen/pkg-plist
@@ -1,6 +1,5 @@
 bin/hydrogen
 share/applications/hydrogen.desktop
-share/pixmaps/h2-icon.svg
 %%DATADIR%%/data/DefaultSong.h2song
 %%DATADIR%%/data/click.wav
 %%DATADIR%%/data/demo_songs/GM_kit_Diddley.h2song
@@ -14,17 +13,33 @@ share/pixmaps/h2-icon.svg
 %%DATADIR%%/data/doc/README.DOCUMENTATION.txt
 %%DATADIR%%/data/doc/img/AudioEngineInfoDialog.png
 %%DATADIR%%/data/doc/img/CreateNewPattern.png
+%%DATADIR%%/data/doc/img/Director.png
+%%DATADIR%%/data/doc/img/Downloading_SoundLibrary.png
 %%DATADIR%%/data/doc/img/DrumkitExport.png
 %%DATADIR%%/data/doc/img/DrumkitImport.png
 %%DATADIR%%/data/doc/img/DrumkitLoad.png
 %%DATADIR%%/data/doc/img/DrumkitSave.png
+%%DATADIR%%/data/doc/img/FX_send_knobs.png
+%%DATADIR%%/data/doc/img/GUI_Sections.svg
+%%DATADIR%%/data/doc/img/GUI_Sections_0.9.5.png
 %%DATADIR%%/data/doc/img/HearNewNotes.png
+%%DATADIR%%/data/doc/img/Hydrogen_0.9.5_gui.png
+%%DATADIR%%/data/doc/img/InstrumentMapping.png
+%%DATADIR%%/data/doc/img/Instrument_General.png
+%%DATADIR%%/data/doc/img/Instrument_Layers.png
+%%DATADIR%%/data/doc/img/JackTrans_Master.png
+%%DATADIR%%/data/doc/img/LADSPA_FX_Properties.png
+%%DATADIR%%/data/doc/img/MainControls_Rubberband_btn.png
 %%DATADIR%%/data/doc/img/MainModePattern.png
 %%DATADIR%%/data/doc/img/MainModeSong.png
 %%DATADIR%%/data/doc/img/MainPlay.png
 %%DATADIR%%/data/doc/img/MainRecord.png
 %%DATADIR%%/data/doc/img/MainStop.png
 %%DATADIR%%/data/doc/img/MainToolbar.png
+%%DATADIR%%/data/doc/img/MainToolbar_V2.png
+%%DATADIR%%/data/doc/img/MeasureSettings.png
+%%DATADIR%%/data/doc/img/MidiIN_CPU.png
+%%DATADIR%%/data/doc/img/Midi_Actions.png
 %%DATADIR%%/data/doc/img/Mixer.png
 %%DATADIR%%/data/doc/img/MixerDelay.png
 %%DATADIR%%/data/doc/img/MixerFX.png
@@ -41,18 +56,30 @@ share/pixmaps/h2-icon.svg
 %%DATADIR%%/data/doc/img/MixerSolo.png
 %%DATADIR%%/data/doc/img/MovePatternDown.png
 %%DATADIR%%/data/doc/img/MovePatternUp.png
+%%DATADIR%%/data/doc/img/NoteKey.png
+%%DATADIR%%/data/doc/img/NoteOff_NoteLength.png
 %%DATADIR%%/data/doc/img/PatternEditor.png
 %%DATADIR%%/data/doc/img/PatternEditorButtons.png
+%%DATADIR%%/data/doc/img/PatternEditorControls.png
 %%DATADIR%%/data/doc/img/PatternEditorDownUp.png
 %%DATADIR%%/data/doc/img/PatternEditorInstr.png
+%%DATADIR%%/data/doc/img/PatternEditorInstr_V2.png
 %%DATADIR%%/data/doc/img/PatternEditorPattern.png
 %%DATADIR%%/data/doc/img/PatternEditorRecording.png
 %%DATADIR%%/data/doc/img/PatternEditorSizeRes.png
+%%DATADIR%%/data/doc/img/PatternEditor_DrumMode.png
+%%DATADIR%%/data/doc/img/PatternEditor_PianoMode.png
 %%DATADIR%%/data/doc/img/PreferencesAppearance.png
 %%DATADIR%%/data/doc/img/PreferencesAudioSystem.png
+%%DATADIR%%/data/doc/img/PreferencesAudioSystem_V2.png
 %%DATADIR%%/data/doc/img/PreferencesGeneral.png
+%%DATADIR%%/data/doc/img/PreferencesGeneral_V2.png
 %%DATADIR%%/data/doc/img/PreferencesMidiSystem.png
+%%DATADIR%%/data/doc/img/PreferencesMidiSystem_V2.png
+%%DATADIR%%/data/doc/img/Rec_button.png
 %%DATADIR%%/data/doc/img/Res.png
+%%DATADIR%%/data/doc/img/SampleEditor.png
+%%DATADIR%%/data/doc/img/SampleEditor_V5.png
 %%DATADIR%%/data/doc/img/SongEditor.png
 %%DATADIR%%/data/doc/img/SongEditorAddLayer.png
 %%DATADIR%%/data/doc/img/SongEditorButtons.png
@@ -63,11 +90,20 @@ share/pixmaps/h2-icon.svg
 %%DATADIR%%/data/doc/img/SongEditorSelectMode.png
 %%DATADIR%%/data/doc/img/SongLoop.png
 %%DATADIR%%/data/doc/img/SongOperations.png
+%%DATADIR%%/data/doc/img/SoundLibrary.png
+%%DATADIR%%/data/doc/img/Sound_Library_import.png
+%%DATADIR%%/data/doc/img/SoundlibraryHierarchy.svg
+%%DATADIR%%/data/doc/img/SoundlibraryHierarchy_V3.png
+%%DATADIR%%/data/doc/img/SoundlibraryHierarchy_V4.png
 %%DATADIR%%/data/doc/img/Tutorial2.h2song
 %%DATADIR%%/data/doc/img/TutorialEnd.png
 %%DATADIR%%/data/doc/img/TutorialStart.png
+%%DATADIR%%/data/doc/img/Virtual_patterns_menu.png
+%%DATADIR%%/data/doc/img/add_tag.png
+%%DATADIR%%/data/doc/img/add_tempo_change.png
 %%DATADIR%%/data/doc/img/background_BPM.png
 %%DATADIR%%/data/doc/img/background_Control.png
+%%DATADIR%%/data/doc/img/background_Control_V2.png
 %%DATADIR%%/data/doc/img/background_Load.png
 %%DATADIR%%/data/doc/img/background_Mode.png
 %%DATADIR%%/data/doc/img/bg_topPanel.png
@@ -75,6 +111,7 @@ share/pixmaps/h2-icon.svg
 %%DATADIR%%/data/doc/img/btn_clear_off.png
 %%DATADIR%%/data/doc/img/btn_draw.png
 %%DATADIR%%/data/doc/img/btn_edit_on.png
+%%DATADIR%%/data/doc/img/btn_hear.png
 %%DATADIR%%/data/doc/img/btn_hear_on.png
 %%DATADIR%%/data/doc/img/btn_live_on.png
 %%DATADIR%%/data/doc/img/btn_loop_on.png
@@ -99,14 +136,17 @@ share/pixmaps/h2-icon.svg
 %%DATADIR%%/data/doc/img/bypass_on.png
 %%DATADIR%%/data/doc/img/bypass_over.png
 %%DATADIR%%/data/doc/img/cpuload.png
+%%DATADIR%%/data/doc/img/director.png
 %%DATADIR%%/data/doc/img/downBtn_on.png
 %%DATADIR%%/data/doc/img/edit_off.png
+%%DATADIR%%/data/doc/img/fill_clear_pattern.png
 %%DATADIR%%/data/doc/img/hearBtn_on.png
 %%DATADIR%%/data/doc/img/instr_ed0.png
 %%DATADIR%%/data/doc/img/instr_ed1.png
 %%DATADIR%%/data/doc/img/item_selected.png
 %%DATADIR%%/data/doc/img/jack_transport.png
 %%DATADIR%%/data/doc/img/midi_in.png
+%%DATADIR%%/data/doc/img/mixer-instrrack_btn.png
 %%DATADIR%%/data/doc/img/newPatternBtn_on.png
 %%DATADIR%%/data/doc/img/nl/DrumkitExport.png
 %%DATADIR%%/data/doc/img/nl/DrumkitImport.png
@@ -126,13 +166,17 @@ share/pixmaps/h2-icon.svg
 %%DATADIR%%/data/doc/img/nl/SongEditorInsertMode.png
 %%DATADIR%%/data/doc/img/nl/SongEditorSelectMode.png
 %%DATADIR%%/data/doc/img/nl/SongEditorSelectModeCopy.png
+%%DATADIR%%/data/doc/img/pattern_properties.png
 %%DATADIR%%/data/doc/img/quantBtn_off.png
 %%DATADIR%%/data/doc/img/quantBtn_on.png
 %%DATADIR%%/data/doc/img/recBtn_on.png
+%%DATADIR%%/data/doc/img/screenshot-director.png
 %%DATADIR%%/data/doc/img/showFX_on.png
 %%DATADIR%%/data/doc/img/showPeaks_on.png
 %%DATADIR%%/data/doc/img/songFuncBtn_on.png
+%%DATADIR%%/data/doc/img/tag_bar.png
 %%DATADIR%%/data/doc/img/tastiera.png
+%%DATADIR%%/data/doc/img/tempo_bar.png
 %%DATADIR%%/data/doc/img/upBtn_on.png
 %%DATADIR%%/data/doc/img_tutorial/Bridge1_4th.png
 %%DATADIR%%/data/doc/img_tutorial/Bridge3_3a_hh.png
@@ -208,7 +252,10 @@ share/pixmaps/h2-icon.svg
 %%DATADIR%%/data/drumkits/TR808EmulationKit/drumkit.xml
 %%DATADIR%%/data/emptySample.wav
 %%DATADIR%%/data/hydrogen.default.conf
+%%DATADIR%%/data/i18n/hydrogen.ca.qm
 %%DATADIR%%/data/i18n/hydrogen.ca.ts
+%%DATADIR%%/data/i18n/hydrogen.cs.qm
+%%DATADIR%%/data/i18n/hydrogen.cs.ts
 %%DATADIR%%/data/i18n/hydrogen.de.qm
 %%DATADIR%%/data/i18n/hydrogen.de.ts
 %%DATADIR%%/data/i18n/hydrogen.es.qm
@@ -262,11 +309,15 @@ share/pixmaps/h2-icon.svg
 %%DATADIR%%/data/img/gray/instrumentEditor/deleteLayer_off.png
 %%DATADIR%%/data/img/gray/instrumentEditor/deleteLayer_on.png
 %%DATADIR%%/data/img/gray/instrumentEditor/deleteLayer_over.png
+%%DATADIR%%/data/img/gray/instrumentEditor/editLayer_off.png
+%%DATADIR%%/data/img/gray/instrumentEditor/editLayer_on.png
+%%DATADIR%%/data/img/gray/instrumentEditor/editLayer_over.png
 %%DATADIR%%/data/img/gray/instrumentEditor/instrumentTab.png
 %%DATADIR%%/data/img/gray/instrumentEditor/instrumentTab_top.png
 %%DATADIR%%/data/img/gray/instrumentEditor/instrument_show_off.png
 %%DATADIR%%/data/img/gray/instrumentEditor/instrument_show_on.png
 %%DATADIR%%/data/img/gray/instrumentEditor/layerTab.png
+%%DATADIR%%/data/img/gray/instrumentEditor/layerTabnew.png
 %%DATADIR%%/data/img/gray/instrumentEditor/library_show_off.png
 %%DATADIR%%/data/img/gray/instrumentEditor/library_show_on.png
 %%DATADIR%%/data/img/gray/instrumentEditor/loadLayer_off.png
@@ -394,6 +445,12 @@ share/pixmaps/h2-icon.svg
 %%DATADIR%%/data/img/gray/playerControlPanel/btn_play_off.png
 %%DATADIR%%/data/img/gray/playerControlPanel/btn_play_on.png
 %%DATADIR%%/data/img/gray/playerControlPanel/btn_play_over.png
+%%DATADIR%%/data/img/gray/playerControlPanel/btn_rec_off.png
+%%DATADIR%%/data/img/gray/playerControlPanel/btn_rec_on.png
+%%DATADIR%%/data/img/gray/playerControlPanel/btn_rec_over.png
+%%DATADIR%%/data/img/gray/playerControlPanel/btn_recdel_off.png
+%%DATADIR%%/data/img/gray/playerControlPanel/btn_recdel_on.png
+%%DATADIR%%/data/img/gray/playerControlPanel/btn_recdel_over.png
 %%DATADIR%%/data/img/gray/playerControlPanel/btn_rwd_off.png
 %%DATADIR%%/data/img/gray/playerControlPanel/btn_rwd_on.png
 %%DATADIR%%/data/img/gray/playerControlPanel/btn_rwd_over.png
@@ -437,6 +494,8 @@ share/pixmaps/h2-icon.svg
 %%DATADIR%%/data/img/gray/playerControlPanel/midiActivity_on.png
 %%DATADIR%%/data/img/gray/playerControlPanel/onoff.png
 %%DATADIR%%/data/img/gray/playerControlPanel/playlist_background_Control.png
+%%DATADIR%%/data/img/gray/playerControlPanel/rubber_off.png
+%%DATADIR%%/data/img/gray/playerControlPanel/rubber_on.png
 %%DATADIR%%/data/img/gray/playerControlPanel/statusLED_off.png
 %%DATADIR%%/data/img/gray/playerControlPanel/statusLED_on.png
 %%DATADIR%%/data/img/gray/preferencesDialog/rec.png
@@ -444,6 +503,9 @@ share/pixmaps/h2-icon.svg
 %%DATADIR%%/data/img/gray/skin_btn_on.png
 %%DATADIR%%/data/img/gray/skin_btn_over.png
 %%DATADIR%%/data/img/gray/songEditor/bg_topPanel.png
+%%DATADIR%%/data/img/gray/songEditor/btn_bpm_off.png
+%%DATADIR%%/data/img/gray/songEditor/btn_bpm_on.png
+%%DATADIR%%/data/img/gray/songEditor/btn_bpm_over.png
 %%DATADIR%%/data/img/gray/songEditor/btn_clear_off.png
 %%DATADIR%%/data/img/gray/songEditor/btn_clear_on.png
 %%DATADIR%%/data/img/gray/songEditor/btn_clear_over.png
@@ -479,6 +541,10 @@ share/pixmaps/h2-icon.svg
 %%DATADIR%%/data/img/gray/splash/splash.png
 %%DATADIR%%/data/img/gray/waveDisplay/background.png
 %%DATADIR%%/data/img/gray/waveDisplay/bgsamplewavedisplay.png
+%%DATADIR%%/data/img/gray/waveDisplay/detailsamplewavedisplay.png
+%%DATADIR%%/data/img/gray/waveDisplay/mainsamplewavedisplay.png
+%%DATADIR%%/data/img/gray/waveDisplay/targetsamplewavedisplay.png
+share/pixmaps/h2-icon.svg
 @dirrm %%DATADIR%%/data/img/gray/waveDisplay
 @dirrm %%DATADIR%%/data/img/gray/splash
 @dirrm %%DATADIR%%/data/img/gray/songEditor