Update to version 0.8.0. While here, use CONF_FILES framework and provide

some sensible default values for the server configuration file via
the SUBST framework.  Use REPLACE_PYTHON.  New variable CODEVILLE_DATADIR,
which defaults to ${VARBASE}/db/cdv.

New in version 0.8.0:

  * Remember commit message and autofill it on next attempt if commit
    fails
  * fixed: catch requests for non-existent diffs
  * fixed: error handling cleanup in networking code
  * fixed: Windows-specific networking fixes
  * fixed: binary file corruption on Windows with 'construct'
  * fixed: glob expansion with 'describe -d'
  * fixed: renaming corner case involving directories, renaming and
    deleting
  * fixed: files renamed out of a deleted directory on another branch were
    marked as a name conflict
  * fixed: use case-insensitive regexps for post-commit hooks because the
    config parser lowercases everything
  * fixed: filesystem timestamp precision problems
  * fixed: Python 2.5 fixes

These fixes have been collecting for a while. Now you all get to enjoy
them too.

The version number has been changed to reflect that the currect code is
stable, yet is still missing some features which would be necessary for a
1.0 release

7 files changed, 115 insertions, 11 deletions

diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile
index 4d839e8b769..8929fa6d702 100644
--- a/devel/codeville/Makefile
+++ b/devel/codeville/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2008/06/12 02:14:21 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2008/06/13 04:55:53 bjs Exp $
 
-DISTNAME=	Codeville-0.1.16
-PKGNAME=	codeville-0.1.16
-PKGREVISION=	2
+DISTNAME=	Codeville-0.8.0
+PKGNAME=	codeville-0.8.0
 CATEGORIES=	devel scm
 MASTER_SITES=	http://codeville.org/download/
 
@@ -11,8 +10,31 @@ HOMEPAGE=	http://codeville.org/
 COMMENT=	Distributed revision control system
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-
 PYDISTUTILSPKG=		yes
