Update to 0.39:

Changes

- 'mtn di' is now an alias for 'mtn diff'.

- 'automate db_set' has been renamed to 'automate set_db_variable'.

- 'automate db_get' has been replaced by 'automate get_db_variables'
  which returns all database variables similar to 'list vars' in
  basic_io format, optionally restricted by domain.

- The REVID argument of 'automate get_revision' is now mandatory;
  to retrieve the current workspace revision, use the new command
  'automate get_current_revision'

- messages describing conflicts from all of the various merge commands
  have been reworked and should be much more informative.

- mtn show_conflicts now outputs much more detailed and descriptive
  messages, however it may report content conflicts that will be
  resolved automatically by the line merger.

- The internal copy of PCRE has been updated to version 7.6.
  If you use the '--with-system-pcre' configure switch, it
  will insist on at least this version.

- "emacs" has been removed from the list of dumb terminal types;
  tickers should now default to --ticker=count with emacs terminals

- extensive section on merge conflicts and ways to resolve them
  added to the manual.

Bugs fixed

- for changes near the beginning of a file, mtn's unified diff
  output sometimes contained too many leading context lines.

- the path handling of 'mtn revert' was improved and fixed two bugs:
  now a restricted revert on a node "dir1/file1" reverts only the
  content changes in "file1", but leaves renames of any of its
  ancestor nodes untouched; furthermore, if "dir0/" was renamed to
  "dir1" and "dir1/file1" was dropped, mtn now re-creates file1 at the
  proper place ("dir1/") and leaves no missing files around because
  of the non-existing "dir0/".

- a few changes needed to build with gcc 4.3.

New features

- 'automate drop_db_variables' which drops one database variable
  (like the 'unset' command) or all variables within a given domain.

- 'automate inventory' now accepts the options '--no-ignored',
  '--no-unknown', '--no-unchanged' and '--no-corresponding-renames'.
  Please consult the monotone documentation for more information about
  these new options.
  In addition, 'automate inventory' no longer recurses into ignored
  directories. The typical case of listing files that need attention
  now runs at least four times faster.

- 'automate get_current_revision' which outputs the revision text of
   changes in the current workspace

3 files changed, 8 insertions, 36 deletions

diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index ea8ec1d7476..69670cff427 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2008/01/04 20:05:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.50 2008/02/27 14:16:50 jmmv Exp $
 #
 
-DISTNAME=	monotone-0.38
-PKGREVISION=	2
+DISTNAME=	monotone-0.39
 CATEGORIES=	devel scm
-MASTER_SITES=	http://monotone.ca/downloads/0.38/
+MASTER_SITES=	http://monotone.ca/downloads/0.39/
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://monotone.ca/
@@ -44,7 +43,7 @@ post-install:
 	cd ${WRKSRC} && pax -rw -pp -pm figures/*.png \
 	    ${DESTDIR}${PREFIX}/share/doc/monotone
 
-BUILDLINK_API_DEPENDS.pcre+=	pcre>=6.7
+BUILDLINK_API_DEPENDS.pcre+=	pcre>=7.6
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo
index 54d4df2e378..adf7fa27260 100644
--- a/devel/monotone/distinfo
+++ b/devel/monotone/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.35 2007/12/14 08:58:01 bjs Exp $
+$NetBSD: distinfo,v 1.36 2008/02/27 14:16:50 jmmv Exp $
 
-SHA1 (monotone-0.38.tar.gz) = 6c546ec6122f56dfc8253323e8dc45167d0918c4
-RMD160 (monotone-0.38.tar.gz) = 5bc5e19dc1a78cfc24a02ee553c46073082351ba
-Size (monotone-0.38.tar.gz) = 5264651 bytes
+SHA1 (monotone-0.39.tar.gz) = b34c7e25871ddff1e30d15b733c1f3283ec16de9
+RMD160 (monotone-0.39.tar.gz) = d559c318e18f801513a170936fb56b6e1ac41235
+Size (monotone-0.39.tar.gz) = 5332200 bytes
 SHA1 (patch-aa) = 6aa0a991d94859085e1674cdea522dcd7d6436ed
diff --git a/devel/monotone/patches/patch-aa b/devel/monotone/patches/patch-aa
deleted file mode 100644
index abc4eea1c8d..00000000000
--- a/devel/monotone/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.18 2007/12/14 08:58:01 bjs Exp $
-
---- configure.orig	2007-12-12 14:59:50.000000000 -0500
-+++ configure
-@@ -11879,9 +11879,9 @@ fi
- # Check whether --with-system-pcre was given.
- if test "${with_system_pcre+set}" = set; then
-   withval=$with_system_pcre; case "$withval" in
--      (""|yes) with_system_pcre=yes ;;
--      (no)     with_system_pcre=no  ;;
--      (*)      { { echo "$as_me:$LINENO: error: --with(out)-system-pcre takes no argument" >&5
-+      ""|yes) with_system_pcre=yes ;;
-+      no)     with_system_pcre=no  ;;
-+      *)      { { echo "$as_me:$LINENO: error: --with(out)-system-pcre takes no argument" >&5
- echo "$as_me: error: --with(out)-system-pcre takes no argument" >&2;}
-    { (exit 1); exit 1; }; } ;;
-     esac
-@@ -12100,7 +12100,8 @@ echo $ECHO_N "checking for PCRE using pc
-        # automatically.
-        PCRE_LIBS="`pcre-config --libs | \
-                    sed -e 's:-L */usr/lib/*::' -e 's:-R */usr/lib/*::' \
--                       -e 's:-L */lib/*::' -e 's:-R */lib/*::'`"
-+		       -e 's:-L */lib/*::' -e 's:-R */lib/*::'`"
-+
-        found_libpcre=yes
-        { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }