3 files changed, 69 insertions, 9 deletions

diff --git a/games/fretsonfire/Makefile b/games/fretsonfire/Makefile
index 748d42c5e1d3..da5f4b8c4992 100644
--- a/games/fretsonfire/Makefile
+++ b/games/fretsonfire/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fretsonfire
-PORTVERSION=	1.1.324
+PORTVERSION=	1.2.438
 CATEGORIES=	games python
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME:S/f/F/g:S/o/O/}-${PORTVERSION:S/^/src-/}
diff --git a/games/fretsonfire/distinfo b/games/fretsonfire/distinfo
index 22178f1d922b..1c25809d0cb9 100644
--- a/games/fretsonfire/distinfo
+++ b/games/fretsonfire/distinfo
@@ -1,3 +1,3 @@
-MD5 (fretsonfire/FretsOnFire-src-1.1.324.tar.gz) = 0d9f5e959b8e41e05fe67a2dd9511e2d
-SHA256 (fretsonfire/FretsOnFire-src-1.1.324.tar.gz) = 6d1f4d794ad04cbd6ac8680f4210f3367f42a030c4ba979cb5990e6f25cf6a3b
-SIZE (fretsonfire/FretsOnFire-src-1.1.324.tar.gz) = 619616
+MD5 (fretsonfire/FretsOnFire-src-1.2.438.tar.gz) = c2ece25848d39364c3b84b4d2b8366f4
+SHA256 (fretsonfire/FretsOnFire-src-1.2.438.tar.gz) = e9680b0b3877652bc2e83b455e2e0d910170fbff1d5620062af601eecbac4946
+SIZE (fretsonfire/FretsOnFire-src-1.2.438.tar.gz) = 683740
diff --git a/games/fretsonfire/pkg-plist b/games/fretsonfire/pkg-plist
index b35511e51487..a56d149ee017 100644
--- a/games/fretsonfire/pkg-plist
+++ b/games/fretsonfire/pkg-plist
@@ -45,9 +45,11 @@ lib/fretsonfire/FretsOnFire/SceneTest.py
 lib/fretsonfire/FretsOnFire/Server.py
 lib/fretsonfire/FretsOnFire/ServerTest.py
 lib/fretsonfire/FretsOnFire/Session.py
+lib/fretsonfire/FretsOnFire/Settings.py
 lib/fretsonfire/FretsOnFire/Song.py
 lib/fretsonfire/FretsOnFire/SongChoosingScene.py
 lib/fretsonfire/FretsOnFire/SongTest.py
+lib/fretsonfire/FretsOnFire/Stage.py
 lib/fretsonfire/FretsOnFire/Svg.py
 lib/fretsonfire/FretsOnFire/SvgColors.py
 lib/fretsonfire/FretsOnFire/SvgTest.py
@@ -97,8 +99,6 @@ lib/fretsonfire/data/fiba3.ogg
 lib/fretsonfire/data/fiba4.ogg
 lib/fretsonfire/data/fiba5.ogg
 lib/fretsonfire/data/fiba6.ogg
-lib/fretsonfire/data/flame1.svg
-lib/fretsonfire/data/flame2.svg
 lib/fretsonfire/data/ghmidimap.txt
 lib/fretsonfire/data/glow.svg
 lib/fretsonfire/data/icon.png
@@ -113,6 +113,9 @@ lib/fretsonfire/data/key.dae
 lib/fretsonfire/data/keyboard.svg
 lib/fretsonfire/data/label.dae
 lib/fretsonfire/data/left.svg
+lib/fretsonfire/data/library.dae
+lib/fretsonfire/data/library_label.dae
+lib/fretsonfire/data/loading.svg
 lib/fretsonfire/data/logo.svg
 lib/fretsonfire/data/menu.ogg
 lib/fretsonfire/data/mods
@@ -126,6 +129,18 @@ lib/fretsonfire/data/perfect3.ogg
 lib/fretsonfire/data/pose.svg
 lib/fretsonfire/data/right.svg
 lib/fretsonfire/data/songs
+lib/fretsonfire/data/stage.ini
+lib/fretsonfire/data/stage_audience1.svg
+lib/fretsonfire/data/stage_audience2.svg
+lib/fretsonfire/data/stage_background.svg
+lib/fretsonfire/data/stage_bassdrum.svg
+lib/fretsonfire/data/stage_drums.svg
+lib/fretsonfire/data/stage_light.svg
+lib/fretsonfire/data/stage_lights1.svg
+lib/fretsonfire/data/stage_lights2.svg
+lib/fretsonfire/data/stage_logo.svg
+lib/fretsonfire/data/stage_speaker_cones.svg
+lib/fretsonfire/data/stage_speakers.svg
 lib/fretsonfire/data/star1.svg
 lib/fretsonfire/data/star2.svg
 lib/fretsonfire/data/start.ogg
