Update to 0.16, which includes mostly important bug fixes:

- 50+ new integration tests
- many NetBSD portability fixes
- release build on gcc 3.4 / FC3
- masses of changeset bugs in 0.15 fixed

Some bogus changesets were generated in the 0.16 development cycle.  You
will need to rebuild revision graph.

3 files changed, 17 insertions, 48 deletions

diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 3fe3bd3c8bb..c88fa9a50a9 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2004/11/28 10:35:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2005/01/01 16:41:43 jmmv Exp $
 #
 
-DISTNAME=	monotone-0.15
+DISTNAME=	monotone-0.16
 CATEGORIES=	devel
 MASTER_SITES=	http://www.venge.net/monotone/
 
@@ -9,6 +9,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.venge.net/monotone/
 COMMENT=	Free distributed version control system
 
+GCC_REQD+=		3.0
 GNU_CONFIGURE=		yes
 INFO_FILES=		monotone.info
 USE_BUILDLINK3=		yes
@@ -16,11 +17,20 @@ USE_GNU_TOOLS+=		make
 USE_LANGUAGES=		c c++
 USE_MAKEINFO=		yes
 
+CONFIGURE_ARGS+=	BOOST_SUFFIX=-${BOOST_TOOLSET}
 CONFIGURE_ARGS+=	--with-bundled-lua=no
 CONFIGURE_ARGS+=	--with-bundled-sqlite=no
-CONFIGURE_ENV+=		BOOST_TOOLSET=${BOOST_TOOLSET}
 
-CPPFLAGS+=		-D__unix__ -D__unix
+PKG_OPTIONS_VAR=	PKG_OPTIONS.monotone
+PKG_SUPPORTED_OPTIONS=	ipv6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mipv6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/sqlite/buildlink3.mk"
diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo
index 117fda6c576..1b428265072 100644
--- a/devel/monotone/distinfo
+++ b/devel/monotone/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/11/28 10:35:45 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2005/01/01 16:41:43 jmmv Exp $
 
-SHA1 (monotone-0.15.tar.gz) = 540c734d168e8b90ae6a5bca700f0d690d5d94d1
-Size (monotone-0.15.tar.gz) = 3170364 bytes
-SHA1 (patch-aa) = 7427f8b411cdbb1f2afc007e1e099784d964c381
+SHA1 (monotone-0.16.tar.gz) = 674dd66ca3ac55fadacf26d05b48d0c64ce27e08
+Size (monotone-0.16.tar.gz) = 3438625 bytes
diff --git a/devel/monotone/patches/patch-aa b/devel/monotone/patches/patch-aa
deleted file mode 100644
index 817e77bda89..00000000000
--- a/devel/monotone/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/11/28 10:35:45 jmmv Exp $
-
---- configure.orig	2004-11-06 19:13:01.000000000 +0100
-+++ configure
-@@ -7964,7 +7964,7 @@ fi
- 
- # Now check for Boost libraries proper.
- 
--LIBS="-lboost_unit_test_framework $OLD_LIBS"
-+LIBS="-lboost_unit_test_framework-$BOOST_TOOLSET $OLD_LIBS"
- echo "$as_me:$LINENO: checking libboost_unit_test_framework library" >&5
- echo $ECHO_N "checking libboost_unit_test_framework library... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8019,7 +8019,7 @@ rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$OLD_LIBS
- 
--LIBS="-lboost_filesystem $LIBS"
-+LIBS="-lboost_filesystem-$BOOST_TOOLSET $LIBS"
- echo "$as_me:$LINENO: checking libboost_filesystem library" >&5
- echo $ECHO_N "checking libboost_filesystem library... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8078,7 +8078,7 @@ fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- 
--LIBS="-lboost_date_time $LIBS"
-+LIBS="-lboost_date_time-$BOOST_TOOLSET $LIBS"
- echo "$as_me:$LINENO: checking libboost_date_time library" >&5
- echo $ECHO_N "checking libboost_date_time library... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8138,7 +8138,7 @@ rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- 
- 
--LIBS="-lboost_regex $LIBS"
-+LIBS="-lboost_regex-$BOOST_TOOLSET $LIBS"
- echo "$as_me:$LINENO: checking libboost_regex library" >&5
- echo $ECHO_N "checking libboost_regex library... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF