3 files changed, 121 insertions, 130 deletions

diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 395b4d189aa7..090521e84651 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pioneers
 PORTVERSION=	0.11.3
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	pio
diff --git a/games/pioneers/files/patch-configure b/games/pioneers/files/patch-configure
deleted file mode 100644
index 3bd1d99d7ee9..000000000000
--- a/games/pioneers/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Tue Apr  3 10:19:57 2007
-+++ configure	Tue Apr  3 10:21:33 2007
-@@ -24450,7 +24450,7 @@
- 	pioneers_datadir=$datadir
- 	pioneers_themedir=$datadir/games/pioneers/themes
- 	pioneers_themedir_embed=$pioneers_themedir
--	pioneers_localedir=$datadir/locale
-+	pioneers_localedir=$prefix/share/locale
- fi
- 
- 
diff --git a/games/pioneers/pkg-plist b/games/pioneers/pkg-plist
index be590e684869..a315101e172a 100644
--- a/games/pioneers/pkg-plist
+++ b/games/pioneers/pkg-plist
@@ -4,87 +4,87 @@ bin/pioneers-meta-server
 bin/pioneers-server-console
 bin/pioneers-server-gtk
 bin/pioneersai
-share/gnome/applications/pioneers-editor.desktop
-share/gnome/applications/pioneers-server.desktop
-share/gnome/applications/pioneers.desktop
-share/gnome/games/pioneers/5-6-player.game
-share/gnome/games/pioneers/Another_swimming_pool_in_the_wall.game
-share/gnome/games/pioneers/Cube.game
-share/gnome/games/pioneers/Evil_square.game
-share/gnome/games/pioneers/GuerreDe100ans.game
-share/gnome/games/pioneers/Mini_another_swimming_pool_in_the_wall.game
-share/gnome/games/pioneers/archipel_gold.game
-share/gnome/games/pioneers/canyon.game
-share/gnome/games/pioneers/coeur.game
-share/gnome/games/pioneers/computer_names
-share/gnome/games/pioneers/conquest+ports.game
-share/gnome/games/pioneers/conquest.game
-share/gnome/games/pioneers/crane_island.game
-share/gnome/games/pioneers/default.game
-share/gnome/games/pioneers/four-islands.game
-share/gnome/games/pioneers/henjes.game
-share/gnome/games/pioneers/iles.game
-share/gnome/games/pioneers/lobby.game
-share/gnome/games/pioneers/lorindol.game
-share/gnome/games/pioneers/pond.game
-share/gnome/games/pioneers/seafarers-gold.game
-share/gnome/games/pioneers/seafarers.game
-share/gnome/games/pioneers/small.game
-share/gnome/games/pioneers/square.game
-share/gnome/games/pioneers/star.game
-share/gnome/games/pioneers/themes/FreeCIV-like/board.png
-share/gnome/games/pioneers/themes/FreeCIV-like/desert.png
-share/gnome/games/pioneers/themes/FreeCIV-like/field.png
-share/gnome/games/pioneers/themes/FreeCIV-like/forest.png
-share/gnome/games/pioneers/themes/FreeCIV-like/hill.png
-share/gnome/games/pioneers/themes/FreeCIV-like/mountain.png
-share/gnome/games/pioneers/themes/FreeCIV-like/pasture.png
-share/gnome/games/pioneers/themes/FreeCIV-like/sea.png
-share/gnome/games/pioneers/themes/FreeCIV-like/theme.cfg
-share/gnome/games/pioneers/themes/Iceland/desert.png
-share/gnome/games/pioneers/themes/Iceland/field_grain.png
-share/gnome/games/pioneers/themes/Iceland/forest_lumber.png
-share/gnome/games/pioneers/themes/Iceland/gold.png
-share/gnome/games/pioneers/themes/Iceland/hill_brick.png
-share/gnome/games/pioneers/themes/Iceland/mountain_ore.png
-share/gnome/games/pioneers/themes/Iceland/pasture_wool.png
-share/gnome/games/pioneers/themes/Iceland/theme.cfg
-share/gnome/games/pioneers/themes/Tiny/board.png
-share/gnome/games/pioneers/themes/Tiny/brick-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/brick-port.png
-share/gnome/games/pioneers/themes/Tiny/desert-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/gold-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/grain-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/grain-port.png
-share/gnome/games/pioneers/themes/Tiny/lumber-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/lumber-port.png
-share/gnome/games/pioneers/themes/Tiny/ore-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/ore-port.png
-share/gnome/games/pioneers/themes/Tiny/sea-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/theme.cfg
-share/gnome/games/pioneers/themes/Tiny/wool-lorindol.png
-share/gnome/games/pioneers/themes/Tiny/wool-port.png
-share/gnome/games/pioneers/themes/Wesnoth-like/board.png
-share/gnome/games/pioneers/themes/Wesnoth-like/desert.png
-share/gnome/games/pioneers/themes/Wesnoth-like/field.png
-share/gnome/games/pioneers/themes/Wesnoth-like/forest.png
-share/gnome/games/pioneers/themes/Wesnoth-like/gold.png
-share/gnome/games/pioneers/themes/Wesnoth-like/hill.png
-share/gnome/games/pioneers/themes/Wesnoth-like/mountain.png
-share/gnome/games/pioneers/themes/Wesnoth-like/pasture.png
-share/gnome/games/pioneers/themes/Wesnoth-like/sea.png
-share/gnome/games/pioneers/themes/Wesnoth-like/theme.cfg
-share/gnome/games/pioneers/themes/board.png
-share/gnome/games/pioneers/themes/desert.png
-share/gnome/games/pioneers/themes/field.png
-share/gnome/games/pioneers/themes/forest.png
-share/gnome/games/pioneers/themes/gold.png
-share/gnome/games/pioneers/themes/hill.png
-share/gnome/games/pioneers/themes/mountain.png
-share/gnome/games/pioneers/themes/pasture.png
-share/gnome/games/pioneers/themes/plain.png
-share/gnome/games/pioneers/themes/sea.png
-share/gnome/games/pioneers/x.game
+share/applications/pioneers-editor.desktop
+share/applications/pioneers-server.desktop
+share/applications/pioneers.desktop
+share/games/pioneers/5-6-player.game
+share/games/pioneers/Another_swimming_pool_in_the_wall.game
+share/games/pioneers/Cube.game
+share/games/pioneers/Evil_square.game
+share/games/pioneers/GuerreDe100ans.game
+share/games/pioneers/Mini_another_swimming_pool_in_the_wall.game
+share/games/pioneers/archipel_gold.game
+share/games/pioneers/canyon.game
+share/games/pioneers/coeur.game
+share/games/pioneers/computer_names
+share/games/pioneers/conquest+ports.game
+share/games/pioneers/conquest.game
+share/games/pioneers/crane_island.game
+share/games/pioneers/default.game
+share/games/pioneers/four-islands.game
+share/games/pioneers/henjes.game
+share/games/pioneers/iles.game
+share/games/pioneers/lobby.game
+share/games/pioneers/lorindol.game
+share/games/pioneers/pond.game
+share/games/pioneers/seafarers-gold.game
+share/games/pioneers/seafarers.game
+share/games/pioneers/small.game
+share/games/pioneers/square.game
+share/games/pioneers/star.game
+share/games/pioneers/themes/FreeCIV-like/board.png
+share/games/pioneers/themes/FreeCIV-like/desert.png
+share/games/pioneers/themes/FreeCIV-like/field.png
+share/games/pioneers/themes/FreeCIV-like/forest.png
+share/games/pioneers/themes/FreeCIV-like/hill.png
+share/games/pioneers/themes/FreeCIV-like/mountain.png
+share/games/pioneers/themes/FreeCIV-like/pasture.png
+share/games/pioneers/themes/FreeCIV-like/sea.png
+share/games/pioneers/themes/FreeCIV-like/theme.cfg
+share/games/pioneers/themes/Iceland/desert.png
+share/games/pioneers/themes/Iceland/field_grain.png
+share/games/pioneers/themes/Iceland/forest_lumber.png
+share/games/pioneers/themes/Iceland/gold.png
+share/games/pioneers/themes/Iceland/hill_brick.png
+share/games/pioneers/themes/Iceland/mountain_ore.png
+share/games/pioneers/themes/Iceland/pasture_wool.png
+share/games/pioneers/themes/Iceland/theme.cfg
+share/games/pioneers/themes/Tiny/board.png
+share/games/pioneers/themes/Tiny/brick-lorindol.png
+share/games/pioneers/themes/Tiny/brick-port.png
+share/games/pioneers/themes/Tiny/desert-lorindol.png
+share/games/pioneers/themes/Tiny/gold-lorindol.png
+share/games/pioneers/themes/Tiny/grain-lorindol.png
+share/games/pioneers/themes/Tiny/grain-port.png
+share/games/pioneers/themes/Tiny/lumber-lorindol.png
+share/games/pioneers/themes/Tiny/lumber-port.png
+share/games/pioneers/themes/Tiny/ore-lorindol.png
+share/games/pioneers/themes/Tiny/ore-port.png
+share/games/pioneers/themes/Tiny/sea-lorindol.png
+share/games/pioneers/themes/Tiny/theme.cfg
+share/games/pioneers/themes/Tiny/wool-lorindol.png
+share/games/pioneers/themes/Tiny/wool-port.png
+share/games/pioneers/themes/Wesnoth-like/board.png
+share/games/pioneers/themes/Wesnoth-like/desert.png
+share/games/pioneers/themes/Wesnoth-like/field.png
+share/games/pioneers/themes/Wesnoth-like/forest.png
+share/games/pioneers/themes/Wesnoth-like/gold.png
+share/games/pioneers/themes/Wesnoth-like/hill.png
+share/games/pioneers/themes/Wesnoth-like/mountain.png
+share/games/pioneers/themes/Wesnoth-like/pasture.png
+share/games/pioneers/themes/Wesnoth-like/sea.png
+share/games/pioneers/themes/Wesnoth-like/theme.cfg
+share/games/pioneers/themes/board.png
+share/games/pioneers/themes/desert.png
+share/games/pioneers/themes/field.png
+share/games/pioneers/themes/forest.png
+share/games/pioneers/themes/gold.png
+share/games/pioneers/themes/hill.png
+share/games/pioneers/themes/mountain.png
+share/games/pioneers/themes/pasture.png
+share/games/pioneers/themes/plain.png
+share/games/pioneers/themes/sea.png
+share/games/pioneers/x.game
 share/gnome/help/pioneers/C/images/actions.png
 share/gnome/help/pioneers/C/images/brick.png
 share/gnome/help/pioneers/C/images/chat.png
