Wed Feb 27 14:16:50 2008 UTC ()
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


(jmmv)
diff -r1.49 -r1.50 pkgsrc/devel/monotone/Makefile
diff -r1.35 -r1.36 pkgsrc/devel/monotone/distinfo
diff -r1.18 -r0 pkgsrc/devel/monotone/patches/patch-aa

cvs diff -r1.49 -r1.50 pkgsrc/devel/monotone/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/monotone/Makefile 2008/01/04 20:05:11 1.49
+++ pkgsrc/devel/monotone/Makefile 2008/02/27 14:16:50 1.50
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.49 2008/01/04 20:05:11 jmmv Exp $ 1# $NetBSD: Makefile,v 1.50 2008/02/27 14:16:50 jmmv Exp $
2# 2#
3 3
4DISTNAME= monotone-0.38 4DISTNAME= monotone-0.39
5PKGREVISION= 2 
6CATEGORIES= devel scm 5CATEGORIES= devel scm
7MASTER_SITES= http://monotone.ca/downloads/0.38/ 6MASTER_SITES= http://monotone.ca/downloads/0.39/
8 7
9MAINTAINER= jmmv@NetBSD.org 8MAINTAINER= jmmv@NetBSD.org
10HOMEPAGE= http://monotone.ca/ 9HOMEPAGE= http://monotone.ca/
11COMMENT= Free distributed version control system 10COMMENT= Free distributed version control system
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15GCC_REQD+= 3.0 14GCC_REQD+= 3.0
16GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
17INFO_FILES= yes 16INFO_FILES= yes
18UNLIMIT_RESOURCES+= datasize 17UNLIMIT_RESOURCES+= datasize
19USE_TOOLS+= gmake makeinfo 18USE_TOOLS+= gmake makeinfo
20USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
@@ -34,21 +33,21 @@ CHECK_PORTABILITY_SKIP+= debian/* @@ -34,21 +33,21 @@ CHECK_PORTABILITY_SKIP+= debian/*
34CONFIGURE_ARGS+= --enable-ipv6 33CONFIGURE_ARGS+= --enable-ipv6
35.else 34.else
36CONFIGURE_ARGS+= --disable-ipv6 35CONFIGURE_ARGS+= --disable-ipv6
37.endif 36.endif
38 37
39post-install: 38post-install:
40 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/monotone 39 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/monotone
41 cd ${WRKSRC} && rm -rf contrib/.deps && \ 40 cd ${WRKSRC} && rm -rf contrib/.deps && \
42 pax -rw -pp -pm contrib \ 41 pax -rw -pp -pm contrib \
43 ${DESTDIR}${PREFIX}/share/monotone 42 ${DESTDIR}${PREFIX}/share/monotone
44 cd ${WRKSRC} && pax -rw -pp -pm figures/*.png \ 43 cd ${WRKSRC} && pax -rw -pp -pm figures/*.png \
45 ${DESTDIR}${PREFIX}/share/doc/monotone 44 ${DESTDIR}${PREFIX}/share/doc/monotone
46 45
47BUILDLINK_API_DEPENDS.pcre+= pcre>=6.7 46BUILDLINK_API_DEPENDS.pcre+= pcre>=7.6
48 47
49.include "../../converters/libiconv/buildlink3.mk" 48.include "../../converters/libiconv/buildlink3.mk"
50.include "../../devel/boost-headers/buildlink3.mk" 49.include "../../devel/boost-headers/buildlink3.mk"
51.include "../../devel/gettext-lib/buildlink3.mk" 50.include "../../devel/gettext-lib/buildlink3.mk"
52.include "../../devel/pcre/buildlink3.mk" 51.include "../../devel/pcre/buildlink3.mk"
53.include "../../mk/pthread.buildlink3.mk" 52.include "../../mk/pthread.buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"

cvs diff -r1.35 -r1.36 pkgsrc/devel/monotone/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/monotone/distinfo 2007/12/14 08:58:01 1.35
+++ pkgsrc/devel/monotone/distinfo 2008/02/27 14:16:50 1.36
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.35 2007/12/14 08:58:01 bjs Exp $ 1$NetBSD: distinfo,v 1.36 2008/02/27 14:16:50 jmmv Exp $
2 2
3SHA1 (monotone-0.38.tar.gz) = 6c546ec6122f56dfc8253323e8dc45167d0918c4 3SHA1 (monotone-0.39.tar.gz) = b34c7e25871ddff1e30d15b733c1f3283ec16de9
4RMD160 (monotone-0.38.tar.gz) = 5bc5e19dc1a78cfc24a02ee553c46073082351ba 4RMD160 (monotone-0.39.tar.gz) = d559c318e18f801513a170936fb56b6e1ac41235
5Size (monotone-0.38.tar.gz) = 5264651 bytes 5Size (monotone-0.39.tar.gz) = 5332200 bytes
6SHA1 (patch-aa) = 6aa0a991d94859085e1674cdea522dcd7d6436ed 6SHA1 (patch-aa) = 6aa0a991d94859085e1674cdea522dcd7d6436ed

File Deleted: pkgsrc/devel/monotone/patches/Attic/patch-aa