3 files changed, 56 insertions, 122 deletions

diff --git a/games/biloba/Makefile b/games/biloba/Makefile
index 492503612c4b..ec5fe4cdc57e 100644
--- a/games/biloba/Makefile
+++ b/games/biloba/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	biloba
-PORTVERSION=	0.6
-PORTREVISION=	5
+PORTVERSION=	0.9.3
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/Biloba/${PORTVERSION}
 
@@ -26,10 +25,6 @@ DESKTOP_ENTRIES="Biloba" \
 		"Game;LogicGame;" \
 		false
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
-	    ${WRKSRC}/src/Makefile.server
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/biloba_icon.png ${DATADIR}/
 
diff --git a/games/biloba/distinfo b/games/biloba/distinfo
index 6d65f5989fe1..fd0a071ecc28 100644
--- a/games/biloba/distinfo
+++ b/games/biloba/distinfo
@@ -1,2 +1,2 @@
-SHA256 (biloba-0.6.tar.gz) = 657fb707e4743b67c333d94e64b952d591241eb06189f73401edc233a100b479
-SIZE (biloba-0.6.tar.gz) = 3346864
+SHA256 (biloba-0.9.3.tar.gz) = a088d91bf1df8e2df643da95b5b55494dca82e5e64f28b2ffa9308bd47e12c61
+SIZE (biloba-0.9.3.tar.gz) = 3162976
diff --git a/games/biloba/pkg-plist b/games/biloba/pkg-plist
index 7c6ce17ce173..1d1030ac5a4b 100644
--- a/games/biloba/pkg-plist
+++ b/games/biloba/pkg-plist
@@ -1,8 +1,45 @@
 bin/biloba
+bin/biloba-server
 %%DATADIR%%/biloba_icon.png
-%%DATADIR%%/en/2play.png
-%%DATADIR%%/en/3play.png
-%%DATADIR%%/en/4play.png
+%%DATADIR%%/common/2play.png
+%%DATADIR%%/common/3play.png
+%%DATADIR%%/common/4play.png
+%%DATADIR%%/common/arrow-down-left.png
+%%DATADIR%%/common/arrow-down-right.png
+%%DATADIR%%/common/arrow-down.png
+%%DATADIR%%/common/arrow-left.png
+%%DATADIR%%/common/arrow-right.png
+%%DATADIR%%/common/arrow-up-left.png
+%%DATADIR%%/common/arrow-up-right.png
+%%DATADIR%%/common/arrow-up.png
+%%DATADIR%%/common/biloba-title.png
+%%DATADIR%%/common/black-highlighter.png
+%%DATADIR%%/common/border-maemo.png
+%%DATADIR%%/common/border.png
+%%DATADIR%%/common/choose.png
+%%DATADIR%%/common/cursor.png
+%%DATADIR%%/common/empty_200_40.png
+%%DATADIR%%/common/empty_200_50.png
+%%DATADIR%%/common/empty_40_40.png
+%%DATADIR%%/common/en.png
+%%DATADIR%%/common/es.png
+%%DATADIR%%/common/font.png
+%%DATADIR%%/common/fr.png
+%%DATADIR%%/common/help.png
+%%DATADIR%%/common/highlighter.png
+%%DATADIR%%/common/pawn-blue.png
+%%DATADIR%%/common/pawn-green.png
+%%DATADIR%%/common/pawn-highlighter.png
+%%DATADIR%%/common/pawn-orange.png
+%%DATADIR%%/common/pawn-red.png
+%%DATADIR%%/common/saved.png
+%%DATADIR%%/common/tile-center.png
+%%DATADIR%%/common/tile-down-left.png
+%%DATADIR%%/common/tile-down-right.png
+%%DATADIR%%/common/tile-no-tile.png
+%%DATADIR%%/common/tile-up-left.png
+%%DATADIR%%/common/tile-up-right.png
+%%DATADIR%%/common/tile.png
 %%DATADIR%%/en/aide1-maemo.png
 %%DATADIR%%/en/aide1.png
 %%DATADIR%%/en/aide2-maemo.png
@@ -15,54 +52,20 @@ bin/biloba
 %%DATADIR%%/en/aide5.png
 %%DATADIR%%/en/aide6-maemo.png
 %%DATADIR%%/en/aide6.png