@@ -124,36 +124,36 @@ share/gnome/help/pioneers/C/images/trade.png
 share/gnome/help/pioneers/C/images/wool.png
 share/gnome/help/pioneers/C/legal.xml
 share/gnome/help/pioneers/C/pioneers.xml
-share/gnome/omf/pioneers/pioneers-C.omf
-share/gnome/pixmaps/pioneers-editor.png
-share/gnome/pixmaps/pioneers-server.png
-share/gnome/pixmaps/pioneers.png
-share/gnome/pixmaps/pioneers/brick.png
-share/gnome/pixmaps/pioneers/bridge.png
-share/gnome/pixmaps/pioneers/city.png
-share/gnome/pixmaps/pioneers/city_wall.png
-share/gnome/pixmaps/pioneers/develop.png
-share/gnome/pixmaps/pioneers/dice.png
-share/gnome/pixmaps/pioneers/finish.png
-share/gnome/pixmaps/pioneers/grain.png
-share/gnome/pixmaps/pioneers/lumber.png
-share/gnome/pixmaps/pioneers/ore.png
-share/gnome/pixmaps/pioneers/road.png
-share/gnome/pixmaps/pioneers/settlement.png
-share/gnome/pixmaps/pioneers/ship.png
-share/gnome/pixmaps/pioneers/ship_move.png
-share/gnome/pixmaps/pioneers/splash.png
-share/gnome/pixmaps/pioneers/style-ai.png
-share/gnome/pixmaps/pioneers/style-human-1.png
-share/gnome/pixmaps/pioneers/style-human-2.png
-share/gnome/pixmaps/pioneers/style-human-3.png
-share/gnome/pixmaps/pioneers/style-human-4.png
-share/gnome/pixmaps/pioneers/style-human-5.png
-share/gnome/pixmaps/pioneers/style-human-6.png
-share/gnome/pixmaps/pioneers/style-human-7.png
-share/gnome/pixmaps/pioneers/style-human.png
-share/gnome/pixmaps/pioneers/trade.png
-share/gnome/pixmaps/pioneers/wool.png
+share/omf/pioneers/pioneers-C.omf
+share/pixmaps/pioneers-editor.png
+share/pixmaps/pioneers-server.png
+share/pixmaps/pioneers.png
+share/pixmaps/pioneers/brick.png
+share/pixmaps/pioneers/bridge.png
+share/pixmaps/pioneers/city.png
+share/pixmaps/pioneers/city_wall.png
+share/pixmaps/pioneers/develop.png
+share/pixmaps/pioneers/dice.png
+share/pixmaps/pioneers/finish.png
+share/pixmaps/pioneers/grain.png
+share/pixmaps/pioneers/lumber.png
+share/pixmaps/pioneers/ore.png
+share/pixmaps/pioneers/road.png
+share/pixmaps/pioneers/settlement.png
+share/pixmaps/pioneers/ship.png
+share/pixmaps/pioneers/ship_move.png
+share/pixmaps/pioneers/splash.png
+share/pixmaps/pioneers/style-ai.png
+share/pixmaps/pioneers/style-human-1.png
+share/pixmaps/pioneers/style-human-2.png
+share/pixmaps/pioneers/style-human-3.png
+share/pixmaps/pioneers/style-human-4.png
+share/pixmaps/pioneers/style-human-5.png
+share/pixmaps/pioneers/style-human-6.png
+share/pixmaps/pioneers/style-human-7.png
+share/pixmaps/pioneers/style-human.png
+share/pixmaps/pioneers/trade.png
+share/pixmaps/pioneers/wool.png
 share/locale/af/LC_MESSAGES/pioneers.mo
 share/locale/de/LC_MESSAGES/pioneers.mo
 share/locale/es/LC_MESSAGES/pioneers.mo
