Fix build with newer scons and update PLIST. Bump revision.

4 files changed, 98 insertions, 13 deletions

diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 10d9d227988..36f45cc4dc5 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2012/11/13 23:26:23 mrg Exp $
+# $NetBSD: Makefile,v 1.34 2013/01/11 13:23:33 joerg Exp $
 
 DISTNAME=	hydrogen-0.9.5.1
-#PKGREVISION=	9
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hydrogen/}
 
diff --git a/audio/hydrogen/PLIST b/audio/hydrogen/PLIST
index c5444ecd384..c3fe8b32ee9 100644
--- a/audio/hydrogen/PLIST
+++ b/audio/hydrogen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2011/10/14 04:19:00 dholland Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/01/11 13:23:33 joerg Exp $
 bin/hydrogen
 share/applications/hydrogen.desktop
 share/hydrogen/data/DefaultSong.h2song
@@ -14,17 +14,33 @@ share/hydrogen/data/doc/Makefile
 share/hydrogen/data/doc/README.DOCUMENTATION.txt
 share/hydrogen/data/doc/img/AudioEngineInfoDialog.png
 share/hydrogen/data/doc/img/CreateNewPattern.png
+share/hydrogen/data/doc/img/Director.png
+share/hydrogen/data/doc/img/Downloading_SoundLibrary.png
 share/hydrogen/data/doc/img/DrumkitExport.png
 share/hydrogen/data/doc/img/DrumkitImport.png
 share/hydrogen/data/doc/img/DrumkitLoad.png
 share/hydrogen/data/doc/img/DrumkitSave.png
+share/hydrogen/data/doc/img/FX_send_knobs.png
+share/hydrogen/data/doc/img/GUI_Sections.svg
+share/hydrogen/data/doc/img/GUI_Sections_0.9.5.png
 share/hydrogen/data/doc/img/HearNewNotes.png
+share/hydrogen/data/doc/img/Hydrogen_0.9.5_gui.png
+share/hydrogen/data/doc/img/InstrumentMapping.png
+share/hydrogen/data/doc/img/Instrument_General.png
+share/hydrogen/data/doc/img/Instrument_Layers.png
+share/hydrogen/data/doc/img/JackTrans_Master.png
+share/hydrogen/data/doc/img/LADSPA_FX_Properties.png
+share/hydrogen/data/doc/img/MainControls_Rubberband_btn.png
 share/hydrogen/data/doc/img/MainModePattern.png
 share/hydrogen/data/doc/img/MainModeSong.png
 share/hydrogen/data/doc/img/MainPlay.png
 share/hydrogen/data/doc/img/MainRecord.png
 share/hydrogen/data/doc/img/MainStop.png
 share/hydrogen/data/doc/img/MainToolbar.png
+share/hydrogen/data/doc/img/MainToolbar_V2.png
+share/hydrogen/data/doc/img/MeasureSettings.png
+share/hydrogen/data/doc/img/MidiIN_CPU.png
+share/hydrogen/data/doc/img/Midi_Actions.png
 share/hydrogen/data/doc/img/Mixer.png
 share/hydrogen/data/doc/img/MixerDelay.png
 share/hydrogen/data/doc/img/MixerFX.png
@@ -41,18 +57,30 @@ share/hydrogen/data/doc/img/MixerPlayTest.png
 share/hydrogen/data/doc/img/MixerSolo.png
 share/hydrogen/data/doc/img/MovePatternDown.png
 share/hydrogen/data/doc/img/MovePatternUp.png
+share/hydrogen/data/doc/img/NoteKey.png
+share/hydrogen/data/doc/img/NoteOff_NoteLength.png
 share/hydrogen/data/doc/img/PatternEditor.png
 share/hydrogen/data/doc/img/PatternEditorButtons.png
+share/hydrogen/data/doc/img/PatternEditorControls.png
 share/hydrogen/data/doc/img/PatternEditorDownUp.png
 share/hydrogen/data/doc/img/PatternEditorInstr.png
+share/hydrogen/data/doc/img/PatternEditorInstr_V2.png
 share/hydrogen/data/doc/img/PatternEditorPattern.png
 share/hydrogen/data/doc/img/PatternEditorRecording.png
 share/hydrogen/data/doc/img/PatternEditorSizeRes.png
+share/hydrogen/data/doc/img/PatternEditor_DrumMode.png
+share/hydrogen/data/doc/img/PatternEditor_PianoMode.png
 share/hydrogen/data/doc/img/PreferencesAppearance.png
 share/hydrogen/data/doc/img/PreferencesAudioSystem.png
+share/hydrogen/data/doc/img/PreferencesAudioSystem_V2.png
 share/hydrogen/data/doc/img/PreferencesGeneral.png
+share/hydrogen/data/doc/img/PreferencesGeneral_V2.png
 share/hydrogen/data/doc/img/PreferencesMidiSystem.png
+share/hydrogen/data/doc/img/PreferencesMidiSystem_V2.png
+share/hydrogen/data/doc/img/Rec_button.png
 share/hydrogen/data/doc/img/Res.png
+share/hydrogen/data/doc/img/SampleEditor.png
+share/hydrogen/data/doc/img/SampleEditor_V5.png
 share/hydrogen/data/doc/img/SongEditor.png
 share/hydrogen/data/doc/img/SongEditorAddLayer.png
 share/hydrogen/data/doc/img/SongEditorButtons.png
@@ -63,11 +91,20 @@ share/hydrogen/data/doc/img/SongEditorSelectInsertMode.png
 share/hydrogen/data/doc/img/SongEditorSelectMode.png
 share/hydrogen/data/doc/img/SongLoop.png
 share/hydrogen/data/doc/img/SongOperations.png
+share/hydrogen/data/doc/img/SoundLibrary.png
+share/hydrogen/data/doc/img/Sound_Library_import.png
+share/hydrogen/data/doc/img/SoundlibraryHierarchy.svg
+share/hydrogen/data/doc/img/SoundlibraryHierarchy_V3.png
+share/hydrogen/data/doc/img/SoundlibraryHierarchy_V4.png
 share/hydrogen/data/doc/img/Tutorial2.h2song
 share/hydrogen/data/doc/img/TutorialEnd.png
 share/hydrogen/data/doc/img/TutorialStart.png
+share/hydrogen/data/doc/img/Virtual_patterns_menu.png
+share/hydrogen/data/doc/img/add_tag.png
+share/hydrogen/data/doc/img/add_tempo_change.png
 share/hydrogen/data/doc/img/background_BPM.png
 share/hydrogen/data/doc/img/background_Control.png
+share/hydrogen/data/doc/img/background_Control_V2.png
 share/hydrogen/data/doc/img/background_Load.png
 share/hydrogen/data/doc/img/background_Mode.png
 share/hydrogen/data/doc/img/bg_topPanel.png
@@ -75,6 +112,7 @@ share/hydrogen/data/doc/img/bpm.png
 share/hydrogen/data/doc/img/btn_clear_off.png
 share/hydrogen/data/doc/img/btn_draw.png
 share/hydrogen/data/doc/img/btn_edit_on.png
+share/hydrogen/data/doc/img/btn_hear.png
 share/hydrogen/data/doc/img/btn_hear_on.png
 share/hydrogen/data/doc/img/btn_live_on.png
 share/hydrogen/data/doc/img/btn_loop_on.png
@@ -99,14 +137,17 @@ share/hydrogen/data/doc/img/btn_updown.png
 share/hydrogen/data/doc/img/bypass_on.png
 share/hydrogen/data/doc/img/bypass_over.png
 share/hydrogen/data/doc/img/cpuload.png
+share/hydrogen/data/doc/img/director.png
 share/hydrogen/data/doc/img/downBtn_on.png
 share/hydrogen/data/doc/img/edit_off.png
+share/hydrogen/data/doc/img/fill_clear_pattern.png
 share/hydrogen/data/doc/img/hearBtn_on.png
 share/hydrogen/data/doc/img/instr_ed0.png
 share/hydrogen/data/doc/img/instr_ed1.png
 share/hydrogen/data/doc/img/item_selected.png
 share/hydrogen/data/doc/img/jack_transport.png
 share/hydrogen/data/doc/img/midi_in.png
