Update to 1.0; oked by wiz@:

Changes

- The database scheme was changed; please execute 'mtn db migrate'
  on all your local and remote databases.

- In 'mtn conflicts resolve_first interactive', the result
  file name now defaults to _MTN/resolutions/<left_path>.
  (fixes monotone issue 103)

- The French monotone translation has been updated and is
  now part of the main distribution again. Many thanks to
  Steve Petruzzello <dlist@bluewin.ch> for the outstanding
  work!

- get_netsync_(read|write)_permitted have been extended to not
  only read the files read-permissions and write-permissions,
  but also the files in the subdirectories read-permissions.d
  and write-permissions.d.

- monotone now also tracks the workspaces of databases which
  do not reside in a "managed" location.

- automate now resets the locale to "POSIX" internally.  This
  means that all scripts can expect the same untranslated
  messages from mtn automate, regardless of the locale of the
  calling process.

- The hook 'get_netsync_key' has been split up into two separate
  hooks, one for client usage ('get_netsync_client_key', with
  the same arguments as the original 'get_netsync_key') and one
  for server usage ('get_netsync_server_key', with a single table
  argument containing all the given '--bind' options).  Please
  review your custom hooks accordingly.

- Short options ('-b', '-d', ...) are no longer completed.  This
  fixes an invariant failure originating from wrong option usage.
  (closes monotone issue 141)

New Features

- 'mtn conflicts store' now outputs a count of the conflicts,
  and the name of the conflicts file.
  (fixes monotone issue 108)

- New 'mtn list workspaces' command which outputs all the
  known workspaces for a specific database.
  (closes monotone issue 129)

Bugs fixed

- The internal line merger will actually preserve your line
  endings now, instead of changing everything to "\n".

- Improved the help and fixed the argument indexing in
  'conflicts resolve_first' (fixes monotone issue 101)

- A regression from 0.48 prevented monotone from ordering the
  diff output of individual files alphabetically.
  (fixes monotone issue 102)

- 'mtn privkey' did not recognize private keys solely available
  in the key store. This has been fixed.

- Added compatibility with Botan 1.9.9 and newer.
  (fixes monotone issue 104)

- 'mtn pull' and 'mtn sync' would always say that your workspace
  has not been updated.  Now, it only does that when you used
  the '--update' option and there were no updates.
  (fixes monotone issue 106)

- 'mtn automate remote' and 'mtn automate remote_stdio' now use
  a given database given by an alias to read, store and validate
  a remote server's key fingerprint (fixes monotone issue 95)

- monotone gives a proper error message now if a netsync URI
  with the 'mtn' scheme misses the required host part
  (fixes monotone issue 110)

- Whenever a binary file was removed and one would try to get
  a diff using mtn diff, it would report that "/dev/null is
  binary".  This has been changed to it reports the actual
  name of the removed file instead.
  (fixes monotone issue 111)

- monotone no longer wrongly falls back on a :memory: database
  when no database option is given. It also prints out an
  informational message for commands like 'setup' and 'clone'
  that fall back on the configured default database, again,
  if no database is specified for these commands.
  (fixes monotone issue 113)

- If 'mtn serve' is called with one or more '--bind' options,
  then the arguments to these options can now be specified
  again as follows:

    '<ip-or-host>'
        to listen to IP or host on the default port
    '<ip-or-host>:<port>'
        to listen to IP or host on the specified port  - or
    ':<port>'
        to listen on all interfaces on the specified port

  (fixes monotone issue 119)

- monotone no longer enforces ".mtn" as file extension for
  managed databases.  A new Lua hook, get_default_database_glob(),
  is used instead to determine a pattern which matches
  accepted database filenames and this pattern by default
  accept files ending with both, ".mtn" and ".db".
  (fixes monotone issue 128)

- monotone now gives a proper error message when an incomplete
  or partial identifier contains non-hex digits.
  (fixes monotone issue 143)

- Performance of "mtn ls changed" has been improved and is now
  comparable to "mtn status". (fixes monotone issue 120)

