fix from monotone mainline fbfd9b42c9e9fdb5d45e806cab07ad0dd57f7bf8:

  cmd_automate.cc, cmd.hh, ...: renamed member variable "options" to
  "opts" to make (hopefully) the gcc-3.3 build slaves happy

This went in just after the 0.31 release, but never made it to pkgsrc
until now.

5 files changed, 100 insertions, 2 deletions

diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 6a226c54038..80d0b1d3e27 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/11/23 17:38:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2006/12/11 08:13:13 dan Exp $
 #
 
 DISTNAME=	monotone-0.31
@@ -9,6 +9,8 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://monotone.ca/
 COMMENT=	Free distributed version control system
 
+PKGREVISION=	1
+
 GCC_REQD+=		3.0
 GNU_CONFIGURE=		yes
 INFO_FILES=		# PLIST
diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo
index 2dd7dabd3ec..918198696ba 100644
--- a/devel/monotone/distinfo
+++ b/devel/monotone/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.24 2006/11/24 12:51:39 drochner Exp $
+$NetBSD: distinfo,v 1.25 2006/12/11 08:13:13 dan Exp $
 
 SHA1 (monotone-0.31.tar.gz) = 67d72bac1b145835fb8c2f0a52072aeb18940f17
 RMD160 (monotone-0.31.tar.gz) = 03bc93be570297591b2f88bedba4f7950de70487
 Size (monotone-0.31.tar.gz) = 4743694 bytes
+SHA1 (patch-aa) = 8e1660df1bb9dd27e94231f25e3a34321df18509
+SHA1 (patch-ab) = c7ab1b1a3e64b8204732631744dd9be1c6151d05
+SHA1 (patch-ac) = 9cbecb46b80b300f78b45795ab9c5ed101ffb629
diff --git a/devel/monotone/patches/patch-aa b/devel/monotone/patches/patch-aa
new file mode 100644
index 00000000000..bf296e41fc3
--- /dev/null
+++ b/devel/monotone/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.11 2006/12/11 08:13:13 dan Exp $
+
+--- cmd.hh	b603bd9f4ad5e79d24d128694352376d0d5719a6
++++ cmd.hh	142898bfbb49704a60be81e5e01ddef553d32ea6
+@@ -35,7 +35,7 @@ namespace commands
+     std::string params_;
+     std::string desc_;
+     bool use_workspace_options;
+-    options::options_type options;
++    options::options_type opts;
+     command(std::string const & n,
+             std::string const & g,
+             std::string const & p,
+@@ -180,7 +180,7 @@ namespace commands {                    
+     cmd_ ## C() : command(#C, realcommand##_cmd.cmdgroup,            \
+                           realcommand##_cmd.params_,                 \
+                           realcommand##_cmd.desc_, true,             \
+-                          realcommand##_cmd.options)                 \
++                          realcommand##_cmd.opts)                 \
+     {}                                                               \
+     virtual std::string desc();                                      \
+     virtual void exec(app_state & app,                               \
+@@ -206,7 +206,7 @@ namespace automation {
+   {
+     std::string name;
+     std::string params;
+-    options::options_type options;
++    options::options_type opts;
+     automate(std::string const & n, std::string const & p,
+              options::options_type const & o);
+     virtual void run(std::vector<utf8> args,
diff --git a/devel/monotone/patches/patch-ab b/devel/monotone/patches/patch-ab
new file mode 100644
index 00000000000..9196777c5e7
--- /dev/null
+++ b/devel/monotone/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.5 2006/12/11 08:13:13 dan Exp $
+
+--- cmd_automate.cc	eaa1ad0948253c507dfafc1521b8885260ba2db6
++++ cmd_automate.cc	5b90227ffcfe111cead5ab503b2df2ed81899835
+@@ -28,7 +28,7 @@ namespace automation {
+   static map<string, automate * const> * automations;
+   automate::automate(string const &n, string const &p,
+                      options::options_type const & o)
+-    : name(n), params(p), options(o)
++    : name(n), params(p), opts(o)
+   {
+     static bool first(true);
+     if (first)
+@@ -350,7 +350,7 @@ AUTOMATE(stdio, "", options::opts::autom
+       try
+         {
+           options::options_type opts = options::opts::globals();
+-          opts = opts | find_automation(cmd, help_name).options;
++          opts = opts | find_automation(cmd, help_name).opts;
+           opts.instantiate(&app.opts).from_key_value_pairs(params);
+           automate_command(cmd, args, help_name, app, os);
+         }
+@@ -402,7 +402,7 @@ commands::cmd_automate::get_options(vect
+ {
+   if (args.size() < 2)
+     return options::options_type();
+-  return find_automation(idx(args,1), idx(args,0)()).options;
++  return find_automation(idx(args,1), idx(args,0)()).opts;
+ }
+ 
+ 
diff --git a/devel/monotone/patches/patch-ac b/devel/monotone/patches/patch-ac
new file mode 100644
index 00000000000..2d0a2c9ef6c
--- /dev/null
+++ b/devel/monotone/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.3 2006/12/11 08:13:13 dan Exp $
+
+--- commands.cc	a46a10ed30eab12e318db1db9b48d100f1009ce1
++++ commands.cc	67676365ab02c505dbf5467645943b2a84f1d8b2
+@@ -68,7 +68,7 @@ namespace commands
+                    bool u,
+                    options::options_type const & o)
+     : name(n), cmdgroup(g), params_(p), desc_(d), use_workspace_options(u),
+-      options(o)
++      opts(o)
+   {
+     if (cmds == NULL)
+       cmds = new map<string, command *>;
+@@ -79,7 +79,7 @@ namespace commands
+   std::string command::desc() {return safe_gettext(desc_.c_str());}
+   options::options_type command::get_options(vector<utf8> const & args)
+   {
+-    return options;
++    return opts;
+   }
+   bool operator<(command const & self, command const & other);
+   std::string const & hidden_group()
+@@ -262,7 +262,7 @@ namespace commands
+   {
+     if ((*cmds).find(cmd) != (*cmds).end())
+       {
+-        return (*cmds)[cmd]->options;
++        return (*cmds)[cmd]->opts;
+       }
+     else
+       {