10 files changed, 43 insertions, 79 deletions

diff --git a/games/fretsonfire-data/Makefile b/games/fretsonfire-data/Makefile
index 47f22e6c23bb..832832f38b51 100644
--- a/games/fretsonfire-data/Makefile
+++ b/games/fretsonfire-data/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	data
-PORTVERSION=	1.0.225
+PORTVERSION=	1.0.263
 CATEGORIES=	games python
 MASTER_SITES=	http://louhi.kempele.fi/~skyostil/uv/fretsonfire/dist/
 PKGNAMEPREFIX=	fretsonfire-
@@ -29,7 +29,4 @@ do-install:
 		${FIND} * -type d -exec ${MKDIR} "${PREFIX}/${DATADIR}/{}" \; && \
 			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/${DATADIR}/{}" \;
 
-post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
 .include <bsd.port.mk>
diff --git a/games/fretsonfire-data/distinfo b/games/fretsonfire-data/distinfo
index 9b611b685959..4aa73ecf61c3 100644
--- a/games/fretsonfire-data/distinfo
+++ b/games/fretsonfire-data/distinfo
@@ -1,3 +1,3 @@
-MD5 (fretsonfire/FretsOnFire-1.0.225-linux.tar.gz) = 7322404c2ea10d8389389b57118316fa
-SHA256 (fretsonfire/FretsOnFire-1.0.225-linux.tar.gz) = af25a85fbffa27c89c41320bc5f063b4a5c847c21823e610dc6e72c0475b6a52
-SIZE (fretsonfire/FretsOnFire-1.0.225-linux.tar.gz) = 31693476
+MD5 (fretsonfire/FretsOnFire-1.0.263-linux.tar.gz) = 87236b3f18b719a9a559d31b05d7e362
+SHA256 (fretsonfire/FretsOnFire-1.0.263-linux.tar.gz) = 40903e5cd10fb00f19fc18824faf15003b31767a315e017e5a98cd7a7fbaa93a
+SIZE (fretsonfire/FretsOnFire-1.0.263-linux.tar.gz) = 31882861
diff --git a/games/fretsonfire-data/pkg-install b/games/fretsonfire-data/pkg-install
deleted file mode 100644
index 7aef0072fe90..000000000000
--- a/games/fretsonfire-data/pkg-install
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-[ "$2" != "POST-INSTALL" ] && exit 0
-
-snd1_file=$PKG_PREFIX/share/fretsonfire/songs/bangbang/song.ini
-snd2_file=$PKG_PREFIX/share/fretsonfire/songs/defy/song.ini
-snd3_file=$PKG_PREFIX/share/fretsonfire/songs/twibmpg/song.ini
-snd4_file=$PKG_PREFIX/share/fretsonfire/songs/tutorial/song.ini
-
-chown root:wheel $snd1_file 2>/dev/null
-chmod 666 $snd1_file
-
-chown root:wheel $snd2_file 2>/dev/null
-chmod 666 $snd2_file
-
-chown root:wheel $snd3_file 2>/dev/null
-chmod 666 $snd3_file
-
-chown root:wheel $snd4_file 2>/dev/null
-chmod 666 $snd4_file
diff --git a/games/fretsonfire-data/pkg-plist b/games/fretsonfire-data/pkg-plist
index dc0927f112b1..bd0951e7df5d 100644
--- a/games/fretsonfire-data/pkg-plist
+++ b/games/fretsonfire-data/pkg-plist
@@ -1,13 +1,16 @@
 %%DATADIR%%/songs/defy/guitar.ogg
 %%DATADIR%%/songs/defy/notes.mid
+%%DATADIR%%/songs/defy/label.png
 %%DATADIR%%/songs/defy/song.ini
 %%DATADIR%%/songs/defy/song.ogg
 %%DATADIR%%/songs/bangbang/guitar.ogg
 %%DATADIR%%/songs/bangbang/notes.mid
+%%DATADIR%%/songs/bangbang/label.png
 %%DATADIR%%/songs/bangbang/song.ini
 %%DATADIR%%/songs/bangbang/song.ogg
 %%DATADIR%%/songs/twibmpg/guitar.ogg
 %%DATADIR%%/songs/twibmpg/notes.mid
+%%DATADIR%%/songs/twibmpg/label.png
 %%DATADIR%%/songs/twibmpg/song.ini
 %%DATADIR%%/songs/twibmpg/song.ogg
 %%DATADIR%%/songs/tutorial/guitar.ogg
