Use G_GNUC_FUNCTION instead of __FUNCTION__, to fix build on Solaris.

From maintainer Sergey Svishchev in private mail.
Bump PKGREVISION.

3 files changed, 60 insertions, 3 deletions

diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index cd2de7865d7..0551a6cba1b 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2007/09/25 10:07:06 hira Exp $
+# $NetBSD: Makefile,v 1.29 2007/12/09 23:23:03 wiz Exp $
 
 DISTNAME=	gtkballs-3.1.5
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	http://gtkballs.antex.ru/dist/
 
diff --git a/games/gtkballs/distinfo b/games/gtkballs/distinfo
index 9b018bccb07..bd9dfba0afa 100644
--- a/games/gtkballs/distinfo
+++ b/games/gtkballs/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2007/06/15 22:15:12 wiz Exp $
+$NetBSD: distinfo,v 1.11 2007/12/09 23:23:03 wiz Exp $
 
 SHA1 (gtkballs-3.1.5.tar.gz) = 778955036dc067d5b997ef351399d6ed050adc15
 RMD160 (gtkballs-3.1.5.tar.gz) = d3e103d9cd21e4b9fb950d95fac45db66cb92a5e
 Size (gtkballs-3.1.5.tar.gz) = 1176977 bytes
 SHA1 (patch-aa) = 559aeb861f4bcc0a5db0fea970e7811d57359b29
 SHA1 (patch-ab) = d993a646e8fb7dc85276a0307777c05bab5dc4ef
+SHA1 (patch-ac) = 84e7836154d4383429c89a2ce8c2a36f24bf7b89
diff --git a/games/gtkballs/patches/patch-ac b/games/gtkballs/patches/patch-ac
new file mode 100644
index 00000000000..5d177017416
--- /dev/null
+++ b/games/gtkballs/patches/patch-ac
@@ -0,0 +1,56 @@
+$NetBSD: patch-ac,v 1.1 2007/12/09 23:23:03 wiz Exp $
+
+--- src/themerc.c.orig	2002-11-14 14:06:33.000000000 +0000
++++ src/themerc.c
+@@ -25,31 +25,31 @@ gchar **trc_open(gchar *fname) {
+         gchar *rc,**rcs;
+ 
+         if((fd=open(fname, O_RDONLY))==-1) {
+-                fprintf(stderr, "%s: open() %s failed: %s\n", __FUNCTION__, fname, strerror(errno));
++                fprintf(stderr, "%s: open() %s failed: %s\n", G_GNUC_FUNCTION, fname, strerror(errno));
+                 return NULL;
+         }
+         if((fstat(fd, &fds))==-1) {
+                 close(fd);
+-                fprintf(stderr, "%s: fstat() failed: %s\n", __FUNCTION__, strerror(errno));
++                fprintf(stderr, "%s: fstat() failed: %s\n", G_GNUC_FUNCTION, strerror(errno));
+                 return NULL;
+         }
+         if(!(fds.st_size)) {
+                 close(fd);
+-                fprintf(stderr, "%s: zero length file.\n", __FUNCTION__);
++                fprintf(stderr, "%s: zero length file.\n", G_GNUC_FUNCTION);
+                 return NULL;
+         }
+         if(!(rc=malloc(fds.st_size+1))) {
+                 close(fd);
+-                fprintf(stderr, "%s: malloc() failed: cannot alloc %d bytes\n", __FUNCTION__, (int)fds.st_size);
++                fprintf(stderr, "%s: malloc() failed: cannot alloc %d bytes\n", G_GNUC_FUNCTION, (int)fds.st_size);
+                 return NULL;
+         }
+         if((rb=read(fd, rc, fds.st_size))!=fds.st_size) {
+                 free(rc);
+                 close(fd);
+                 if(rb==-1) {
+-                	fprintf(stderr, "%s: read() failed: %s\n", __FUNCTION__, strerror(errno));
++                	fprintf(stderr, "%s: read() failed: %s\n", G_GNUC_FUNCTION, strerror(errno));
+                 } else {
+-                	fprintf(stderr, "%s: read() reads less bytes than expected =/\n", __FUNCTION__);
++                	fprintf(stderr, "%s: read() reads less bytes than expected =/\n", G_GNUC_FUNCTION);
+                 }
+                 return NULL;
+         }
+@@ -73,11 +73,11 @@ gchar *trc_get_str(gchar **rcs, gchar *p
+         gchar **strval,*val;
+ 
+         if(!rcs) {
+-        	fprintf(stderr, "%s called with uninitialised rcs. strange. \n", __FUNCTION__);
++        	fprintf(stderr, "%s called with uninitialised rcs. strange. \n", G_GNUC_FUNCTION);
+ 		return NULL;
+         }
+         if(!param) {
+-        	fprintf(stderr, "%s called with NULL param. strange. \n", __FUNCTION__);
++        	fprintf(stderr, "%s called with NULL param. strange. \n", G_GNUC_FUNCTION);
+ 		return NULL;
+         }
+         for(i=0;rcs[i];i++) {