Update to version 0.9.3 and make GNOME icon installation dependent on

the HAVE_GNOME knob.

3 files changed, 105 insertions, 57 deletions

diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 133b0af6ca7f..0d8a9704024f 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xpuyopuyo
-PORTVERSION=	0.4.2
+PORTVERSION=	0.9.3
 CATEGORIES=	games
 MASTER_SITES=	http://chaos2.org/xpuyopuyo/ \
 		http://lenin.dabney.caltech.edu/~justins/xpuyopuyo/
@@ -17,7 +17,6 @@ USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GTK=	yes
-WANT_GNOME=	yes
 USE_AUTOCONF=	yes
 MAN6=		xpuyopuyo.6
 
@@ -31,6 +30,7 @@ CONFIGURE_ARGS+=--with-libmikmod-prefix=${LOCALBASE}
 
 .if defined(HAVE_GNOME)
 USE_GNOME=	yes
+WANT_GNOME=	yes
 .else
 CONFIGURE_ARGS+=--without-gnome
 .endif
diff --git a/games/xpuyopuyo/distinfo b/games/xpuyopuyo/distinfo
index 8484e19b3c41..df2a5fdde153 100644
--- a/games/xpuyopuyo/distinfo
+++ b/games/xpuyopuyo/distinfo
@@ -1 +1 @@
-MD5 (xpuyopuyo-0.4.2.tar.gz) = 3ea79661f9d12e0b2cc640274497e28e
+MD5 (xpuyopuyo-0.9.3.tar.gz) = 903f0e5e1ca1ef1c9927fc603dc390f6
diff --git a/games/xpuyopuyo/pkg-plist b/games/xpuyopuyo/pkg-plist
index 93af6c93f19d..d679a11489e7 100644
--- a/games/xpuyopuyo/pkg-plist
+++ b/games/xpuyopuyo/pkg-plist
@@ -1,56 +1,6 @@
 bin/xpuyopuyo
 %%GNOME:%%share/gnome/apps/Games/xpuyopuyo.desktop
 %%GNOME:%%share/gnome/pixmaps/xpuyopuyo.xpm
-%%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
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_1j.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_2.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_2j.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_3.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_3j.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_4.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_4j.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_5.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_5j.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_clear.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_clearb.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_expl.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_gameover.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_ind.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num0.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num1.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num2.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num3.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num4.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num5.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num6.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num7.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num8.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num9.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rock.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rockbig.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rockdemon.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_side.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom1.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom2.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom3.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_left.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_leftbottom.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_lefttop.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_ltrans.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_right.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_rightbottom.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_righttop.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_rtrans.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_top.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_title.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_top.xpm
-%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_trans.xpm
 %%DATADIR%%/xpuyopuyo/themes/default/img_0.xpm
 %%DATADIR%%/xpuyopuyo/themes/default/img_0j.xpm
 %%DATADIR%%/xpuyopuyo/themes/default/img_1.xpm
@@ -91,13 +41,61 @@ bin/xpuyopuyo
 %%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_title.xpm
 %%DATADIR%%/xpuyopuyo/themes/default/img_top.xpm
 %%DATADIR%%/xpuyopuyo/themes/default/img_trans.xpm
+@dirrm %%DATADIR%%/xpuyopuyo/themes/default
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_0.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_0j.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_1.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_1j.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_2.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_2j.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_3.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_3j.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_4.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_4j.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_5.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_5j.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_clear.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_clearb.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_expl.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_gameover.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_ind.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num0.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num1.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num2.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num3.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num4.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num5.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num6.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num7.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num8.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_num9.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rock.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rockbig.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_rockdemon.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_side.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom1.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom2.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_bottom3.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_left.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_leftbottom.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_lefttop.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_ltrans.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_right.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_rightbottom.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_righttop.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_rtrans.xpm
+%%DATADIR%%/xpuyopuyo/themes/3dRokz/img_tile_top.xpm
+%%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/smileys/img_0.xpm
 %%DATADIR%%/xpuyopuyo/themes/smileys/img_0j.xpm
 %%DATADIR%%/xpuyopuyo/themes/smileys/img_1.xpm
@@ -115,10 +113,60 @@ bin/xpuyopuyo
 %%DATADIR%%/xpuyopuyo/themes/smileys/img_rock.xpm
 %%DATADIR%%/xpuyopuyo/themes/smileys/img_rockbig.xpm
 %%DATADIR%%/xpuyopuyo/themes/smileys/img_rockdemon.xpm
-%%DATADIR%%/xpuyopuyo/xpuyopuyo.txt
 @dirrm %%DATADIR%%/xpuyopuyo/themes/smileys
-@dirrm %%DATADIR%%/xpuyopuyo/themes/default
-@dirrm %%DATADIR%%/xpuyopuyo/themes/3dRokz
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_0.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_0j.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_1.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_1j.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_2.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_2j.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_3.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_3j.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_4.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_4j.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_5.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_5j.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_clear.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_clearb.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_expl.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_gameover.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_ind.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_num0.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_num1.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_num2.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_num3.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_num4.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_num5.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_num6.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_num7.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_num8.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_num9.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_paused.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_rock.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_rockbig.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_rockdemon.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_side.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_bottom1.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_bottom2.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_bottom3.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_left.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_tile_leftbottom.xpm
+%%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_top.xpm
+%%DATADIR%%/xpuyopuyo/themes/spheres/img_trans.xpm
+@dirrm %%DATADIR%%/xpuyopuyo/themes/spheres
 @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