summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/monotone-server/Makefile6
-rw-r--r--devel/monotone-server/files/branches.conf7
-rw-r--r--devel/monotone-server/files/hooks.conf21
-rw-r--r--devel/monotone/Makefile10
-rw-r--r--devel/monotone/distinfo9
-rw-r--r--devel/monotone/patches/patch-aa15
6 files changed, 21 insertions, 47 deletions
diff --git a/devel/monotone-server/Makefile b/devel/monotone-server/Makefile
index 8985709d66c..f6431c16f14 100644
--- a/devel/monotone-server/Makefile
+++ b/devel/monotone-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2005/05/21 04:10:17 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/09 22:02:31 jmmv Exp $
#
-DISTNAME= monotone-server-0.19
+DISTNAME= monotone-server-0.22
CATEGORIES= devel
MASTER_SITES= # empty
DISTFILES= # empty
@@ -10,7 +10,7 @@ MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://www.venge.net/monotone/
COMMENT= Simplifies the configuration of a dedicated Monotone server
-DEPENDS+= monotone>=0.19:../../devel/monotone
+DEPENDS+= monotone>=0.22:../../devel/monotone
EXTRACT_ONLY= # empty
NO_BUILD= yes
diff --git a/devel/monotone-server/files/branches.conf b/devel/monotone-server/files/branches.conf
index acb7ab3ef0f..8dadd9fc7e2 100644
--- a/devel/monotone-server/files/branches.conf
+++ b/devel/monotone-server/files/branches.conf
@@ -1,8 +1,9 @@
-# $NetBSD: branches.conf,v 1.1.1.1 2005/01/12 12:52:50 jmmv Exp $
+# $NetBSD: branches.conf,v 1.2 2005/08/09 22:02:31 jmmv Exp $
#
# This file belongs to the monotone-server package. It lists all branches
-# that will be served by Monotone, each one in its own line.
+# that will be served by Monotone, each one in its own line. Shell globs
+# are allowed.
#
-#net.example.project1
+#net.example.project1*
#net.example.project2.subbranch
diff --git a/devel/monotone-server/files/hooks.conf b/devel/monotone-server/files/hooks.conf
index 9befecfaf8f..8c1dbaa8079 100644
--- a/devel/monotone-server/files/hooks.conf
+++ b/devel/monotone-server/files/hooks.conf
@@ -1,4 +1,4 @@
--- $NetBSD: hooks.conf,v 1.1.1.1 2005/01/12 12:52:50 jmmv Exp $
+-- $NetBSD: hooks.conf,v 1.2 2005/08/09 22:02:31 jmmv Exp $
--
-- This file belongs to the monotone-server package. This is the typical
-- ~/.monotonerc configuration file, but is system-wide.
@@ -11,30 +11,25 @@ function get_passphrase(identity)
return false
end
-function get_netsync_read_permitted (collection, identity)
--- if (collection == "net.example.project1") then
+function get_netsync_read_permitted (branch, identity)
+-- if (branch == "net.example.project1") then
+-- if (identity == nil) then return true end
-- if (identity == "user1@example.org") then return true end
-- end
--- if (collection == "net.example.project2.subbranch") then
+-- if (branch == "net.example.project2.subbranch") then
-- if (identity == "user1@example.org") then return true end
-- if (identity == "user2@example.org") then return true end
-- end
return false
end
-function get_netsync_write_permitted (collection, identity)
--- if (collection == "net.example.project1") then
+function get_netsync_write_permitted (branch, identity)
+-- if (branch == "net.example.project1") then
-- if (identity == "user1@example.org") then return true end
-- end
--- if (collection == "net.example.project2.subbranch") then
+-- if (branch == "net.example.project2.subbranch") then
-- if (identity == "user1@example.org") then return true end
-- if (identity == "user2@example.org") then return true end
-- end
return false
end
-
-function get_netsync_anonymous_read_permitted (collection)
--- if (collection == "net.example.project1") then return true end
--- if (collection == "net.example.project2.branch2") then return true end
- return false
-end
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 704c7ecc81f..e9dfb6aa495 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/06/18 14:33:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/09 22:02:30 jmmv Exp $
#
-DISTNAME= monotone-0.19
-PKGREVISION= 1
+DISTNAME= monotone-0.22
CATEGORIES= devel
MASTER_SITES= http://www.venge.net/monotone/downloads/
@@ -18,8 +17,6 @@ USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_MAKEINFO= yes
-CONFIGURE_ARGS+= --with-bundled-lua=no
-CONFIGURE_ARGS+= --with-bundled-sqlite=no
CONFIGURE_ARGS+= BOOST_SUFFIX=-mt
PKG_OPTIONS_VAR= PKG_OPTIONS.monotone
@@ -35,10 +32,7 @@ CONFIGURE_ARGS+= --disable-ipv6
.endif
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo
index d8f53efa8b2..f3ff33ba623 100644
--- a/devel/monotone/distinfo
+++ b/devel/monotone/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2005/05/09 23:50:05 rillig Exp $
+$NetBSD: distinfo,v 1.9 2005/08/09 22:02:30 jmmv Exp $
-SHA1 (monotone-0.19.tar.gz) = 49a4094ecc0ca817c193bd10158d3e4f6af11cbc
-RMD160 (monotone-0.19.tar.gz) = 9bcc5f9a5d03b452f49e4d6dacda682e1f3f6a64
-Size (monotone-0.19.tar.gz) = 4796447 bytes
-SHA1 (patch-aa) = 173b48dea55518a7d4c23d90a6a958339f26f4ac
+SHA1 (monotone-0.22.tar.gz) = b72acaf4b050983d08b777844fd339f74e53ac09
+RMD160 (monotone-0.22.tar.gz) = c3aef55be673b68d9a116a94b8a5445b0770aaf7
+Size (monotone-0.22.tar.gz) = 5038069 bytes
diff --git a/devel/monotone/patches/patch-aa b/devel/monotone/patches/patch-aa
deleted file mode 100644
index 7d49881d3f0..00000000000
--- a/devel/monotone/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2005/05/09 23:50:06 rillig Exp $
-
-Needed for chdir() on POSIX systems.
-
---- app_state.cc.orig Sun May 1 08:09:52 2005
-+++ app_state.cc Mon May 9 19:42:52 2005
-@@ -3,6 +3,8 @@
- #include <vector>
- #ifdef WIN32
- #include <io.h> /* for chdir() */
-+#else
-+#include <unistd.h>
- #endif
- #include <cstdlib> // for strtoul()
-
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-18 14:56:55 +0000