+share/hydrogen/data/doc/img/mixer-instrrack_btn.png
 share/hydrogen/data/doc/img/newPatternBtn_on.png
 share/hydrogen/data/doc/img/nl/DrumkitExport.png
 share/hydrogen/data/doc/img/nl/DrumkitImport.png
@@ -126,13 +167,17 @@ share/hydrogen/data/doc/img/nl/SongEditor.png
 share/hydrogen/data/doc/img/nl/SongEditorInsertMode.png
 share/hydrogen/data/doc/img/nl/SongEditorSelectMode.png
 share/hydrogen/data/doc/img/nl/SongEditorSelectModeCopy.png
+share/hydrogen/data/doc/img/pattern_properties.png
 share/hydrogen/data/doc/img/quantBtn_off.png
 share/hydrogen/data/doc/img/quantBtn_on.png
 share/hydrogen/data/doc/img/recBtn_on.png
+share/hydrogen/data/doc/img/screenshot-director.png
 share/hydrogen/data/doc/img/showFX_on.png
 share/hydrogen/data/doc/img/showPeaks_on.png
 share/hydrogen/data/doc/img/songFuncBtn_on.png
+share/hydrogen/data/doc/img/tag_bar.png
 share/hydrogen/data/doc/img/tastiera.png
+share/hydrogen/data/doc/img/tempo_bar.png
 share/hydrogen/data/doc/img/upBtn_on.png
 share/hydrogen/data/doc/img_tutorial/Bridge1_4th.png
 share/hydrogen/data/doc/img_tutorial/Bridge3_3a_hh.png
@@ -167,6 +212,9 @@ share/hydrogen/data/doc/manual_nl.po
 share/hydrogen/data/doc/tutorial.docbook
 share/hydrogen/data/doc/tutorial.pot
 share/hydrogen/data/doc/tutorial_en.html
+share/hydrogen/data/doc/tutorial_es.docbook
+share/hydrogen/data/doc/tutorial_es.html
+share/hydrogen/data/doc/tutorial_es.po
 share/hydrogen/data/doc/tutorial_fr.html
 share/hydrogen/data/doc/tutorial_fr.po
 share/hydrogen/data/doc/tutorial_it.html
@@ -208,9 +256,14 @@ 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.qm
 share/hydrogen/data/i18n/hydrogen.ca.ts
+share/hydrogen/data/i18n/hydrogen.cs.qm
+share/hydrogen/data/i18n/hydrogen.cs.ts
 share/hydrogen/data/i18n/hydrogen.de.qm
 share/hydrogen/data/i18n/hydrogen.de.ts
+share/hydrogen/data/i18n/hydrogen.el.qm
+share/hydrogen/data/i18n/hydrogen.el.ts
 share/hydrogen/data/i18n/hydrogen.es.qm
 share/hydrogen/data/i18n/hydrogen.es.ts
 share/hydrogen/data/i18n/hydrogen.fr.qm
@@ -251,6 +304,8 @@ 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/h2-icon.svg
+share/hydrogen/data/img/gray/icon.svg
 share/hydrogen/data/img/gray/icon16.png
 share/hydrogen/data/img/gray/icon24.png
 share/hydrogen/data/img/gray/icon32.png
@@ -262,11 +317,15 @@ 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/editLayer_off.png
+share/hydrogen/data/img/gray/instrumentEditor/editLayer_on.png
+share/hydrogen/data/img/gray/instrumentEditor/editLayer_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/layerTabnew.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
@@ -276,6 +335,7 @@ 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/LCDSmallFontSetRed.xcf
 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
@@ -394,6 +454,12 @@ 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_rec_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_rec_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_rec_over.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_recdel_off.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_recdel_on.png
+share/hydrogen/data/img/gray/playerControlPanel/btn_recdel_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
@@ -437,6 +503,8 @@ 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/rubber_off.png
+share/hydrogen/data/img/gray/playerControlPanel/rubber_on.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
@@ -444,6 +512,9 @@ 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_bpm_off.png
+share/hydrogen/data/img/gray/songEditor/btn_bpm_on.png
+share/hydrogen/data/img/gray/songEditor/btn_bpm_over.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
@@ -479,4 +550,9 @@ 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
+share/hydrogen/data/img/gray/waveDisplay/detailsamplewavedisplay.png
+share/hydrogen/data/img/gray/waveDisplay/mainsamplewavedisplay.png
+share/hydrogen/data/img/gray/waveDisplay/targetsamplewavedisplay.png
 share/pixmaps/h2-icon.svg
