diff options
| -rw-r--r-- | devel/monotone/Makefile | 5 | ||||
| -rw-r--r-- | devel/monotone/PLIST | 3 | ||||
| -rw-r--r-- | devel/monotone/distinfo | 8 | ||||
| -rw-r--r-- | devel/monotone/patches/patch-aa | 13 | ||||
| -rw-r--r-- | devel/monotone/patches/patch-ab | 32 |
5 files changed, 8 insertions, 53 deletions
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index d623946fce4..6a226c54038 100644 --- a/devel/monotone/Makefile +++ b/devel/monotone/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.29 2006/09/22 11:14:05 dan Exp $ +# $NetBSD: Makefile,v 1.30 2006/11/23 17:38:35 jmmv Exp $ # -DISTNAME= monotone-0.30 +DISTNAME= monotone-0.31 CATEGORIES= devel MASTER_SITES= http://monotone.ca/downloads/ -PKGREVISION= 1 MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://monotone.ca/ diff --git a/devel/monotone/PLIST b/devel/monotone/PLIST index aeb8798c052..9b596985e06 100644 --- a/devel/monotone/PLIST +++ b/devel/monotone/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:17 jlam Exp $ +@comment $NetBSD: PLIST,v 1.8 2006/11/23 17:38:35 jmmv Exp $ bin/mtn info/monotone.info man/man1/mtn.1 share/doc/monotone/monotone.html 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/ja/LC_MESSAGES/monotone.mo diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo index 7ff1fe9e21e..7c873d5ccd1 100644 --- a/devel/monotone/distinfo +++ b/devel/monotone/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.22 2006/09/22 11:14:06 dan Exp $ +$NetBSD: distinfo,v 1.23 2006/11/23 17:38:35 jmmv Exp $ -SHA1 (monotone-0.30.tar.gz) = e78356dcaa7f5cd2e8c7e6371a375369ab6feca7 -RMD160 (monotone-0.30.tar.gz) = d58fe36d9f0686ec6be47dc2f39ec3f7ba2d40d9 -Size (monotone-0.30.tar.gz) = 4663418 bytes +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) = 73f5a3066c7f82de8178c6f00848db12b60aa6ae SHA1 (patch-ab) = b65dc4ca12bd753ad433cbb15ac19fb8592db939 diff --git a/devel/monotone/patches/patch-aa b/devel/monotone/patches/patch-aa deleted file mode 100644 index b23a7305f5b..00000000000 --- a/devel/monotone/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.9 2006/09/20 13:10:10 jmmv Exp $ - ---- cmd.hh.orig 2006-09-17 11:56:51.000000000 +0200 -+++ cmd.hh -@@ -207,7 +207,7 @@ namespace commands { - } \ - std::string commands::cmd_ ## C::desc() \ - { \ -- std:string result = _(desc_.c_str()); \ -+ std::string result = _(desc_.c_str()); \ - result += "\n"; \ - result += (F("Alias for %s") % #realcommand).str(); \ - return result; \ diff --git a/devel/monotone/patches/patch-ab b/devel/monotone/patches/patch-ab deleted file mode 100644 index 1ec72321ec3..00000000000 --- a/devel/monotone/patches/patch-ab +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2006/09/22 11:14:06 dan Exp $ - ---- lru_writeback_cache.hh 4ac60f38211fc4ef11ee1f968bfb88fee5446937 -+++ lru_writeback_cache.hh c2fa384b9b29d6c5162fad70ebe96e6479b8aa3e -@@ -212,19 +212,24 @@ public: - { - // Remove the last element. - liter = _list.end(); -- // Unless it's the only element (i.e., the one we just inserted) -- we -- // never empty ourselves out completely -+ I(liter != _list.begin()); -+ --liter; -+ // liter now points to the last element. If the last element is also -+ // the first element -- i.e., the list has only one element, and we -+ // know that it's the one we just inserted -- then never mind, we -+ // never want to empty ourselves out completely. - if (liter == _list.begin()) - break; -- --liter; - this->_remove(liter->first); - } -+ I(exists(key)); - } - - inline void insert_dirty(Key const & key, const Data & data) - { - insert_clean(key, data); - safe_insert(_dirty, key); -+ I(is_dirty(key)); - } - - private: |