-%%DATADIR%%/en/arrow-down-left.png
-%%DATADIR%%/en/arrow-down-right.png
-%%DATADIR%%/en/arrow-down.png
-%%DATADIR%%/en/arrow-left.png
-%%DATADIR%%/en/arrow-right.png
-%%DATADIR%%/en/arrow-up-left.png
-%%DATADIR%%/en/arrow-up-right.png
-%%DATADIR%%/en/arrow-up.png
-%%DATADIR%%/en/biloba-title.png
-%%DATADIR%%/en/black-highlighter.png
-%%DATADIR%%/en/border-maemo.png
-%%DATADIR%%/en/border.png
+%%DATADIR%%/en/commands-maemo.png
+%%DATADIR%%/en/commands.png
 %%DATADIR%%/en/computer.png
 %%DATADIR%%/en/create-game.png
-%%DATADIR%%/en/cursor.png
-%%DATADIR%%/en/demo.png
-%%DATADIR%%/en/empty_200_40.png
-%%DATADIR%%/en/empty_200_50.png
-%%DATADIR%%/en/empty_40_40.png
-%%DATADIR%%/en/en.png
-%%DATADIR%%/en/es.png
-%%DATADIR%%/en/font.png
-%%DATADIR%%/en/fr.png
 %%DATADIR%%/en/game-name.png
-%%DATADIR%%/en/help.png
-%%DATADIR%%/en/highlighter.png
 %%DATADIR%%/en/join-game.png
 %%DATADIR%%/en/local.png
 %%DATADIR%%/en/network-games.png
 %%DATADIR%%/en/nplay.png
-%%DATADIR%%/en/pawn-blue.png
-%%DATADIR%%/en/pawn-green.png
-%%DATADIR%%/en/pawn-highlighter.png
-%%DATADIR%%/en/pawn-orange.png
-%%DATADIR%%/en/pawn-red.png
 %%DATADIR%%/en/player.png
 %%DATADIR%%/en/reseau.png
+%%DATADIR%%/en/save_last.png
+%%DATADIR%%/en/server.png
 %%DATADIR%%/en/start.png
-%%DATADIR%%/en/tile-center.png
-%%DATADIR%%/en/tile-down-left.png
-%%DATADIR%%/en/tile-down-right.png
-%%DATADIR%%/en/tile-no-tile.png
-%%DATADIR%%/en/tile-up-left.png
-%%DATADIR%%/en/tile-up-right.png
-%%DATADIR%%/en/tile.png
-%%DATADIR%%/es/2play.png
-%%DATADIR%%/es/3play.png
-%%DATADIR%%/es/4play.png
 %%DATADIR%%/es/aide1-maemo.png
 %%DATADIR%%/es/aide1.png
 %%DATADIR%%/es/aide2-maemo.png
@@ -75,54 +78,20 @@ bin/biloba
 %%DATADIR%%/es/aide5.png
 %%DATADIR%%/es/aide6-maemo.png
 %%DATADIR%%/es/aide6.png
-%%DATADIR%%/es/arrow-down-left.png
-%%DATADIR%%/es/arrow-down-right.png
-%%DATADIR%%/es/arrow-down.png
-%%DATADIR%%/es/arrow-left.png
-%%DATADIR%%/es/arrow-right.png
-%%DATADIR%%/es/arrow-up-left.png
-%%DATADIR%%/es/arrow-up-right.png
-%%DATADIR%%/es/arrow-up.png
-%%DATADIR%%/es/biloba-title.png
-%%DATADIR%%/es/black-highlighter.png
-%%DATADIR%%/es/border-maemo.png
-%%DATADIR%%/es/border.png
+%%DATADIR%%/es/commands-maemo.png
+%%DATADIR%%/es/commands.png
 %%DATADIR%%/es/computer.png
 %%DATADIR%%/es/create-game.png
-%%DATADIR%%/es/cursor.png
-%%DATADIR%%/es/demo.png
-%%DATADIR%%/es/empty_200_40.png
-%%DATADIR%%/es/empty_200_50.png
-%%DATADIR%%/es/empty_40_40.png
-%%DATADIR%%/es/en.png
-%%DATADIR%%/es/es.png
-%%DATADIR%%/es/font.png
-%%DATADIR%%/es/fr.png
 %%DATADIR%%/es/game-name.png
-%%DATADIR%%/es/help.png
-%%DATADIR%%/es/highlighter.png
 %%DATADIR%%/es/join-game.png
 %%DATADIR%%/es/local.png
 %%DATADIR%%/es/network-games.png
 %%DATADIR%%/es/nplay.png
