diff options
author | bjs <bjs> | 2007-12-14 08:58:00 +0000 |
---|---|---|
committer | bjs <bjs> | 2007-12-14 08:58:00 +0000 |
commit | a5248a647da50359af0931a8cdf1edc0974f47bd (patch) | |
tree | c278e7b7f7ff67261bd0df2328fafd2cae5252ca /devel/monotone/patches | |
parent | fec1b4113849790c19728aa8e6ff1aa1efe8d755 (diff) | |
download | pkgsrc-a5248a647da50359af0931a8cdf1edc0974f47bd.tar.gz |
Update to version 0.38. Fix one line of post-install target to allow
for DESTDIR support. Also, patch-ab is no longer necessary; patch-aa
is merely a one-liner now.
Changes since 0.37:
Changes
- mtn log now prints a single dot for a project's root
directory instead of an empty string.
- mtn now warns if changes to a file will be ignored because
the file has been deleted on one side of a merge.
- mtn now errors if your chosen private key doesn't match the public
key of the same name in your database.
- mtn now checks for your key before a merge action takes place to
ensure that any manually merged file isn't lost in an error case
Bugs fixed
- a bug introduced in 0.37 prevented an external merger from being
executed unless the MTN_MERGE environment variable was set
- mtn read successfully reads revision data, and cert packets again
- mtn consistently supports certs with empty values
(fixed 'ls certs' and 'read')
Internal
- Update Botan to 1.7.2.
- Moved the gzip implementation out of the Botan directory.
Other
- Added the scripts of the following Lua-based contributed
Monotone extension commands to contrib/command/:
"mtn base", "mtn fuse", "mtn revision", "mtn conflicts".
- Added a hooks version of the contributed ciabot script,
contrib/ciabot_monotone_hookversion.lua
- The monotone manual is now licensed under the GPL rather than
the GFDL.
Diffstat (limited to 'devel/monotone/patches')
-rw-r--r-- | devel/monotone/patches/patch-aa | 11 | ||||
-rw-r--r-- | devel/monotone/patches/patch-ab | 12 |
2 files changed, 6 insertions, 17 deletions
diff --git a/devel/monotone/patches/patch-aa b/devel/monotone/patches/patch-aa index e281efa838b..abc4eea1c8d 100644 --- a/devel/monotone/patches/patch-aa +++ b/devel/monotone/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.17 2007/12/12 14:34:58 jmmv Exp $ +$NetBSD: patch-aa,v 1.18 2007/12/14 08:58:01 bjs Exp $ ---- configure.orig 2007-10-26 00:41:00.000000000 +0200 +--- configure.orig 2007-12-12 14:59:50.000000000 -0500 +++ configure @@ -11879,9 +11879,9 @@ fi # Check whether --with-system-pcre was given. @@ -15,12 +15,13 @@ $NetBSD: patch-aa,v 1.17 2007/12/12 14:34:58 jmmv Exp $ echo "$as_me: error: --with(out)-system-pcre takes no argument" >&2;} { (exit 1); exit 1; }; } ;; esac -@@ -12100,7 +12100,7 @@ echo $ECHO_N "checking for PCRE using pc +@@ -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/*::'`" +- -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; } diff --git a/devel/monotone/patches/patch-ab b/devel/monotone/patches/patch-ab deleted file mode 100644 index 4ea59efa063..00000000000 --- a/devel/monotone/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2007/10/26 14:08:25 jmmv Exp $ - ---- pcrewrap.cc.orig 2007-10-26 00:40:22.000000000 +0200 -+++ pcrewrap.cc -@@ -15,7 +15,6 @@ - // This dirty trick is necessary to prevent the 'pcre' typedef defined by - // pcre.h from colliding with namespace pcre. - #define pcre pcre_t --#include "pcre_config.h" - #include "pcre.h" - #undef pcre - |