@@ -49,6 +52,7 @@
 %%DATADIR%%/jurgen5.ogg
 %%DATADIR%%/key.dae
 %%DATADIR%%/keyboard.svg
+%%DATADIR%%/label.dae
 %%DATADIR%%/left.svg
 %%DATADIR%%/logo.svg
 %%DATADIR%%/menu.ogg
diff --git a/games/fretsonfire/Makefile b/games/fretsonfire/Makefile
index afab94e9a37e..d1f8232315bd 100644
--- a/games/fretsonfire/Makefile
+++ b/games/fretsonfire/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fretsonfire
-PORTVERSION=	1.0.225
+PORTVERSION=	1.0.263
 CATEGORIES=	games python
 MASTER_SITES=	http://louhi.kempele.fi/~skyostil/uv/fretsonfire/dist/
 DISTNAME=	${PORTNAME:S/f/F/g:S/o/O/}-${PORTVERSION:S/^/src-/}
@@ -59,7 +59,6 @@ do-install:
 .endif
 
 post-install:
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/games/fretsonfire/distinfo b/games/fretsonfire/distinfo
index 109832d457f0..aa5988d417ff 100644
--- a/games/fretsonfire/distinfo
+++ b/games/fretsonfire/distinfo
@@ -1,3 +1,3 @@
-MD5 (fretsonfire/FretsOnFire-src-1.0.225.tar.gz) = 3837d4a949e22db587b4ff0a124da1c2
-SHA256 (fretsonfire/FretsOnFire-src-1.0.225.tar.gz) = cecb8987093a6c4f3b96701d382e664f85407c7f30a2786d693e2d08a77bf6db
-SIZE (fretsonfire/FretsOnFire-src-1.0.225.tar.gz) = 593294
+MD5 (fretsonfire/FretsOnFire-src-1.0.263.tar.gz) = 12bb2f1f9775551372a1ec9b31d99a7f
+SHA256 (fretsonfire/FretsOnFire-src-1.0.263.tar.gz) = 9571767ddb46076221afc7fb911dc071a3a89e5708dfb9375bd31b2143ae00f4
+SIZE (fretsonfire/FretsOnFire-src-1.0.263.tar.gz) = 604668
diff --git a/games/fretsonfire/files/patch-src_GameEngine.py b/games/fretsonfire/files/patch-src_GameEngine.py
index 65f8dd94a8ff..6b38bc9387be 100644
--- a/games/fretsonfire/files/patch-src_GameEngine.py
+++ b/games/fretsonfire/files/patch-src_GameEngine.py
@@ -1,11 +1,11 @@
---- src/GameEngine.py	Tue Oct  3 09:25:05 2006
-+++ src/GameEngine.py	Tue Oct  3 09:25:33 2006
-@@ -46,7 +46,7 @@
- Config.define("engine", "tickrate",     float, 1.0)
- Config.define("game",   "uploadscores", bool,  False, text = "Upload Highscores",    options = {False: "No", True: "Yes"})
+--- src/GameEngine.py	Wed Nov  1 01:00:46 2006
++++ src/GameEngine.py	Wed Nov  1 01:01:06 2006
+@@ -49,7 +49,7 @@
+ Config.define("game",   "uploadscores", bool,  False, text = _("Upload Highscores"),    options = {False: _("No"), True: _("Yes")})
  Config.define("game",   "uploadurl",    str,   "http://kempele.fi/~skyostil/python/fretsonfire/upload")
--Config.define("video",  "fullscreen",   bool,  True,  text = "Fullscreen Mode",      options = {False: "No", True: "Yes"})
-+Config.define("video",  "fullscreen",   bool,  False,  text = "Fullscreen Mode",      options = {False: "No", True: "Yes"})
- Config.define("video",  "multisamples", int,   4,     text = "Antialiasing Quality", options = {0: "None", 2: "2x", 4: "4x", 6: "6x", 8: "8x"})
+ Config.define("game",   "leftymode",    bool,  False, text = _("Lefty mode"),           options = {False: _("No"), True: _("Yes")})
+-Config.define("video",  "fullscreen",   bool,  True,  text = _("Fullscreen Mode"),      options = {False: _("No"), True: _("Yes")})
++Config.define("video",  "fullscreen",   bool,  False,  text = _("Fullscreen Mode"),      options = {False: _("No"), True: _("Yes")})
+ Config.define("video",  "multisamples", int,   4,     text = _("Antialiasing Quality"), options = {0: _("None"), 2: _("2x"), 4: _("4x"), 6: _("6x"), 8: _("8x")})
  Config.define("video",  "resolution",   str,   "640x480")
