3 files changed, 107 insertions, 60 deletions

diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 2435f76ed661..5f43e4fc6b39 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	xpuyopuyo
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.8
 CATEGORIES=	games
-MASTER_SITES=	http://chaos2.org/xpuyopuyo/ \
-		http://lenin.dabney.caltech.edu/~justins/xpuyopuyo/
+MASTER_SITES=	http://chaos2.org/xpuyopuyo/
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 COMMENT=	A puzzle game, somewhat like Tetris
diff --git a/games/xpuyopuyo/distinfo b/games/xpuyopuyo/distinfo
index df2a5fdde153..6a76397db72b 100644
--- a/games/xpuyopuyo/distinfo
+++ b/games/xpuyopuyo/distinfo
@@ -1 +1 @@
-MD5 (xpuyopuyo-0.9.3.tar.gz) = 903f0e5e1ca1ef1c9927fc603dc390f6
+MD5 (xpuyopuyo-0.9.8.tar.gz) = 5286312415d632011cfd0e603f55c428
diff --git a/games/xpuyopuyo/pkg-plist b/games/xpuyopuyo/pkg-plist
index d679a11489e7..53a13348050d 100644
--- a/games/xpuyopuyo/pkg-plist
+++ b/games/xpuyopuyo/pkg-plist
@@ -1,54 +1,10 @@
 bin/xpuyopuyo
 %%GNOME:%%share/gnome/apps/Games/xpuyopuyo.desktop
 %%GNOME:%%share/gnome/pixmaps/xpuyopuyo.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_0.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_0j.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_1.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_1j.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_2.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_2j.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_3.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_3j.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_4.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_4j.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_5.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_5j.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_clear.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_clearb.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_expl.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_gameover.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_ind.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num0.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num1.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num2.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num3.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num4.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num5.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num6.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num7.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num8.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_num9.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_paused.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_rock.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_rockbig.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_rockdemon.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_side.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom1.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom2.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom3.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_left.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_leftbottom.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_lefttop.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_ltrans.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_right.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_title.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_rightbottom.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_righttop.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_rtrans.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_tile_top.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_top.xpm
-%%DATADIR%%/xpuyopuyo/themes/default/img_trans.xpm
-@dirrm %%DATADIR%%/xpuyopuyo/themes/default
+%%DATADIR%%/xpuyopuyo/copying.txt
+%%DATADIR%%/xpuyopuyo/sounds/game.xm
+%%DATADIR%%/xpuyopuyo/sounds/gameover.xm
+%%DATADIR%%/xpuyopuyo/sounds/prelude.xm
 %%DATADIR%%/xpuyopuyo/themes/3dRokz/img_0.xpm
 %%DATADIR%%/xpuyopuyo/themes/3dRokz/img_0j.xpm
 %%DATADIR%%/xpuyopuyo/themes/3dRokz/img_1.xpm
@@ -95,7 +51,100 @@ bin/xpuyopuyo
 %%DATADIR%%/xpuyopuyo/themes/3dRokz/img_title.xpm
 %%DATADIR%%/xpuyopuyo/themes/3dRokz/img_top.xpm
 %%DATADIR%%/xpuyopuyo/themes/3dRokz/img_trans.xpm
-@dirrm %%DATADIR%%/xpuyopuyo/themes/3dRokz
+%%DATADIR%%/xpuyopuyo/themes/default/img_0.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_0j.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_1.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_1j.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_2.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_2j.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_3.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_3j.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_4.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_4j.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_5.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_5j.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_clear.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_clearb.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_expl.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_gameover.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_ind.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num0.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num1.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num2.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num3.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num4.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num5.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num6.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num7.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num8.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_num9.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_paused.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_rock.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_rockbig.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_rockdemon.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_side.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom1.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom2.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_bottom3.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_left.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_leftbottom.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_lefttop.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_ltrans.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_right.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_rightbottom.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_righttop.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_rtrans.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_tile_top.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_title.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_top.xpm
+%%DATADIR%%/xpuyopuyo/themes/default/img_trans.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_0.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_0j.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_1.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_1j.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_2.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_2j.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_3.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_3j.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_4.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_4j.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_5.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_5j.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_clear.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_clearb.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_expl.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_gameover.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_ind.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_num0.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_num1.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_num2.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_num3.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_num4.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_num5.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_num6.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_num7.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_num8.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_num9.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_paused.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_rock.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_rockbig.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_rockdemon.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_side.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_bottom1.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_bottom2.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_bottom3.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_left.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_leftbottom.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_lefttop.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_ltrans.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_right.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_rightbottom.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_righttop.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_rtrans.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_tile_top.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_title.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_top.xpm
+%%DATADIR%%/xpuyopuyo/themes/fabo/img_trans.xpm
 %%DATADIR%%/xpuyopuyo/themes/smileys/img_0.xpm
 %%DATADIR%%/xpuyopuyo/themes/smileys/img_0j.xpm
 %%DATADIR%%/xpuyopuyo/themes/smileys/img_1.xpm
@@ -113,7 +162,6 @@ bin/xpuyopuyo
 %%DATADIR%%/xpuyopuyo/themes/smileys/img_rock.xpm
 %%DATADIR%%/xpuyopuyo/themes/smileys/img_rockbig.xpm
 %%DATADIR%%/xpuyopuyo/themes/smileys/img_rockdemon.xpm
-@dirrm %%DATADIR%%/xpuyopuyo/themes/smileys
 %%DATADIR%%/xpuyopuyo/themes/spheres/img_0.xpm
 %%DATADIR%%/xpuyopuyo/themes/spheres/img_0j.xpm
 %%DATADIR%%/xpuyopuyo/themes/spheres/img_1.xpm
@@ -154,19 +202,19 @@ bin/xpuyopuyo
 %%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_lefttop.xpm
 %%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_ltrans.xpm
 %%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_right.xpm
-%%DATADIR%%/xpuyopuyo/themes/spheres/img_title.xpm
 %%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_rightbottom.xpm
 %%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_righttop.xpm
 %%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_rtrans.xpm
 %%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_top.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_title.xpm
 %%DATADIR%%/xpuyopuyo/themes/spheres/img_top.xpm
 %%DATADIR%%/xpuyopuyo/themes/spheres/img_trans.xpm
+%%DATADIR%%/xpuyopuyo/xpuyopuyo.txt
 @dirrm %%DATADIR%%/xpuyopuyo/themes/spheres
+@dirrm %%DATADIR%%/xpuyopuyo/themes/smileys
+@dirrm %%DATADIR%%/xpuyopuyo/themes/fabo
+@dirrm %%DATADIR%%/xpuyopuyo/themes/default
+@dirrm %%DATADIR%%/xpuyopuyo/themes/3dRokz
 @dirrm %%DATADIR%%/xpuyopuyo/themes
-%%DATADIR%%/xpuyopuyo/sounds/game.xm
-%%DATADIR%%/xpuyopuyo/sounds/gameover.xm
-%%DATADIR%%/xpuyopuyo/sounds/prelude.xm
 @dirrm %%DATADIR%%/xpuyopuyo/sounds
-%%DATADIR%%/xpuyopuyo/xpuyopuyo.txt
-%%DATADIR%%/xpuyopuyo/copying.txt
 @dirrm %%DATADIR%%/xpuyopuyo