@@ -163,14 +163,15 @@ share/locale/it/LC_MESSAGES/pioneers.mo
 share/locale/ja/LC_MESSAGES/pioneers.mo
 share/locale/nl/LC_MESSAGES/pioneers.mo
 share/locale/sv/LC_MESSAGES/pioneers.mo
-@dirrm share/gnome/games/pioneers/themes/FreeCIV-like
-@dirrm share/gnome/games/pioneers/themes/Iceland
-@dirrm share/gnome/games/pioneers/themes/Tiny
-@dirrm share/gnome/games/pioneers/themes/Wesnoth-like
-@dirrm share/gnome/games/pioneers/themes
-@dirrm share/gnome/games/pioneers
+@dirrm share/games/pioneers/themes/FreeCIV-like
+@dirrm share/games/pioneers/themes/Iceland
+@dirrm share/games/pioneers/themes/Tiny
+@dirrm share/games/pioneers/themes/Wesnoth-like
+@dirrm share/games/pioneers/themes
+@dirrm share/games/pioneers
 @dirrm share/gnome/help/pioneers/C/images
 @dirrm share/gnome/help/pioneers/C
 @dirrm share/gnome/help/pioneers
-@dirrm share/gnome/omf/pioneers
-@dirrm share/gnome/pixmaps/pioneers
+@dirrm share/omf/pioneers
+@dirrm share/pixmaps/pioneers
+@dirrmtry share/applications