[pkgsrc/trunk]: pkgsrc/wm/sawfish Fixed the duplicate symbol prog_name.

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/592c7a119a6d
branches:  trunk
changeset: 526714:592c7a119a6d
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Mar 17 16:50:50 2007 +0000

description:
Fixed the duplicate symbol prog_name.

diffstat:

 wm/sawfish/distinfo         |   3 ++-
 wm/sawfish/patches/patch-ae |  26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletions(-)

diffs (44 lines):

diff -r 51500660824d -r 592c7a119a6d wm/sawfish/distinfo
--- a/wm/sawfish/distinfo       Sat Mar 17 16:48:49 2007 +0000
+++ b/wm/sawfish/distinfo       Sat Mar 17 16:50:50 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 18:43:55 wiz Exp $
+$NetBSD: distinfo,v 1.9 2007/03/17 16:50:50 rillig Exp $
 
 SHA1 (sawfish-1.2-gtk1.tar.gz) = 03ea1b6aa917db7ec52047c661bbadef8793e74a
 RMD160 (sawfish-1.2-gtk1.tar.gz) = ffe716a8ab7b36e53c58906cd8de74f7600695ca
@@ -7,3 +7,4 @@
 SHA1 (patch-ab) = 20ffaa03c787c0edaee2cdeea5855395ebb57fdc
 SHA1 (patch-ac) = 0f9558d5c968074d5ecf76534952478f128c2c29
 SHA1 (patch-ad) = aa2a4b382688ec954ff01b1a97299801a42e7c11
+SHA1 (patch-ae) = 51325e250aa5cea10203bd215720f2f7f2a32347
diff -r 51500660824d -r 592c7a119a6d wm/sawfish/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/sawfish/patches/patch-ae       Sat Mar 17 16:50:50 2007 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-ae,v 1.1 2007/03/17 16:50:50 rillig Exp $
+
+gcc4 complains:
+main.c:50: error: static declaration of 'prog_name' follows non-static declaration
+sawmill_subrs.h:54: error: previous declaration of 'prog_name' was here
+
+--- src/main.c.orig    2002-04-10 05:59:54.000000000 +0200
++++ src/main.c 2007-03-17 17:46:34.000000000 +0100
+@@ -46,9 +46,6 @@
+ /* one of the ec_ values */
+ int exit_code = ec_no_exit;
+ 
+-/* Saved value of argv[0] */
+-static char *prog_name;
+-
+ DEFSYM(sawfish_directory, "sawfish-directory");
+ DEFSYM(sawfish_lisp_lib_directory, "sawfish-lisp-lib-directory");
+ DEFSYM(sawfish_site_lisp_directory, "sawfish-site-lisp-directory");
+@@ -333,6 +330,7 @@ main(int argc, char **argv)
+     char **old_argv;
+     int old_argc;
+     char *lang;
++    const char *prog_name;
+ 
+     /* This will fork multiple copies, if necessary */
+     multihead_init (&argc, &argv);