-%%DATADIR%%/es/pawn-blue.png
-%%DATADIR%%/es/pawn-green.png
-%%DATADIR%%/es/pawn-highlighter.png
-%%DATADIR%%/es/pawn-orange.png
-%%DATADIR%%/es/pawn-red.png
 %%DATADIR%%/es/player.png
 %%DATADIR%%/es/reseau.png
+%%DATADIR%%/es/save_last.png
+%%DATADIR%%/es/server.png
 %%DATADIR%%/es/start.png
-%%DATADIR%%/es/tile-center.png
-%%DATADIR%%/es/tile-down-left.png
-%%DATADIR%%/es/tile-down-right.png
-%%DATADIR%%/es/tile-no-tile.png
-%%DATADIR%%/es/tile-up-left.png
-%%DATADIR%%/es/tile-up-right.png
-%%DATADIR%%/es/tile.png
-%%DATADIR%%/fr/2play.png
-%%DATADIR%%/fr/3play.png
-%%DATADIR%%/fr/4play.png
 %%DATADIR%%/fr/aide1-maemo.png
 %%DATADIR%%/fr/aide1.png
 %%DATADIR%%/fr/aide2-maemo.png
@@ -135,55 +104,25 @@ bin/biloba
 %%DATADIR%%/fr/aide5.png
 %%DATADIR%%/fr/aide6-maemo.png
 %%DATADIR%%/fr/aide6.png
-%%DATADIR%%/fr/arrow-down-left.png
-%%DATADIR%%/fr/arrow-down-right.png
-%%DATADIR%%/fr/arrow-down.png
-%%DATADIR%%/fr/arrow-left.png
-%%DATADIR%%/fr/arrow-right.png
-%%DATADIR%%/fr/arrow-up-left.png
-%%DATADIR%%/fr/arrow-up-right.png
-%%DATADIR%%/fr/arrow-up.png
-%%DATADIR%%/fr/biloba-title.png
-%%DATADIR%%/fr/black-highlighter.png
-%%DATADIR%%/fr/border-maemo.png
-%%DATADIR%%/fr/border.png
+%%DATADIR%%/fr/commands-maemo.png
+%%DATADIR%%/fr/commands.png
 %%DATADIR%%/fr/computer.png
 %%DATADIR%%/fr/create-game.png
-%%DATADIR%%/fr/cursor.png
-%%DATADIR%%/fr/demo.png
-%%DATADIR%%/fr/empty_200_40.png
-%%DATADIR%%/fr/empty_200_50.png
-%%DATADIR%%/fr/empty_40_40.png
-%%DATADIR%%/fr/en.png
-%%DATADIR%%/fr/es.png
-%%DATADIR%%/fr/font.png
-%%DATADIR%%/fr/fr.png
 %%DATADIR%%/fr/game-name.png
-%%DATADIR%%/fr/help.png
-%%DATADIR%%/fr/highlighter.png
 %%DATADIR%%/fr/join-game.png
 %%DATADIR%%/fr/local.png
 %%DATADIR%%/fr/network-games.png
 %%DATADIR%%/fr/nplay.png
-%%DATADIR%%/fr/pawn-blue.png
-%%DATADIR%%/fr/pawn-green.png
-%%DATADIR%%/fr/pawn-highlighter.png
-%%DATADIR%%/fr/pawn-orange.png
-%%DATADIR%%/fr/pawn-red.png
 %%DATADIR%%/fr/player.png
 %%DATADIR%%/fr/reseau.png
+%%DATADIR%%/fr/save_last.png
+%%DATADIR%%/fr/server.png
 %%DATADIR%%/fr/start.png
-%%DATADIR%%/fr/tile-center.png
-%%DATADIR%%/fr/tile-down-left.png
-%%DATADIR%%/fr/tile-down-right.png
-%%DATADIR%%/fr/tile-no-tile.png
-%%DATADIR%%/fr/tile-up-left.png
-%%DATADIR%%/fr/tile-up-right.png
-%%DATADIR%%/fr/tile.png
 %%DATADIR%%/snd/eat.wav
 %%DATADIR%%/snd/type.wav
 @dirrm %%DATADIR%%/snd
 @dirrm %%DATADIR%%/fr
 @dirrm %%DATADIR%%/es
 @dirrm %%DATADIR%%/en
+@dirrm %%DATADIR%%/common
 @dirrm %%DATADIR%%