@@ -136,6 +151,11 @@ lib/fretsonfire/data/translations
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Audio-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Audio.Audio-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Audio.Channel-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Audio.Music-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Audio.OggStream-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Audio.Sound-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Audio.StreamingSound-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/AudioTest-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/AudioTest.AudioTest-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Camera-module.html
@@ -282,9 +302,9 @@ lib/fretsonfire/data/translations
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Dialogs.LoadingScreen-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Dialogs.MessageScreen-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Dialogs.SongChooser-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/DummyAmanith-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/DummyAmanith.GKernel-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/DummyAmanith.GOpenGLBoard-class.html
-%%PORTDOCS%%%%DOCSDIR%%/html/private/DummyAmanith-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Engine-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Engine.Engine-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/EngineTest-module.html
@@ -334,7 +354,7 @@ lib/fretsonfire/data/translations
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Messages.Message-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Messages.ObjectCreated-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Messages.ObjectDestroyed-class.html
-%%PORTDOCS%%%%DOCSDIR%%/html/private/Mod-module.html     
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Mod-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Network-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Network.Connection-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Network.ObjectCollection-class.html
@@ -392,10 +412,17 @@ lib/fretsonfire/data/translations
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Session.MessageHandler-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Session.Phrasebook-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Session.ServerSession-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Settings-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Settings.ConfigChoice-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Settings.GameSettingsMenu-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Settings.KeyConfigChoice-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Settings.SettingsMenu-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Settings.VolumeConfigChoice-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Song-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Song.Difficulty-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Song.Done-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Song.Event-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Song.LibraryInfo-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Song.MidiInfoReader-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Song.MidiReader-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Song.MidiWriter-class.html
@@ -413,6 +440,14 @@ lib/fretsonfire/data/translations
 %%PORTDOCS%%%%DOCSDIR%%/html/private/SongChoosingScene.SongChoosingSceneServer-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/SongTest-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/SongTest.SongTest-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Stage-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Stage.Effect-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Stage.Layer-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Stage.LightEffect-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Stage.RotateEffect-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Stage.ScaleEffect-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Stage.Stage-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Stage.WiggleEffect-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Svg-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Svg.SvgCache-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Svg.SvgContext-class.html
@@ -469,6 +504,7 @@ lib/fretsonfire/data/translations
 %%PORTDOCS%%%%DOCSDIR%%/html/private/__builtin__.dict-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/__builtin__.object-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/__builtin__.type-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/_xmlplus.sax.handler.ContentHandler-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/asyncore.dispatcher-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/epydoc.css
 %%PORTDOCS%%%%DOCSDIR%%/html/private/exceptions.AssertionError-class.html
@@ -529,9 +565,11 @@ lib/fretsonfire/data/translations
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Server-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-ServerTest-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Session-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Settings-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Song-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-SongChoosingScene-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-SongTest-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Stage-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Svg-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-SvgColors-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-SvgTest-module.html
@@ -556,6 +594,11 @@ lib/fretsonfire/data/translations
 %%PORTDOCS%%%%DOCSDIR%%/html/private/xml.sax.handler.ContentHandler-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Audio-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Audio.Audio-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Audio.Channel-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Audio.Music-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Audio.OggStream-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Audio.Sound-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Audio.StreamingSound-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/AudioTest-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/AudioTest.AudioTest-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Camera-module.html
@@ -702,9 +745,9 @@ lib/fretsonfire/data/translations
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Dialogs.LoadingScreen-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Dialogs.MessageScreen-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Dialogs.SongChooser-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/DummyAmanith-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/DummyAmanith.GKernel-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/DummyAmanith.GOpenGLBoard-class.html
-%%PORTDOCS%%%%DOCSDIR%%/html/public/DummyAmanith-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Engine-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Engine.Engine-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/EngineTest-module.html
@@ -812,10 +855,17 @@ lib/fretsonfire/data/translations
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Session.MessageHandler-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Session.Phrasebook-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Session.ServerSession-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Settings-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Settings.ConfigChoice-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Settings.GameSettingsMenu-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Settings.KeyConfigChoice-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Settings.SettingsMenu-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Settings.VolumeConfigChoice-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Song-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Song.Difficulty-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Song.Done-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Song.Event-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Song.LibraryInfo-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Song.MidiInfoReader-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Song.MidiReader-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Song.MidiWriter-class.html
@@ -833,6 +883,14 @@ lib/fretsonfire/data/translations
 %%PORTDOCS%%%%DOCSDIR%%/html/public/SongChoosingScene.SongChoosingSceneServer-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/SongTest-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/SongTest.SongTest-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Stage-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Stage.Effect-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Stage.Layer-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Stage.LightEffect-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Stage.RotateEffect-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Stage.ScaleEffect-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Stage.Stage-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Stage.WiggleEffect-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Svg-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Svg.SvgCache-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Svg.SvgContext-class.html
@@ -948,9 +1006,11 @@ lib/fretsonfire/data/translations
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Server-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-ServerTest-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Session-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Settings-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Song-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-SongChoosingScene-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-SongTest-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Stage-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Svg-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-SvgColors-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-SvgTest-module.html