Internal

- The source tree has been reorganized. Sources, tests and
  documentation now reside in specific directories and many
  smaller improvements in terms of source code cleanup,
  developer documentation and general build infrastructure
  accompany this big change.

Other

- Added a new directory extra/, which contains monotone hooks and
  related scripts that have been shown to work.  Most of these get
  installed, usually somewhere under $(prefix)/share/monotone.
  Please read extra/README for further information.

- Added the mtn-cleanup Perl script that returns a workspace to its
  pristine state with the minimum amount of change. This script is
  in the extra/bin directory.

3 files changed, 72 insertions, 97 deletions

diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 3b039a2a243..faf354ff163 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.67 2010/11/30 11:48:39 drochner Exp $
+# $NetBSD: Makefile,v 1.68 2011/04/01 13:51:54 jmmv Exp $
 #
 
-DISTNAME=	monotone-0.99.1
+DISTNAME=	monotone-1.0
 CATEGORIES=	devel scm
-MASTER_SITES=	http://monotone.ca/downloads/0.99.1/
+MASTER_SITES=	http://monotone.ca/downloads/1.0/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://monotone.ca/
@@ -17,12 +18,14 @@ INFO_FILES=		yes
 LICENSE=		gnu-gpl-v2 OR gnu-gpl-v3 # OR newer
 TEST_TARGET=		check
 UNLIMIT_RESOURCES+=	datasize
-USE_TOOLS+=		gmake makeinfo pax pkg-config
+USE_TOOLS+=		gmake makeinfo pax perl pkg-config
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--with-system-pcre
 
+INSTALL_MAKE_FLAGS+=	bashcompdir=${PREFIX:Q}/share/examples/monotone
+
 PKG_OPTIONS_VAR=	PKG_OPTIONS.monotone
 PKG_SUPPORTED_OPTIONS=	inet6
 
@@ -41,13 +44,6 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 INSTALLATION_DIRS+=	share/monotone
 