+REPLACE_PYTHON=		*.py
+REPLACE_PYTHON+=	*/*.py
+
+BUILD_DEFS+=		VARBASE
+BUILD_DEFS_EFFECTS+=	CODEVILLE_DATADIR
+CODEVILLE_DATADIR?=	${VARBASE}/db/cdv
+
+# XXX Could create a user for the server, rc script, etc.
+
+CONF_FILES=		${EGDIR}/cdvserver.conf  \
+			${PKG_SYSCONFDIR}/cdvserver.conf
+
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	cdvserver.conf.sample
+SUBST_MESSAGE.paths=	performing pathname substitutions
+SUBST_STAGE.paths=	pre-install
+SUBST_VARS.paths=	CODEVILLE_DATADIR VARBASE PKG_SYSCONFDIR
+
+post-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/cdvserver.conf.sample \
+		${DESTDIR}${EGDIR}/cdvserver.conf
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff --git a/devel/codeville/PLIST b/devel/codeville/PLIST
index 7113c8c1641..4b9b3352466 100644
--- a/devel/codeville/PLIST
+++ b/devel/codeville/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2006/03/02 19:25:25 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/06/13 04:55:53 bjs Exp $
 bin/cdv
 bin/cdv-agent
 bin/cdvpasswd
@@ -92,7 +92,8 @@ ${PYSITELIB}/Codeville/upgrade.py
 ${PYSITELIB}/Codeville/upgrade.pyc
 ${PYSITELIB}/Codeville/upgrade.pyo
 share/doc/Codeville-${PKGVERSION}/LICENSE.txt
-share/doc/Codeville-${PKGVERSION}/cdvserver.conf.sample
+share/examples/codeville/cdvserver.conf
+@dirrm share/examples/codeville
 @dirrm share/doc/Codeville-${PKGVERSION}
 @dirrm ${PYSITELIB}/Codeville/old
 @dirrm ${PYSITELIB}/Codeville
diff --git a/devel/codeville/distinfo b/devel/codeville/distinfo
index f0a7d9cc5f2..85200c483a8 100644
--- a/devel/codeville/distinfo
+++ b/devel/codeville/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.7 2006/03/02 19:25:25 drochner Exp $
+$NetBSD: distinfo,v 1.8 2008/06/13 04:55:53 bjs Exp $
 
-SHA1 (Codeville-0.1.16.tar.gz) = ebde62d9a14afe03b206f8b11f88b801bc17c32e
-RMD160 (Codeville-0.1.16.tar.gz) = ae92407264dcf39db9cf464ea46753420058256b
-Size (Codeville-0.1.16.tar.gz) = 93177 bytes
+SHA1 (Codeville-0.8.0.tar.gz) = 5f3bbbf80dd07d34ad0f95c0f7f1aea44d21e257
+RMD160 (Codeville-0.8.0.tar.gz) = 283e822460f802eb22391b3dddda1726c895e77a
+Size (Codeville-0.8.0.tar.gz) = 93779 bytes
+SHA1 (patch-aa) = 78eb80440deae48ba6ed538ed0145988ef0e39ce
+SHA1 (patch-ab) = 7f1d36c83ecc692ea967e55a05dd331ef212e635
+SHA1 (patch-ac) = 3909c7ff6c07dab0793449a6779e2d5eb57fd6b3
+SHA1 (patch-ad) = 6613f1888b8f1fa6485f807dcd2b568b5c182483
diff --git a/devel/codeville/patches/patch-aa b/devel/codeville/patches/patch-aa
new file mode 100644
index 00000000000..4add8a84fe8
--- /dev/null
+++ b/devel/codeville/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2008/06/13 04:55:53 bjs Exp $
+
+--- cdvpasswd.orig	2005-11-20 19:33:02.000000000 -0500
++++ cdvpasswd
+@@ -36,7 +36,7 @@ def run(args):
+     if platform == 'win32':
+         noconfig = True
+     else:
+-        config_file = '/etc/cdvserver.conf'
++        config_file = '@PKG_SYSCONFDIR@/cdvserver.conf'
+ 
+     # do a first pass of the command line to pick up an alternate config
+     for (opt, arg) in optlist:
diff --git a/devel/codeville/patches/patch-ab b/devel/codeville/patches/patch-ab
new file mode 100644
index 00000000000..02163b96778
--- /dev/null
+++ b/devel/codeville/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1 2008/06/13 04:55:53 bjs Exp $
+
+--- cdvserver.conf.sample.orig	2005-11-20 19:33:02.000000000 -0500
++++ cdvserver.conf.sample
+@@ -1,12 +1,12 @@
+ [control]
+-#datadir=/var/lib/cdvserver
+-#pidfile=/var/run/cdvserver.pid
+-#logfile=/var/log/cdvserver.log
+-#backup=False
+-#port=6601
++datadir=@CODEVILLE_DATADIR@
++pidfile=@VARBASE@/run/cdvserver.pid
++logfile=@VARBASE@/log/cdvserver.log
++backup=False
++port=6601
+ user=cdv
+ 
+ [post-commit]
+ # keys are regular expression matching repository names
+ # values are programs which will be sent XML through stdin
+-#.*=cat >> /var/log/cdvcommits.log
++.*=cat >> @VARBASE@/log/cdvcommits.log
diff --git a/devel/codeville/patches/patch-ac b/devel/codeville/patches/patch-ac
new file mode 100644
index 00000000000..c054dd11f04
--- /dev/null
+++ b/devel/codeville/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2008/06/13 04:55:53 bjs Exp $
+
+--- cdvserver.orig	2006-02-23 15:44:13.000000000 -0500
++++ cdvserver
+@@ -45,7 +45,7 @@ def run(args):
+     else:
+         daemonize = True
+         noconfig = False
+-        configfile = '/etc/cdvserver.conf'
++        configfile = '@PKG_SYSCONFDIR@/cdvserver.conf'
+ 
+     # parse command line arguments
+     initialize = False
diff --git a/devel/codeville/patches/patch-ad b/devel/codeville/patches/patch-ad
new file mode 100644
index 00000000000..1ef9d696776
--- /dev/null
+++ b/devel/codeville/patches/patch-ad
@@ -0,0 +1,28 @@
+$NetBSD: patch-ad,v 1.1 2008/06/13 04:55:53 bjs Exp $
+
+--- setup.py.orig	2007-07-13 14:51:23.000000000 -0400
++++ setup.py
+@@ -13,22 +13,9 @@ scripts = ["cdv", "cdvserver", "cdvpassw
+ plat_ext = []
+ data_files = [('share/doc/Codeville-' + Codeville.version, ['LICENSE.txt'])]
+ 
+-if sys.platform == 'win32':
+-    from distutils.core import Extension
+-    if sys.version < '2.4':
+-        plat_ext = [Extension("Codeville.winrandom",
+-                              libraries = ['ws2_32', 'advapi32'],
+-                              sources = ["src/winrand.c"])]
+-    for i in xrange(len(scripts)):
+-        shutil.copy(scripts[i], scripts[i] + '.py')
+-        scripts[i] = scripts[i] + '.py'
+-    #os.copy('bin/winrandom.pyd', 'Codeville/winrandom.pyd')
+-else:
+-    data_files[0][1].append('cdvserver.conf.sample')
+-
+ for arg in sys.argv:
+     if arg.find('wininst') >= 0:
+-        data_files = [('', ['LICENSE.txt'])]
++        data_files = [(['LICENSE.txt'])]
+         for i in xrange(len(scripts)):
+             shutil.copy(scripts[i], scripts[i] + '.py')
+             scripts[i] = scripts[i] + '.py'