+@pkgdir share/hydrogen/data/doc/man/ru
+@pkgdir share/hydrogen/data/doc/man/C
diff --git a/audio/hydrogen/distinfo b/audio/hydrogen/distinfo
index 6d85e7ff58b..e0e1f46e18d 100644
--- a/audio/hydrogen/distinfo
+++ b/audio/hydrogen/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2012/11/13 23:26:23 mrg Exp $
+$NetBSD: distinfo,v 1.7 2013/01/11 13:23:33 joerg Exp $
 
 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-aa) = 9151230f859889fcba3335d86e283c5ff2f8cd6c
 SHA1 (patch-ab) = b532ec96fbc9ff796f9b1facd7ba38a1d9c9361f
diff --git a/audio/hydrogen/patches/patch-aa b/audio/hydrogen/patches/patch-aa
index d8a61e12350..8fa1bdb9c83 100644
--- a/audio/hydrogen/patches/patch-aa
+++ b/audio/hydrogen/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2012/11/13 23:26:23 mrg Exp $
+$NetBSD: patch-aa,v 1.5 2013/01/11 13:23:33 joerg Exp $
 
---- Sconstruct.orig	2012-02-19 13:54:05.000000000 -0800
-+++ Sconstruct	2012-11-13 13:39:48.000000000 -0800
-@@ -47,7 +47,7 @@
+--- Sconstruct.orig	2012-02-19 21:54:05.000000000 +0000
++++ Sconstruct
+@@ -47,7 +47,7 @@ def get_platform_flags( opts ):
  
  	env = Environment( options = opts )
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2012/11/13 23:26:23 mrg Exp $
  		if str(env['debug']) == "1":
  			cppflags += ['-Wall',  '-g2', '-ggdb', '-O0'] 
  			for flag in env["optflags"].split(" "):
-@@ -75,6 +75,12 @@
+@@ -75,6 +75,12 @@ def get_platform_flags( opts ):
  		    if str(env['bundle']) == "1": cppflags.append('-DBUNDLE_SUPPORT')
  
  		cppflags.append('-DLADSPA_SUPPORT')
@@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.4 2012/11/13 23:26:23 mrg Exp $
  		
  
  	if str(env['gui']) == "0": cppflags.append('-DNO_GUI_SUPPORT')
-@@ -96,6 +102,10 @@
+@@ -96,6 +102,10 @@ def get_platform_flags( opts ):
  		ldflags.append('-lasound')
  	#	ldflags.append('-lrubberband')
  
@@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.4 2012/11/13 23:26:23 mrg Exp $
  	elif sys.platform == "win32":
  		includes.append( '3rdparty\libsndfile-1_0_17' )
  		includes.append( 'build\pthreads\include' )
-@@ -283,6 +293,9 @@
+@@ -283,6 +293,9 @@ def get_hydrogen_gui( lib_hydrogen , opt
  		env.Append( LIBS = ["z"] )
  		env.Append( LIBS = ["pthread"] )
  
@@ -45,7 +45,16 @@ $NetBSD: patch-aa,v 1.4 2012/11/13 23:26:23 mrg Exp $
  	if sys.platform == "darwin" and str(env['coreaudio']) == "1":
  		env.Append( LINKFLAGS = ['-framework','ApplicationServices'])
  		env.Append( LINKFLAGS = ['-framework','AudioUnit'])
-@@ -380,7 +393,7 @@
+@@ -302,7 +315,7 @@ def get_hydrogen_gui( lib_hydrogen , opt
+ 	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
+ 
+ 	#add every img in ./data/img to the install list. 
+-	os.path.walk("./data/img/",install_images,env) 
++	#os.path.walk("./data/img/",install_images,env) 
+ 
+ 
+ 	env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/drumkits"))
+@@ -380,7 +393,7 @@ else:
  
  includes, a , b = get_platform_flags( opts )