-post-install:
-	cd ${WRKSRC} && rm -rf contrib/.deps && \
-	    pax -rw -pm contrib \
-	    ${DESTDIR}${PREFIX}/share/monotone
-	cd ${WRKSRC} && pax -rw -pm figures/*.png \
-	    ${DESTDIR}${PREFIX}/share/doc/monotone
-
 BUILDLINK_API_DEPENDS.pcre+=	pcre>=7.6
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/devel/monotone/PLIST b/devel/monotone/PLIST
index e4458b24adb..8354f684a5c 100644
--- a/devel/monotone/PLIST
+++ b/devel/monotone/PLIST
@@ -1,90 +1,69 @@
-@comment $NetBSD: PLIST,v 1.22 2010/11/07 20:51:45 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.23 2011/04/01 13:51:54 jmmv Exp $
 bin/mtn
+bin/mtn-cleanup
 bin/mtnopt
 info/monotone.info
+man/man1/mtn-cleanup.1
 man/man1/mtn.1
-share/doc/monotone/figures/branch-heads.png
-share/doc/monotone/figures/cert.png
-share/doc/monotone/figures/difference-between-versions.png
-share/doc/monotone/figures/file-id-manifest-id.png
-share/doc/monotone/figures/fork.png
-share/doc/monotone/figures/general-workflow.png
-share/doc/monotone/figures/linear-history.png
-share/doc/monotone/figures/local-workflow.png
-share/doc/monotone/figures/manifest.png
-share/doc/monotone/figures/merge.png
-share/doc/monotone/figures/network-workflow.png
-share/doc/monotone/figures/parent-child-hashes.png
-share/doc/monotone/figures/parent-child-names-hashes.png
-share/doc/monotone/figures/parent-child.png
-share/doc/monotone/figures/revision-chaining.png
-share/doc/monotone/figures/revision.png
-share/doc/monotone/figures/statement.png
-share/doc/monotone/figures/three-versions.png
-share/doc/monotone/figures/two-branches.png
-share/doc/monotone/images/bg.png
-share/doc/monotone/images/go-next.png
-share/doc/monotone/images/go-previous.png
-share/doc/monotone/images/go-up.png
-share/doc/monotone/images/toc.png
-share/doc/monotone/monotone.html
-share/doc/monotone/texinfo.css
+man/man1/mtnopt.1
+share/doc/monotone/contrib/Attic/monotone-nav.el
+share/doc/monotone/contrib/Attic/recreate-manifest-tables.sh
+share/doc/monotone/contrib/ChangeLog.sh
+share/doc/monotone/contrib/Monotone.pm
+share/doc/monotone/contrib/README
+share/doc/monotone/contrib/README.missing
+share/doc/monotone/contrib/bisect.sh
+share/doc/monotone/contrib/ciabot_monotone.py
+share/doc/monotone/contrib/color-logs.conf
+share/doc/monotone/contrib/color-logs.sh
+share/doc/monotone/contrib/colorize
+share/doc/monotone/contrib/command/README
+share/doc/monotone/contrib/command/base.lua
+share/doc/monotone/contrib/command/conflicts.lua
+share/doc/monotone/contrib/command/fuse.lua
+share/doc/monotone/contrib/command/init.lua
+share/doc/monotone/contrib/command/remote_export.lua
+share/doc/monotone/contrib/command/revision.lua
+share/doc/monotone/contrib/dtrace2calltree.py
+share/doc/monotone/contrib/edit_comment_from_changelog.lua
+share/doc/monotone/contrib/extra-commands.lua
+share/doc/monotone/contrib/get_stdio.pl
+share/doc/monotone/contrib/monoprof.sh
+share/doc/monotone/contrib/monotone-inotify.lua
+share/doc/monotone/contrib/monotone-log-of-pulled-revs-hook.lua
+share/doc/monotone/contrib/monotone-mirror-postaction-push.sh
+share/doc/monotone/contrib/monotone-mirror-postaction-update.sh
+share/doc/monotone/contrib/monotone-mirror.lua
+share/doc/monotone/contrib/monotone-mirror.sh
+share/doc/monotone/contrib/monotone-run-script-post-netsync.lua
+share/doc/monotone/contrib/monotone.zsh_completion
+share/doc/monotone/contrib/mtbrowse.sh
+share/doc/monotone/contrib/op2calltree.py
+share/doc/monotone/contrib/parse-accounting.pl
+share/doc/monotone/contrib/perf-test.sh
+share/doc/monotone/examples/000README.txt
+share/doc/monotone/examples/mirror.rc
+share/doc/monotone/examples/push.rc
+share/doc/monotone/examples/read-permissions
+share/doc/monotone/examples/server-setup/README
+share/doc/monotone/examples/server-setup/monotone.init
+share/doc/monotone/examples/server-setup/monotone.run
+share/doc/monotone/examples/server-setup/serverrc
+share/doc/monotone/examples/user-setup/README
+share/doc/monotone/examples/user-setup/monotonerc
+share/doc/monotone/examples/write-permissions
 share/locale/de/LC_MESSAGES/monotone.mo
-share/locale/es/LC_MESSAGES/monotone.mo
+share/locale/fr/LC_MESSAGES/monotone.mo
 share/locale/it/LC_MESSAGES/monotone.mo
 share/locale/pt/LC_MESSAGES/monotone.mo
 share/locale/sv/LC_MESSAGES/monotone.mo
-share/monotone/contrib/ChangeLog.sh
-share/monotone/contrib/Monotone.pm
-share/monotone/contrib/README
-share/monotone/contrib/README.missing
-share/monotone/contrib/asciik.py
-share/monotone/contrib/ciabot_monotone.py
-share/monotone/contrib/ciabot_monotone_hookversion.lua
-share/monotone/contrib/ciabot_monotone_hookversion.py
-share/monotone/contrib/color-logs.conf
-share/monotone/contrib/color-logs.sh
-share/monotone/contrib/colorize
-share/monotone/contrib/command/README
-share/monotone/contrib/command/base.lua
-share/monotone/contrib/command/conflicts.lua
-share/monotone/contrib/command/fuse.lua
-share/monotone/contrib/command/init.lua
-share/monotone/contrib/command/remote_export.lua
-share/monotone/contrib/command/revision.lua
-share/monotone/contrib/display_branches.lua
-share/monotone/contrib/dtrace2calltree.py
-share/monotone/contrib/dump-test-logs.sh
-share/monotone/contrib/edit_comment_from_changelog.lua
-share/monotone/contrib/ext_hooks.lua.in
-share/monotone/contrib/ext_hooks_expand.pl
-share/monotone/contrib/extra-commands.lua
-share/monotone/contrib/get_passphrase_from_file.lua
-share/monotone/contrib/get_stdio.pl
-share/monotone/contrib/lua-mode.el
-share/monotone/contrib/monoprof.sh
-share/monotone/contrib/monotone-buildbot-notification.lua
-share/monotone/contrib/monotone-cluster-push.lua
-share/monotone/contrib/monotone-cvs-ignore.lua
-share/monotone/contrib/monotone-inotify.lua
-share/monotone/contrib/monotone-log-of-pulled-revs-hook.lua
-share/monotone/contrib/monotone-mail-notify.lua
-share/monotone/contrib/monotone-mail-notify.sh
-share/monotone/contrib/monotone-mirror-postaction-push.sh
-share/monotone/contrib/monotone-mirror-postaction-update.sh
-share/monotone/contrib/monotone-mirror.lua
-share/monotone/contrib/monotone-mirror.sh
-share/monotone/contrib/monotone-nav.el
-share/monotone/contrib/monotone-notify-hookversion.lua
-share/monotone/contrib/monotone-notify.pl
-share/monotone/contrib/monotone-run-script-post-netsync.lua
-share/monotone/contrib/monotone.bash_completion
-share/monotone/contrib/monotone.el
-share/monotone/contrib/monotone.zsh_completion
-share/monotone/contrib/mtbrowse.sh
-share/monotone/contrib/mtn_cheat_sheet.svg
-share/monotone/contrib/mtn_makepermissions
-share/monotone/contrib/op2calltree.py
-share/monotone/contrib/parse-accounting.pl
-share/monotone/contrib/perf-test.sh
-share/monotone/contrib/recreate-manifest-tables.sh
+share/examples/monotone/monotone.bash_completion
+share/monotone/hooks/authorize_remote_automate.lua
+share/monotone/hooks/get_passphrase_from_file.lua
+share/monotone/hooks/monotone-buildbot.lua
+share/monotone/hooks/monotone-ciabot.lua
+share/monotone/hooks/monotone-cluster-push.lua
+share/monotone/hooks/monotone-cvs-ignore.lua
+share/monotone/hooks/monotone-mail-notify.lua
+share/monotone/scripts/monotone-ciabot.py
+share/monotone/scripts/monotone-mail-notify
diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo
index 387a8705966..a0139f0a8ee 100644
--- a/devel/monotone/distinfo
+++ b/devel/monotone/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.47 2010/11/30 10:30:53 jmmv Exp $
+$NetBSD: distinfo,v 1.48 2011/04/01 13:51:54 jmmv Exp $
 
-SHA1 (monotone-0.99.1.tar.gz) = e74ba571b358f6b76370f882d15ddbd1edd9f37e
-RMD160 (monotone-0.99.1.tar.gz) = c0db85af8b584e375ca992b3384bd8a38d5b380e
-Size (monotone-0.99.1.tar.gz) = 4940291 bytes
+SHA1 (monotone-1.0.tar.bz2) = aac556bb26d92910b74b65450a0be6c5045e2052
+RMD160 (monotone-1.0.tar.bz2) = 4c0813ae0c11f271dc88f42dd8814e474a67e988
+Size (monotone-1.0.tar.bz2) = 3588074 bytes