5 files changed, 161 insertions, 143 deletions

diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index 26febc2bbd5a..d9b8e88c56bc 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnocatan
-PORTVERSION=	0.8.1.59
+PORTNAME=	pioneers
+PORTVERSION=	0.9.19
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	pio
@@ -16,13 +16,13 @@ COMMENT=	An Internet playable version of the Settlers of Catan for GNOME/GTK
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomeprefix gtk20 libgnomeui
+USE_GNOME=	gnomehack gnomeprefix gtk20 libgnome
 USE_LIBTOOL_VER=13
 INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN6=		gnocatan.6 gnocatan-server-gtk.6 gnocatan-server-console.6 \
-		gnocatanai.6 gnocatan-meta-server.6
+MAN6=		pioneers.6 pioneers-server-gtk.6 pioneers-server-console.6 \
+		pioneersai.6 pioneers-meta-server.6
 
 .include <bsd.port.mk>
diff --git a/games/pioneers/distinfo b/games/pioneers/distinfo
index c59a7eb90f5b..561ecd90aa34 100644
--- a/games/pioneers/distinfo
+++ b/games/pioneers/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnocatan-0.8.1.59.tar.gz) = 909aeb08a3f4990ffa53f1769b3a5111
-SIZE (gnocatan-0.8.1.59.tar.gz) = 2074119
+MD5 (pioneers-0.9.19.tar.gz) = 949a138cd9660b1308f4a701d315d5d6
+SIZE (pioneers-0.9.19.tar.gz) = 2073049
diff --git a/games/pioneers/files/patch-meta-server_main.c b/games/pioneers/files/patch-meta-server_main.c
new file mode 100644
index 000000000000..5d05d79293cb
--- /dev/null
+++ b/games/pioneers/files/patch-meta-server_main.c
@@ -0,0 +1,14 @@
+--- meta-server/main.c.orig	Fri Jul 22 17:08:33 2005
++++ meta-server/main.c	Fri Jul 22 17:10:56 2005
+@@ -29,9 +29,11 @@
+ #ifdef HAVE_GETOPT_H
+ #include <getopt.h>
+ #endif
++#include <netinet/in.h>
+ #include <fcntl.h>
+ #include <syslog.h>
+ #include <sys/wait.h>
++#include <sys/socket.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <netdb.h>
diff --git a/games/pioneers/pkg-descr b/games/pioneers/pkg-descr
index ea5d9e044bbf..78d7f8125fde 100644
--- a/games/pioneers/pkg-descr
+++ b/games/pioneers/pkg-descr
@@ -1,5 +1,4 @@
-Gnocatan is an Internet playable implementation of the Settlers of
-Catan board game.  The aim is to remain as faithful to the board game
-as is possible.
+Pioneers is an Internet playable implementation of the Settlers of Catan board
+game. The aim is to remain as faithful to the board game as is possible.
 
 WWW: http://pio.sourceforge.net/
