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.

5 files changed, 19 insertions, 28 deletions

diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 08105937dce..57f063b3c61 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.46 2007/10/26 14:08:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.47 2007/12/14 08:58:00 bjs Exp $
 #
 
-DISTNAME=	monotone-0.37
+DISTNAME=	monotone-0.38
 CATEGORIES=	devel scm
-MASTER_SITES=	http://monotone.ca/downloads/0.37/
+MASTER_SITES=	http://monotone.ca/downloads/0.38/
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://monotone.ca/
 COMMENT=	Free distributed version control system
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GCC_REQD+=		3.0
 GNU_CONFIGURE=		yes
 INFO_FILES=		yes
@@ -34,7 +36,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/monotone
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/monotone
 	cd ${WRKSRC} && rm -rf contrib/.deps && \
 	    pax -rw -pp -pm contrib \
 	    ${DESTDIR}${PREFIX}/share/monotone
diff --git a/devel/monotone/PLIST b/devel/monotone/PLIST
index 13c9ed42159..c605e74b929 100644
--- a/devel/monotone/PLIST
+++ b/devel/monotone/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2007/10/26 14:08:24 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.15 2007/12/14 08:58:00 bjs Exp $
 bin/mtn
 info/monotone.info
 share/doc/monotone/figures/branch-heads.png
@@ -31,6 +31,7 @@ share/locale/sv/LC_MESSAGES/monotone.mo
 share/monotone/contrib/Monotone.pm
 share/monotone/contrib/README
 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
diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo
index bb1da70229f..54d4df2e378 100644
--- a/devel/monotone/distinfo
+++ b/devel/monotone/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.34 2007/12/12 22:15:18 jmmv Exp $
+$NetBSD: distinfo,v 1.35 2007/12/14 08:58:01 bjs Exp $
 
-SHA1 (monotone-0.37.tar.gz) = 7d53bd67f7539342fcc15cceb0c2f4b31ba07647
-RMD160 (monotone-0.37.tar.gz) = 52185416cec790035017d1f1e5f061995c323032
-Size (monotone-0.37.tar.gz) = 5259352 bytes
-SHA1 (patch-aa) = e27f0bf04c8d2b5df7bff4c5d7a6f96c89ab9a44
-SHA1 (patch-ab) = e5b3038a7bb1c444adb5ee47e348c236dd2bb006
+SHA1 (monotone-0.38.tar.gz) = 6c546ec6122f56dfc8253323e8dc45167d0918c4
+RMD160 (monotone-0.38.tar.gz) = 5bc5e19dc1a78cfc24a02ee553c46073082351ba
+Size (monotone-0.38.tar.gz) = 5264651 bytes
+SHA1 (patch-aa) = 6aa0a991d94859085e1674cdea522dcd7d6436ed
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
-