From 18c0c8a5231b489f65ff874b82f8b2bc1aead94b Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 14 Dec 2003 17:44:32 +0000 Subject: Update to 0.8.0.0: Now using gnome2 libraries. Changes: - moving ships - gold resource - pirate ship - maps may specify locations where setup is not allowed. - It is now possible to view games. When logging in to a game which is full, the user is considered a viewer. Viewers don't play, but they can watch the others and chat. - bugfixes --- games/gnocatan/Makefile | 6 +- games/gnocatan/PLIST | 189 +++++++++++++++++++--------------------- games/gnocatan/distinfo | 10 ++- games/gnocatan/patches/patch-aa | 16 ++-- games/gnocatan/patches/patch-ab | 16 ++++ games/gnocatan/patches/patch-ac | 14 +++ 6 files changed, 137 insertions(+), 114 deletions(-) create mode 100644 games/gnocatan/patches/patch-ab create mode 100644 games/gnocatan/patches/patch-ac (limited to 'games/gnocatan') diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile index b4d905ca590..86f66566e1a 100644 --- a/games/gnocatan/Makefile +++ b/games/gnocatan/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2003/07/17 21:38:28 grant Exp $ +# $NetBSD: Makefile,v 1.13 2003/12/14 17:44:32 wiz Exp $ # -DISTNAME= gnocatan-0.7.1 +DISTNAME= gnocatan-0.8.0.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnocatan/} @@ -17,5 +17,5 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_PKGLOCALEDIR= YES USE_X11= YES -.include "../../x11/gnome-libs/buildlink2.mk" +.include "../../devel/libgnomeui/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/gnocatan/PLIST b/games/gnocatan/PLIST index 2a2391990f6..865384408f4 100644 --- a/games/gnocatan/PLIST +++ b/games/gnocatan/PLIST @@ -1,119 +1,110 @@ -@comment $NetBSD: PLIST,v 1.2 2003/07/13 13:59:36 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/12/14 17:44:32 wiz Exp $ bin/gnocatan -bin/gnocatanai bin/gnocatan-meta-server bin/gnocatan-server-console bin/gnocatan-server-gtk -share/gnocatan/5-6-player.game -share/gnocatan/canyon.game -share/gnocatan/computer_names -share/gnocatan/conquest+ports.game -share/gnocatan/conquest.game -share/gnocatan/default.game -share/gnocatan/four-islands.game -share/gnocatan/pond.game -share/gnocatan/seafarers.game -share/gnocatan/small.game -share/gnocatan/square.game -share/gnocatan/star.game -share/gnocatan/x.game +bin/gnocatanai +man/man6/gnocatan-server-console.6 +man/man6/gnocatan-server-gtk.6 +man/man6/gnocatan.6 +share/games/gnocatan/5-6-player.game +share/games/gnocatan/canyon.game +share/games/gnocatan/computer_names +share/games/gnocatan/conquest+ports.game +share/games/gnocatan/conquest.game +share/games/gnocatan/default.game +share/games/gnocatan/four-islands.game +share/games/gnocatan/images/FreeCIV-like/board.png +share/games/gnocatan/images/FreeCIV-like/desert.png +share/games/gnocatan/images/FreeCIV-like/field.png +share/games/gnocatan/images/FreeCIV-like/forest.png +share/games/gnocatan/images/FreeCIV-like/hill.png +share/games/gnocatan/images/FreeCIV-like/mountain.png +share/games/gnocatan/images/FreeCIV-like/pasture.png +share/games/gnocatan/images/FreeCIV-like/sea.png +share/games/gnocatan/images/FreeCIV-like/theme.cfg +share/games/gnocatan/images/Iceland/desert.png +share/games/gnocatan/images/Iceland/field_grain.png +share/games/gnocatan/images/Iceland/forest_lumber.png +share/games/gnocatan/images/Iceland/gold.png +share/games/gnocatan/images/Iceland/hill_brick.png +share/games/gnocatan/images/Iceland/mountain_ore.png +share/games/gnocatan/images/Iceland/pasture_wool.png +share/games/gnocatan/images/Iceland/theme.cfg +share/games/gnocatan/images/board.png +share/games/gnocatan/images/cross.png +share/games/gnocatan/images/desert.png +share/games/gnocatan/images/field.png +share/games/gnocatan/images/forest.png +share/games/gnocatan/images/gold.png +share/games/gnocatan/images/hill.png +share/games/gnocatan/images/mountain.png +share/games/gnocatan/images/pasture.png +share/games/gnocatan/images/plain.png +share/games/gnocatan/images/sea.png +share/games/gnocatan/images/splash.png +share/games/gnocatan/images/tick.png +share/games/gnocatan/pond.game +share/games/gnocatan/seafarers-gold.game +share/games/gnocatan/seafarers.game +share/games/gnocatan/small.game +share/games/gnocatan/square.game +share/games/gnocatan/star.game +share/games/gnocatan/x.game +share/gnome/apps/Games/gnocatan-server.desktop share/gnome/apps/Games/gnocatan.desktop -share/gnome/help/gnocatan/C/c18.html -share/gnome/help/gnocatan/C/c247.html -share/gnome/help/gnocatan/C/c27.html -share/gnome/help/gnocatan/C/c530.html -share/gnome/help/gnocatan/C/images/actions.gif -share/gnome/help/gnocatan/C/images/chat.gif -share/gnome/help/gnocatan/C/images/client.gif -share/gnome/help/gnocatan/C/images/connect-dialog.gif -share/gnome/help/gnocatan/C/images/desert.gif -share/gnome/help/gnocatan/C/images/develop-cards.gif -share/gnome/help/gnocatan/C/images/discard-dialog.gif -share/gnome/help/gnocatan/C/images/discards.gif -share/gnome/help/gnocatan/C/images/field.gif -share/gnome/help/gnocatan/C/images/forest.gif -share/gnome/help/gnocatan/C/images/gameover-dialog.gif -share/gnome/help/gnocatan/C/images/hill.gif -share/gnome/help/gnocatan/C/images/identity.gif -share/gnome/help/gnocatan/C/images/legend-dialog.gif -share/gnome/help/gnocatan/C/images/map.gif -share/gnome/help/gnocatan/C/images/messages.gif -share/gnome/help/gnocatan/C/images/monopoly-dialog.gif -share/gnome/help/gnocatan/C/images/mountain.gif -share/gnome/help/gnocatan/C/images/pasture.gif -share/gnome/help/gnocatan/C/images/place-robber.gif -share/gnome/help/gnocatan/C/images/player-summary.gif -share/gnome/help/gnocatan/C/images/plenty-dialog.gif -share/gnome/help/gnocatan/C/images/quote.gif -share/gnome/help/gnocatan/C/images/resources.gif -share/gnome/help/gnocatan/C/images/sea.gif -share/gnome/help/gnocatan/C/images/server-create.gif -share/gnome/help/gnocatan/C/images/servers-dialog.gif -share/gnome/help/gnocatan/C/images/status.gif -share/gnome/help/gnocatan/C/images/steal-from.gif -share/gnome/help/gnocatan/C/images/trade.gif -share/gnome/help/gnocatan/C/index.html -share/gnome/help/gnocatan/C/topic.dat -share/gnome/help/gnocatan/C/x109.html -share/gnome/help/gnocatan/C/x116.html -share/gnome/help/gnocatan/C/x123.html -share/gnome/help/gnocatan/C/x131.html -share/gnome/help/gnocatan/C/x195.html -share/gnome/help/gnocatan/C/x231.html -share/gnome/help/gnocatan/C/x238.html -share/gnome/help/gnocatan/C/x24.html -share/gnome/help/gnocatan/C/x289.html -share/gnome/help/gnocatan/C/x295.html -share/gnome/help/gnocatan/C/x331.html -share/gnome/help/gnocatan/C/x412.html -share/gnome/help/gnocatan/C/x43.html -share/gnome/help/gnocatan/C/x492.html -share/gnome/help/gnocatan/C/x509.html +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/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/player-summary.png +share/gnome/help/gnocatan/C/images/plenty-dialog.png +share/gnome/help/gnocatan/C/images/quote.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/help/gnocatan/C/legal.xml ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnocatan.mo -share/pixmaps/gnocatan/board.png +${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnocatan.mo +share/omf/gnocatan/gnocatan-C.omf share/pixmaps/gnocatan/bridge.png share/pixmaps/gnocatan/city.png -share/pixmaps/gnocatan/cross.png -share/pixmaps/gnocatan/desert.png share/pixmaps/gnocatan/develop.png share/pixmaps/gnocatan/dice.png -share/pixmaps/gnocatan/field.png share/pixmaps/gnocatan/finish.png -share/pixmaps/gnocatan/forest.png -share/pixmaps/gnocatan/hill.png -share/pixmaps/gnocatan/mountain.png -share/pixmaps/gnocatan/pasture.png -share/pixmaps/gnocatan/plain.png share/pixmaps/gnocatan/road.png -share/pixmaps/gnocatan/sea.png share/pixmaps/gnocatan/settlement.png share/pixmaps/gnocatan/ship.png -share/pixmaps/gnocatan/splash.png -share/pixmaps/gnocatan/themes/FreeCIV-like/board.png -share/pixmaps/gnocatan/themes/FreeCIV-like/desert.png -share/pixmaps/gnocatan/themes/FreeCIV-like/field.png -share/pixmaps/gnocatan/themes/FreeCIV-like/forest.png -share/pixmaps/gnocatan/themes/FreeCIV-like/hill.png -share/pixmaps/gnocatan/themes/FreeCIV-like/mountain.png -share/pixmaps/gnocatan/themes/FreeCIV-like/pasture.png -share/pixmaps/gnocatan/themes/FreeCIV-like/sea.png -share/pixmaps/gnocatan/themes/FreeCIV-like/theme.cfg -share/pixmaps/gnocatan/themes/Iceland/desert.png -share/pixmaps/gnocatan/themes/Iceland/field_grain.png -share/pixmaps/gnocatan/themes/Iceland/forest_lumber.png -share/pixmaps/gnocatan/themes/Iceland/gold.png -share/pixmaps/gnocatan/themes/Iceland/hill_brick.png -share/pixmaps/gnocatan/themes/Iceland/mountain_ore.png -share/pixmaps/gnocatan/themes/Iceland/pasture_wool.png -share/pixmaps/gnocatan/themes/Iceland/theme.cfg -share/pixmaps/gnocatan/tick.png +share/pixmaps/gnocatan/ship_move.png share/pixmaps/gnocatan/trade.png share/pixmaps/gnome-gnocatan.png -@dirrm share/pixmaps/gnocatan/themes/Iceland -@dirrm share/pixmaps/gnocatan/themes/FreeCIV-like -@dirrm share/pixmaps/gnocatan/themes @dirrm share/pixmaps/gnocatan +@dirrm share/omf/gnocatan @dirrm share/gnome/help/gnocatan/C/images @dirrm share/gnome/help/gnocatan/C @dirrm share/gnome/help/gnocatan -@dirrm share/gnocatan +@dirrm share/games/gnocatan/images/Iceland +@dirrm share/games/gnocatan/images/FreeCIV-like +@dirrm share/games/gnocatan/images +@dirrm share/games/gnocatan diff --git a/games/gnocatan/distinfo b/games/gnocatan/distinfo index 3190f1ea91f..21ae44630ca 100644 --- a/games/gnocatan/distinfo +++ b/games/gnocatan/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.3 2003/07/13 13:59:36 wiz Exp $ +$NetBSD: distinfo,v 1.4 2003/12/14 17:44:32 wiz Exp $ -SHA1 (gnocatan-0.7.1.tar.gz) = 1a0e72cffdb5ad2cd70e7e16eea06fd803d67019 -Size (gnocatan-0.7.1.tar.gz) = 1639979 bytes -SHA1 (patch-aa) = c5919dd1441b0570dc2b624b93b8aba21d836ae0 +SHA1 (gnocatan-0.8.0.0.tar.gz) = a74ea38c898fe3cb7354de508c02c2854b7476fd +Size (gnocatan-0.8.0.0.tar.gz) = 1667559 bytes +SHA1 (patch-aa) = adf2491a56f0b5c794f5100ed395441a073f64f0 +SHA1 (patch-ab) = 5cab59676c1e92f86a61ffdfa3eb17949ae8c37e +SHA1 (patch-ac) = 88d0761df8ea408039504f6a01153b0d75b5fc08 diff --git a/games/gnocatan/patches/patch-aa b/games/gnocatan/patches/patch-aa index 49396d2518c..e7d78667475 100644 --- a/games/gnocatan/patches/patch-aa +++ b/games/gnocatan/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.3 2003/07/13 13:59:37 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2003/12/14 17:44:32 wiz Exp $ ---- client/Makefile.in.orig Sat Jul 12 15:17:14 2003 +--- client/Makefile.in.orig Tue Oct 14 16:50:26 2003 +++ client/Makefile.in -@@ -687,7 +687,7 @@ dist-hook: +@@ -710,7 +710,7 @@ dist-hook: install-data-hook: - mkdir -p $(DESTDIR)$(pixmapdir)/themes + mkdir -p $(DESTDIR)$(imagedir) tar -c -f - -C themes . | \ -- tar -x -f - --mode=u+w,ugo+rX --no-same-owner -C $(DESTDIR)$(pixmapdir)/themes -+ tar -x -f - -C $(DESTDIR)$(pixmapdir)/themes - find $(DESTDIR)$(pixmapdir)/themes -name CVS | xargs rm -rf +- tar -x -f - --mode=u+w,ugo+rX --no-same-owner -C $(DESTDIR)$(imagedir) ++ tar -x -f - -C $(DESTDIR)$(imagedir) + find $(DESTDIR)$(imagedir) -name CVS | xargs rm -rf - # We don't need this, do we? -- egnor + gui.o: authors.h diff --git a/games/gnocatan/patches/patch-ab b/games/gnocatan/patches/patch-ab new file mode 100644 index 00000000000..15ae0cdf884 --- /dev/null +++ b/games/gnocatan/patches/patch-ab @@ -0,0 +1,16 @@ +$NetBSD: patch-ab,v 1.1 2003/12/14 17:44:32 wiz Exp $ + +--- client/player.c.orig Mon Oct 13 01:02:06 2003 ++++ client/player.c +@@ -217,10 +217,10 @@ static gint player_insert_summary_row_be + gchar *points, void *data, GdkColor *colour, gboolean new) + { + gchar *row_data[3]; ++ GtkStyle *current_style = gtk_style_new(); + row_data[0] = ""; + row_data[1] = name; + row_data[2] = points; +- GtkStyle *current_style = gtk_style_new(); + current_style->fg[0] = *colour; + current_style->bg[0] = player_bg; + if (new) { diff --git a/games/gnocatan/patches/patch-ac b/games/gnocatan/patches/patch-ac new file mode 100644 index 00000000000..23201dfe45e --- /dev/null +++ b/games/gnocatan/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.1 2003/12/14 17:44:32 wiz Exp $ + +--- common/game.c.orig Tue Oct 14 12:13:05 2003 ++++ common/game.c +@@ -174,8 +174,8 @@ static gboolean find_no_setup (Map *map, + for (idx = 0; idx < numElem (hex->nodes); ++idx) { + Node *node = hex->nodes[idx]; + if (node->no_setup) { +- if (node->x != hex->x || node->y != hex->y) continue; + gchar buff[512]; ++ if (node->x != hex->x || node->y != hex->y) continue; + snprintf (buff, sizeof(buff), "nosetup %d %d %d", + node->x, node->y, node->pos); + data->func (data->user_data, buff); -- cgit v1.2.3