- Config.define("video",  "fps",          int,   80,    text = "Frames per Second", options = dict([(n, n) for n in range(0, 120)]))
+ Config.define("video",  "fps",          int,   80,    text = _("Frames per Second"), options = dict([(n, n) for n in range(0, 120)]))
diff --git a/games/fretsonfire/files/patch-src_Video.py b/games/fretsonfire/files/patch-src_Video.py
index 4efda5cb415b..5d5211d172d6 100644
--- a/games/fretsonfire/files/patch-src_Video.py
+++ b/games/fretsonfire/files/patch-src_Video.py
@@ -1,5 +1,5 @@
---- src/Video.py	Mon Aug 28 16:36:04 2006
-+++ src/Video.py	Mon Oct  2 16:23:07 2006
+--- src/Video.py	Wed Nov  1 01:03:39 2006
++++ src/Video.py	Wed Nov  1 01:04:35 2006
 @@ -48,10 +48,10 @@
        
      pygame.display.init()
@@ -15,19 +15,3 @@
        
      if multisamples:
        pygame.display.gl_set_attribute(pygame.GL_MULTISAMPLEBUFFERS, 1);
-@@ -59,13 +59,14 @@
- 
-     try:
-       self.screen = pygame.display.set_mode(resolution, flags)
--    except pygame.error:
-+    except pygame.error,e:
-       if multisamples:
-         Log.warn("Video setup failed. Trying without antialiasing.")
-         pygame.display.gl_set_attribute(pygame.GL_MULTISAMPLEBUFFERS, 0);
-         pygame.display.gl_set_attribute(pygame.GL_MULTISAMPLESAMPLES, 0);
-         multisamples = 0
-         self.screen = pygame.display.set_mode(resolution, flags)
-+      else: raise e
-         
-     pygame.display.set_caption(self.caption)
-     pygame.mouse.set_visible(False)
diff --git a/games/fretsonfire/pkg-install b/games/fretsonfire/pkg-install
deleted file mode 100644
index dd3e3e744278..000000000000
--- a/games/fretsonfire/pkg-install
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-[ "$2" != "POST-INSTALL" ] && exit 0
-
-log_file=$PKG_PREFIX/lib/fretsonfire/FretsOnFire/fretsonfire.log
-ini_file=$PKG_PREFIX/lib/fretsonfire/FretsOnFire/fretsonfire.ini
-
-if ! [ -e $log_file ]; then
-	touch $log_file
-	chown root:wheel $log_file 2>/dev/null
-	chmod 666 $log_file
-fi
-
-if ! [ -e $ini_file ]; then
-	touch $ini_file
-	chown root:wheel $ini_file 2>/dev/null
-	chmod 666 $ini_file
-fi
diff --git a/games/fretsonfire/pkg-plist b/games/fretsonfire/pkg-plist
index 23369c33e3cf..301b671ceaf8 100644
--- a/games/fretsonfire/pkg-plist
+++ b/games/fretsonfire/pkg-plist
@@ -10,6 +10,7 @@ lib/fretsonfire/FretsOnFire/Data.py
 lib/fretsonfire/FretsOnFire/Debug.py
 lib/fretsonfire/FretsOnFire/DialogTest.py
 lib/fretsonfire/FretsOnFire/Dialogs.py
+lib/fretsonfire/FretsOnFire/DummyAmanith.py
 lib/fretsonfire/FretsOnFire/Editor.py
 lib/fretsonfire/FretsOnFire/Engine.py
 lib/fretsonfire/FretsOnFire/EngineTest.py
@@ -22,6 +23,7 @@ lib/fretsonfire/FretsOnFire/GameTask.py
 lib/fretsonfire/FretsOnFire/Guitar.py
 lib/fretsonfire/FretsOnFire/GuitarScene.py
 lib/fretsonfire/FretsOnFire/Input.py
+lib/fretsonfire/FretsOnFire/Language.py
 lib/fretsonfire/FretsOnFire/Lobby.py
 lib/fretsonfire/FretsOnFire/Log.py
 lib/fretsonfire/FretsOnFire/MainMenu.py
