Update to 0.32. Tested under NetBSD 4.99.7 and Mac OS X Tiger:

	Changes

	- "mtn serve" no longer takes patterns on the command line.
	  Use the permissions hooks instead.

	- the name of the option that denoted the revision from which
	  "mtn log" should start logging was renamed from "--revision"
	  to "--from"

	- author selectors no longer have implicit wildcarding

	- if you manually add entries to MTN/log while you are
	  working, in preparation for an eventual commit, you will now
	  be required to remove a "magic" template line from the file
	  before the commit will succeed. This, like the test for an
	  empty log file, helps to prevent accidents.

	- the "db regenerate_caches" migration command replaces the
	  previous "db regenerate_rosters", generalising the task of
	  rebuilding or generating cached data that may be added
	  across an upgrade.  Like "db migrate", which upgrades the
	  database schema, this command fills in the data for new
	  features. In this release, as well as rosters, it also adds
	  "heights" information used to speed up topology operations.

	Speed improvements

	- "mtn annotate file" and "mtn log file" are generally much
	  faster now, dependant on the number of revisions that
	  changed the file. Both commands as well as "mtn automate
	  toposort" make use of data called "heights" caching the
	  topological order of all revisions.  In order to create and
	  use this data, the following must be run once for each db
	  after upgrading:

               $ mtn -d mydb.mtn db regenerate_caches

	New features

	- "mtn automate content_diff"

	- "mtn automate get_file_of" (same as get_file, but expects
	  a file path and optionally a revision)

	- "mtn import" command

	- "mtn log --to"

	- netsync_note_* hooks are given much more information,
	  inlcuding a http/smtp/etc style status code

	- includedirpattern(dir, fileglob) function for hooks


	Bugs fixed

	- bug in "automate stdio" that would result in monotone
	  garbling its input in some circumstances fixed

	- "mtn annotate file" and "mtn log file" are generally much
	  faster now, dependant on the number of revisions that
	  changed the file. Both commands as well as "mtn automate
	  toposort" make use of data called "heights" caching the
	  topological order of all revisions.

	- spawn_redirected hook function now understands a blank
	  filename to mean not to redirect that stream

	- "mtn log" is now in proper topological order, also due to
	  the use of cached "heights" data

	- reset options between "automate stdio" commands

	- another compile fix for gcc3

	- bug in localization code where option strings where not
	  always properly translated


	Other

	- botan library upgraded to 1.6.0

	- accommodate changes in boost 1.34

	- documentation for "mtn automate get_option"

	- notes/ directory

5 files changed, 6 insertions, 103 deletions

diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 5c5b569ea49..813690b2099 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2006/12/31 17:38:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2007/01/02 11:09:57 jmmv Exp $
 #
 
-DISTNAME=	monotone-0.31
-PKGREVISION=	1
+DISTNAME=	monotone-0.32
 CATEGORIES=	devel
 MASTER_SITES=	http://monotone.ca/downloads/
 
diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo
index 918198696ba..d1912dfde59 100644
--- a/devel/monotone/distinfo
+++ b/devel/monotone/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.25 2006/12/11 08:13:13 dan Exp $
+$NetBSD: distinfo,v 1.26 2007/01/02 11:09:57 jmmv 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
+SHA1 (monotone-0.32.tar.gz) = 22e6ee1bb761cc8670756d78827b0684902832fd
+RMD160 (monotone-0.32.tar.gz) = 12c7992c62ff3ec9ec1fa2462a7ec532840dc129
+Size (monotone-0.32.tar.gz) = 4840983 bytes
diff --git a/devel/monotone/patches/patch-aa b/devel/monotone/patches/patch-aa
deleted file mode 100644
index bf296e41fc3..00000000000
--- a/devel/monotone/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$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
deleted file mode 100644
index 9196777c5e7..00000000000
--- a/devel/monotone/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$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
deleted file mode 100644
index 2d0a2c9ef6c..00000000000
--- a/devel/monotone/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$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
-       {