ports/70020: [MAINTAINER] games/gnocatan: update to 0.8.1.30

[Stefan Walter]

[The mail I sent on Friday seems to be stuck somewhere and hasn't made
it into the PR db, yet, so I'm resending it.]

Volker Stolz, 06.08.04, 13:51h CEST:

> > Hm...I looked at the code, but I don't see what the cause of this could
> > be. My knowledge about the differences between gcc 2 and 3 is limited,
> > and I don't have a -STABLE box to test it myself.
> > 
> > If anyone of you has any hints at what might be causing the build to
> > fail, please let me know. If not, I'll send the authors a mail about it.
> 
> Simply set USE_GCC=2.95 temporarily in the Makefile or find out what's the

Now I feel stupid...

> required option for requiring c89-compliance in CFLAGS. The usual source of
> complaints is variable declarations NOT at the beginning of blocks, e.g.

Thank you, I didn't know that, and it was the problem here.

The attached patch should make it work on -STABLE, too. Note that
libtool15 broke the build with a

libtool15: link: unable to infer tagged configuration
libtool15: link: specify a tag with `--tag'

when I used gcc 2.95, so it's using libtool13 for now again.

Thanks for your help,
Stefan
-------------- next part --------------
diff -urN gnocatan.old/Makefile gnocatan/Makefile
--- gnocatan.old/Makefile	Fri Aug  6 14:19:39 2004
+++ gnocatan/Makefile	Fri Aug  6 15:09:57 2004
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnocatan
-PORTVERSION=	0.8.1.16
-PORTREVISION=	1
+PORTVERSION=	0.8.1.30
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff -urN gnocatan.old/distinfo gnocatan/distinfo
--- gnocatan.old/distinfo	Fri Aug  6 14:19:39 2004
+++ gnocatan/distinfo	Fri Aug  6 14:19:56 2004
@@ -1,2 +1,2 @@
-MD5 (gnocatan-0.8.1.16.tar.gz) = 9dd31aad77a44ed2e3e8ba6c39e5aa7e
-SIZE (gnocatan-0.8.1.16.tar.gz) = 2116705
+MD5 (gnocatan-0.8.1.30.tar.gz) = 3ea69eb647eea4173979293d24d81f54
+SIZE (gnocatan-0.8.1.30.tar.gz) = 2053826
diff -urN gnocatan.old/files/patch-client_gtk_trade.c gnocatan/files/patch-client_gtk_trade.c
--- gnocatan.old/files/patch-client_gtk_trade.c	Thu Jan  1 01:00:00 1970
+++ gnocatan/files/patch-client_gtk_trade.c	Fri Aug  6 14:48:28 2004
@@ -0,0 +1,56 @@
+--- client/gtk/trade.c.orig	Fri Aug  6 14:40:41 2004
++++ client/gtk/trade.c	Fri Aug  6 14:44:54 2004
+@@ -197,16 +197,16 @@
+ static void load_pixmaps(void)
+ {
+ 	static gboolean init = FALSE;
++	int width, height;
++	GdkGC *gc;
++	GdkPixmap *pixmap;
++	gint i;
+ 
+ 	if (init) return;
+ 
+-	int width, height;
+ 	gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
+ 
+-	GdkPixmap *pixmap;
+ 	pixmap = gdk_pixmap_new(quotes->window, width, height, gtk_widget_get_visual(quotes)->depth);
+-	GdkGC *gc;
+-	gint i;
+ 
+ 	gc = gdk_gc_new(pixmap);
+ 	gdk_gc_set_foreground(gc, &black);
+@@ -349,6 +349,7 @@
+ 	QuoteInfo *quote;
+ 	QuoteInfo *prev;
+ 	gchar quote_desc[128];
++	GtkTreeIter iter;
+ 
+ 	for (quote = quotelist_first(quote_list);
+ 	     quote != NULL; quote = quotelist_next(quote))
+@@ -364,7 +365,6 @@
+ 	trade_format_maritime(quote, quote_desc);
+ 	prev = quotelist_prev(quote);
+ 
+-	GtkTreeIter iter;
+ 	quote_found_flag = FALSE;
+ 	if (prev != NULL)
+ 		gtk_tree_model_foreach(GTK_TREE_MODEL(store), trade_locate_quote, prev);
+@@ -536,6 +536,7 @@
+ static void add_trade_row(GtkWidget *table, TradeRow* row, Resource resource)
+ {
+ 	GtkWidget *label;
++	GtkWidget *frame;
+ 	gint col;
+ 
+ 	col = 0;
+@@ -549,7 +550,7 @@
+ 	col++;
+ 
+ 	/* Draw a border around the number */
+-	GtkWidget *frame = gtk_viewport_new(NULL, NULL);
++	frame = gtk_viewport_new(NULL, NULL);
+ 	gtk_viewport_set_shadow_type(GTK_VIEWPORT(frame), GTK_SHADOW_IN);
+ 	gtk_widget_show(frame);
+ 	gtk_table_attach(GTK_TABLE(table), frame,
diff -urN gnocatan.old/pkg-descr gnocatan/pkg-descr
--- gnocatan.old/pkg-descr	Fri Aug  6 14:19:39 2004
+++ gnocatan/pkg-descr	Fri Aug  6 14:19:56 2004
@@ -3,5 +3,3 @@
 as is possible.
 
 WWW: http://gnocatan.sourceforge.net/
-
--Adam <adam-ports at blacktabby.org>