@@ -60,8 +62,6 @@ lib/fretsonfire/FretsOnFire/VideoTest.py
 lib/fretsonfire/FretsOnFire/View.py
 lib/fretsonfire/FretsOnFire/ViewTest.py
 lib/fretsonfire/FretsOnFire/World.py
-lib/fretsonfire/FretsOnFire/fretsonfire.ini
-lib/fretsonfire/FretsOnFire/fretsonfire.log
 lib/fretsonfire/FretsOnFire/midi/DataTypeConverters.py
 lib/fretsonfire/FretsOnFire/midi/EventDispatcher.py
 lib/fretsonfire/FretsOnFire/midi/MidiFileParser.py
@@ -76,6 +76,7 @@ lib/fretsonfire/FretsOnFire/midi/__init__.py
 lib/fretsonfire/FretsOnFire/midi/constants.py
 lib/fretsonfire/FretsOnFire/rgb2py.py
 lib/fretsonfire/FretsOnFire/setup.py
+lib/fretsonfire/FretsOnFire/svg2png.py
 lib/fretsonfire/data/2x.svg
 lib/fretsonfire/data/3x.svg
 lib/fretsonfire/data/4x.svg
@@ -107,6 +108,7 @@ lib/fretsonfire/data/jurgen4.ogg
 lib/fretsonfire/data/jurgen5.ogg
 lib/fretsonfire/data/key.dae
 lib/fretsonfire/data/keyboard.svg
+lib/fretsonfire/data/label.dae
 lib/fretsonfire/data/left.svg
 lib/fretsonfire/data/logo.svg
 lib/fretsonfire/data/menu.ogg
@@ -275,6 +277,9 @@ lib/fretsonfire/data/title.ttf
 %%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.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
@@ -304,6 +309,7 @@ lib/fretsonfire/data/title.ttf
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Input.KeyListener-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Input.MouseListener-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Input.SystemEventListener-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/Language-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Lobby-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Lobby.Lobby-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/Log-module.html
@@ -470,6 +476,7 @@ lib/fretsonfire/data/title.ttf
 %%PORTDOCS%%%%DOCSDIR%%/html/private/pickle.Pickler-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/pickle.Unpickler-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/rgb2py-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/svg2png-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/threading.Thread-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/threading._Verbose-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Audio-module.html
@@ -482,6 +489,7 @@ lib/fretsonfire/data/title.ttf
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Debug-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-DialogTest-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Dialogs-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/toc-DummyAmanith-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Engine-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-EngineTest-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Font-module.html
@@ -493,6 +501,7 @@ lib/fretsonfire/data/title.ttf
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Guitar-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-GuitarScene-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Input-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Language-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Lobby-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-Log-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-MainMenu-module.html
@@ -533,6 +542,7 @@ lib/fretsonfire/data/title.ttf
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-World-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-everything.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc-rgb2py-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/private/toc-svg2png-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/toc.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/trees.html
 %%PORTDOCS%%%%DOCSDIR%%/html/private/unittest.TestCase-class.html
@@ -685,6 +695,9 @@ lib/fretsonfire/data/title.ttf
 %%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.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
@@ -714,6 +727,7 @@ lib/fretsonfire/data/title.ttf
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Input.KeyListener-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Input.MouseListener-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Input.SystemEventListener-class.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/Language-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Lobby-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Lobby.Lobby-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/Log-module.html
@@ -880,6 +894,7 @@ lib/fretsonfire/data/title.ttf
 %%PORTDOCS%%%%DOCSDIR%%/html/public/pickle.Pickler-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/pickle.Unpickler-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/rgb2py-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/svg2png-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/threading.Thread-class.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Audio-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-AudioTest-module.html
@@ -891,6 +906,7 @@ lib/fretsonfire/data/title.ttf
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Debug-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-DialogTest-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Dialogs-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/toc-DummyAmanith-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Engine-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-EngineTest-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Font-module.html
@@ -902,6 +918,7 @@ lib/fretsonfire/data/title.ttf
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Guitar-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-GuitarScene-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Input-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Language-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Lobby-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-Log-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-MainMenu-module.html
@@ -942,6 +959,7 @@ lib/fretsonfire/data/title.ttf
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-World-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-everything.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc-rgb2py-module.html
+%%PORTDOCS%%%%DOCSDIR%%/html/public/toc-svg2png-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/toc.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/trees.html
 %%PORTDOCS%%%%DOCSDIR%%/html/public/unittest.TestCase-class.html