diff --git a/games/pioneers/pkg-plist b/games/pioneers/pkg-plist
index 5afc03e685ef..541a1b0abeba 100644
--- a/games/pioneers/pkg-plist
+++ b/games/pioneers/pkg-plist
@@ -1,133 +1,138 @@
-bin/gnocatan
-bin/gnocatan-server-gtk
-bin/gnocatan-server-console
-bin/gnocatan-meta-server
-bin/gnocatanai
-share/gnome/help/gnocatan/C/legal.xml
-share/gnome/help/gnocatan/C/gnocatan.xml
-share/gnome/help/gnocatan/C/images/actions.png
-share/gnome/help/gnocatan/C/images/chat.png
-share/gnome/help/gnocatan/C/images/client.png
-share/gnome/help/gnocatan/C/images/connect-dialog.png
-share/gnome/help/gnocatan/C/images/desert.png
-share/gnome/help/gnocatan/C/images/develop-cards.png
-share/gnome/help/gnocatan/C/images/discard-dialog.png
-share/gnome/help/gnocatan/C/images/discards.png
-share/gnome/help/gnocatan/C/images/field.png
-share/gnome/help/gnocatan/C/images/forest.png
-share/gnome/help/gnocatan/C/images/gameover-dialog.png
-share/gnome/help/gnocatan/C/images/hill.png
-share/gnome/help/gnocatan/C/images/identity.png
-share/gnome/help/gnocatan/C/images/join-private-dialog.png
-share/gnome/help/gnocatan/C/images/legend-dialog.png
-share/gnome/help/gnocatan/C/images/map.png
-share/gnome/help/gnocatan/C/images/messages.png
-share/gnome/help/gnocatan/C/images/monopoly-dialog.png
-share/gnome/help/gnocatan/C/images/mountain.png
-share/gnome/help/gnocatan/C/images/pasture.png
-share/gnome/help/gnocatan/C/images/place-robber.png
-share/gnome/help/gnocatan/C/images/quote.png
-share/gnome/help/gnocatan/C/images/player-summary.png
-share/gnome/help/gnocatan/C/images/plenty-dialog.png
-share/gnome/help/gnocatan/C/images/resources.png
-share/gnome/help/gnocatan/C/images/sea.png
-share/gnome/help/gnocatan/C/images/server-create.png
-share/gnome/help/gnocatan/C/images/servers-dialog.png
-share/gnome/help/gnocatan/C/images/status.png
-share/gnome/help/gnocatan/C/images/steal-from.png
-share/gnome/help/gnocatan/C/images/trade.png
-share/gnome/omf/gnocatan/gnocatan-C.omf
-share/gnome/games/gnocatan/themes/FreeCIV-like/desert.png
-share/gnome/games/gnocatan/themes/FreeCIV-like/forest.png
-share/gnome/games/gnocatan/themes/FreeCIV-like/mountain.png
-share/gnome/games/gnocatan/themes/FreeCIV-like/sea.png
-share/gnome/games/gnocatan/themes/FreeCIV-like/board.png
-share/gnome/games/gnocatan/themes/FreeCIV-like/field.png
-share/gnome/games/gnocatan/themes/FreeCIV-like/hill.png
-share/gnome/games/gnocatan/themes/FreeCIV-like/pasture.png
-share/gnome/games/gnocatan/themes/FreeCIV-like/theme.cfg
-share/gnome/games/gnocatan/themes/Iceland/desert.png
-share/gnome/games/gnocatan/themes/Iceland/field_grain.png
-share/gnome/games/gnocatan/themes/Iceland/forest_lumber.png
-share/gnome/games/gnocatan/themes/Iceland/gold.png
-share/gnome/games/gnocatan/themes/Iceland/hill_brick.png
-share/gnome/games/gnocatan/themes/Iceland/mountain_ore.png
-share/gnome/games/gnocatan/themes/Iceland/pasture_wool.png
-share/gnome/games/gnocatan/themes/Iceland/theme.cfg
-share/gnome/games/gnocatan/themes/Tiny/board.png
-share/gnome/games/gnocatan/themes/Tiny/brick-lorindol.png
-share/gnome/games/gnocatan/themes/Tiny/brick-port.png
-share/gnome/games/gnocatan/themes/Tiny/desert-lorindol.png
-share/gnome/games/gnocatan/themes/Tiny/gold-lorindol.png
-share/gnome/games/gnocatan/themes/Tiny/grain-lorindol.png
-share/gnome/games/gnocatan/themes/Tiny/grain-port.png
-share/gnome/games/gnocatan/themes/Tiny/lumber-lorindol.png
-share/gnome/games/gnocatan/themes/Tiny/lumber-port.png
-share/gnome/games/gnocatan/themes/Tiny/ore-lorindol.png
-share/gnome/games/gnocatan/themes/Tiny/ore-port.png
-share/gnome/games/gnocatan/themes/Tiny/sea-lorindol.png
-share/gnome/games/gnocatan/themes/Tiny/theme.cfg
-share/gnome/games/gnocatan/themes/Tiny/wool-lorindol.png
-share/gnome/games/gnocatan/themes/Tiny/wool-port.png
-share/gnome/games/gnocatan/themes/board.png
-share/gnome/games/gnocatan/themes/desert.png
-share/gnome/games/gnocatan/themes/field.png
-share/gnome/games/gnocatan/themes/forest.png
-share/gnome/games/gnocatan/themes/hill.png
-share/gnome/games/gnocatan/themes/mountain.png
-share/gnome/games/gnocatan/themes/pasture.png
-share/gnome/games/gnocatan/themes/plain.png
-share/gnome/games/gnocatan/themes/sea.png
-share/gnome/games/gnocatan/themes/gold.png
-share/gnome/games/gnocatan/themes/cross.png
-share/gnome/games/gnocatan/themes/tick.png
-share/gnome/games/gnocatan/default.game
-share/gnome/games/gnocatan/5-6-player.game
-share/gnome/games/gnocatan/four-islands.game
-share/gnome/games/gnocatan/seafarers.game
-share/gnome/games/gnocatan/seafarers-gold.game
-share/gnome/games/gnocatan/small.game
-share/gnome/games/gnocatan/canyon.game
-share/gnome/games/gnocatan/conquest.game
-share/gnome/games/gnocatan/conquest+ports.game
-share/gnome/games/gnocatan/pond.game
-share/gnome/games/gnocatan/square.game
-share/gnome/games/gnocatan/star.game
-share/gnome/games/gnocatan/x.game
-share/gnome/games/gnocatan/Cube.game
-share/gnome/games/gnocatan/Another_swimming_pool_in_the_wall.game
-share/gnome/games/gnocatan/Evil_square.game
-share/gnome/games/gnocatan/GuerreDe100ans.game
-share/gnome/games/gnocatan/Mini_another_swimming_pool_in_the_wall.game
-share/gnome/games/gnocatan/henjes.game
-share/gnome/games/gnocatan/lorindol.game
-share/gnome/games/gnocatan/computer_names
-share/gnome/apps/Games/gnocatan.desktop
-share/gnome/apps/Games/gnocatan-server.desktop
-share/gnome/pixmaps/gnome-gnocatan.png
-share/gnome/pixmaps/gnocatan/bridge.png
-share/gnome/pixmaps/gnocatan/city.png
-share/gnome/pixmaps/gnocatan/develop.png
-share/gnome/pixmaps/gnocatan/dice.png
-share/gnome/pixmaps/gnocatan/finish.png
-share/gnome/pixmaps/gnocatan/road.png
-share/gnome/pixmaps/gnocatan/settlement.png
-share/gnome/pixmaps/gnocatan/ship.png
-share/gnome/pixmaps/gnocatan/ship_move.png
-share/gnome/pixmaps/gnocatan/splash.png
-share/gnome/pixmaps/gnocatan/trade.png
-share/locale/de/LC_MESSAGES/gnocatan.mo
-share/locale/es/LC_MESSAGES/gnocatan.mo
-share/locale/fr/LC_MESSAGES/gnocatan.mo
-share/locale/it/LC_MESSAGES/gnocatan.mo
-share/locale/nl/LC_MESSAGES/gnocatan.mo
-@dirrm share/gnome/help/gnocatan/C/images
-@dirrm share/gnome/help/gnocatan/C
-@dirrm share/gnome/help/gnocatan
-@dirrm share/gnome/omf/gnocatan
-@dirrm share/gnome/games/gnocatan/themes/FreeCIV-like
-@dirrm share/gnome/games/gnocatan/themes/Iceland
-@dirrm share/gnome/games/gnocatan/themes/Tiny
-@dirrm share/gnome/games/gnocatan/themes
-@dirrm share/gnome/games/gnocatan
-@dirrm share/gnome/pixmaps/gnocatan
+bin/pioneers
+bin/pioneers-editor
+bin/pioneers-meta-server
+bin/pioneers-server-console
+bin/pioneers-server-gtk
+bin/pioneersai
+share/gnome/apps/Games/pioneers-server.desktop
+share/gnome/apps/Games/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/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/board.png
+share/gnome/games/pioneers/themes/cross.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/themes/tick.png
+share/gnome/games/pioneers/x.game
+share/gnome/help/pioneers/C/images/actions.png
+share/gnome/help/pioneers/C/images/chat.png
+share/gnome/help/pioneers/C/images/client.png
+share/gnome/help/pioneers/C/images/connect-dialog.png
+share/gnome/help/pioneers/C/images/desert.png
+share/gnome/help/pioneers/C/images/develop-cards.png
+share/gnome/help/pioneers/C/images/discard-dialog.png
+share/gnome/help/pioneers/C/images/discards.png
+share/gnome/help/pioneers/C/images/field.png
+share/gnome/help/pioneers/C/images/forest.png
+share/gnome/help/pioneers/C/images/gameover-dialog.png
+share/gnome/help/pioneers/C/images/hill.png
+share/gnome/help/pioneers/C/images/identity.png
+share/gnome/help/pioneers/C/images/join-private-dialog.png
+share/gnome/help/pioneers/C/images/legend-dialog.png
+share/gnome/help/pioneers/C/images/map.png
+share/gnome/help/pioneers/C/images/messages.png
+share/gnome/help/pioneers/C/images/monopoly-dialog.png
+share/gnome/help/pioneers/C/images/mountain.png
+share/gnome/help/pioneers/C/images/pasture.png
+share/gnome/help/pioneers/C/images/place-robber.png
+share/gnome/help/pioneers/C/images/player-summary.png
+share/gnome/help/pioneers/C/images/plenty-dialog.png
+share/gnome/help/pioneers/C/images/quote.png
+share/gnome/help/pioneers/C/images/resources.png
+share/gnome/help/pioneers/C/images/sea.png
+share/gnome/help/pioneers/C/images/server-create.png
+share/gnome/help/pioneers/C/images/servers-dialog.png
+share/gnome/help/pioneers/C/images/status.png
+share/gnome/help/pioneers/C/images/steal-from.png
+share/gnome/help/pioneers/C/images/trade.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/gnome-pioneers.png
+share/gnome/pixmaps/pioneers/bridge.png
+share/gnome/pixmaps/pioneers/city.png
+share/gnome/pixmaps/pioneers/develop.png
+share/gnome/pixmaps/pioneers/dice.png
+share/gnome/pixmaps/pioneers/finish.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/trade.png
+share/locale/de/LC_MESSAGES/pioneers.mo
+share/locale/es/LC_MESSAGES/pioneers.mo
+share/locale/fr/LC_MESSAGES/pioneers.mo
+share/locale/it/LC_MESSAGES/pioneers.mo
+share/locale/nl/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
+@dirrm share/gnome/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