Fix pathname substitution.

XXX this really should have an rc.d script and INSTALL/DEINSTALL
scripts/OWN_DIRS and/or REQD_DIRS.  Volunteers? ;)

bump rev.

5 files changed, 45 insertions, 17 deletions

diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile
index 8929fa6d702..3e76c038053 100644
--- a/devel/codeville/Makefile
+++ b/devel/codeville/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2008/06/13 04:55:53 bjs Exp $
+# $NetBSD: Makefile,v 1.19 2008/06/13 05:57:07 bjs Exp $
 
 DISTNAME=	Codeville-0.8.0
 PKGNAME=	codeville-0.8.0
+PKGREVISION=	1
 CATEGORIES=	devel scm
 MASTER_SITES=	http://codeville.org/download/
 
@@ -18,7 +19,7 @@ BUILD_DEFS+=		VARBASE
 BUILD_DEFS_EFFECTS+=	CODEVILLE_DATADIR
 CODEVILLE_DATADIR?=	${VARBASE}/db/cdv
 
-# XXX Could create a user for the server, rc script, etc.
+# XXX Could create a user for the server, rc script, server directory hier, etc.
 
 CONF_FILES=		${EGDIR}/cdvserver.conf  \
 			${PKG_SYSCONFDIR}/cdvserver.conf
@@ -26,9 +27,9 @@ CONF_FILES=		${EGDIR}/cdvserver.conf  \
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 
 SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	cdvserver.conf.sample
+SUBST_FILES.paths=	cdvserver.conf.sample cdvpasswd cdvserver
 SUBST_MESSAGE.paths=	performing pathname substitutions
-SUBST_STAGE.paths=	pre-install
+SUBST_STAGE.paths=	pre-configure
 SUBST_VARS.paths=	CODEVILLE_DATADIR VARBASE PKG_SYSCONFDIR
 
 post-install:
diff --git a/devel/codeville/distinfo b/devel/codeville/distinfo
index 85200c483a8..158408ef019 100644
--- a/devel/codeville/distinfo
+++ b/devel/codeville/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2008/06/13 04:55:53 bjs Exp $
+$NetBSD: distinfo,v 1.9 2008/06/13 05:57:07 bjs Exp $
 
 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-aa) = 48812e477622a984190b3c2b2e79f647b073df24
+SHA1 (patch-ab) = 7c9d5526741589dde60aa39bfbccdd71daa215a8
+SHA1 (patch-ac) = 19811e55ae4b631dc2dc61357f6dc184ed3ec011
 SHA1 (patch-ad) = 6613f1888b8f1fa6485f807dcd2b568b5c182483
diff --git a/devel/codeville/patches/patch-aa b/devel/codeville/patches/patch-aa
index 4add8a84fe8..2768d34e0fc 100644
--- a/devel/codeville/patches/patch-aa
+++ b/devel/codeville/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2008/06/13 04:55:53 bjs Exp $
+$NetBSD: patch-aa,v 1.4 2008/06/13 05:57:07 bjs Exp $
 
 --- cdvpasswd.orig	2005-11-20 19:33:02.000000000 -0500
 +++ cdvpasswd
@@ -11,3 +11,12 @@ $NetBSD: patch-aa,v 1.3 2008/06/13 04:55:53 bjs Exp $
  
      # do a first pass of the command line to pick up an alternate config
      for (opt, arg) in optlist:
+@@ -51,7 +51,7 @@ def run(args):
+     if platform == 'win32':
+         config.set('control', 'datadir', getcwd())
+     else:
+-        config.set('control', 'datadir', '/var/lib/cdvserver')
++        config.set('control', 'datadir', '@CODEVILLE_DATADIR@')
+ 
+     if not noconfig:
+         try:
diff --git a/devel/codeville/patches/patch-ab b/devel/codeville/patches/patch-ab
index 02163b96778..9c2bf21eeb0 100644
--- a/devel/codeville/patches/patch-ab
+++ b/devel/codeville/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2008/06/13 04:55:53 bjs Exp $
+$NetBSD: patch-ab,v 1.2 2008/06/13 05:57:07 bjs Exp $
 
 --- cdvserver.conf.sample.orig	2005-11-20 19:33:02.000000000 -0500
 +++ cdvserver.conf.sample
@@ -9,15 +9,15 @@ $NetBSD: patch-ab,v 1.1 2008/06/13 04:55:53 bjs Exp $
 -#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
++#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
++#.*=cat >> @VARBASE@/log/cdvcommits.log
diff --git a/devel/codeville/patches/patch-ac b/devel/codeville/patches/patch-ac
index c054dd11f04..935b91197a4 100644
--- a/devel/codeville/patches/patch-ac
+++ b/devel/codeville/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2008/06/13 04:55:53 bjs Exp $
+$NetBSD: patch-ac,v 1.2 2008/06/13 05:57:07 bjs Exp $
 
 --- cdvserver.orig	2006-02-23 15:44:13.000000000 -0500
 +++ cdvserver
@@ -11,3 +11,21 @@ $NetBSD: patch-ac,v 1.1 2008/06/13 04:55:53 bjs Exp $
  
      # parse command line arguments
      initialize = False
+@@ -78,14 +78,14 @@ def run(args):
+ 
+     # set the defaults
+     config.add_section('control')
+-    config.set('control',    'pidfile',    '/var/run/cdvserver.pid')
++    config.set('control',    'pidfile',    '@VARBASE@/run/cdvserver.pid')
+     config.set('control',    'backup',     'False')
+     config.set('control',    'port',       '6601')
+     if sys.platform == 'win32':
+         config.set('control', 'datadir',    os.getcwd())
+     else:
+-        config.set('control', 'datadir', '/var/lib/cdvserver')
+-        config.set('control', 'logfile', '/var/log/cdvserver.log')
++        config.set('control', 'datadir', '@CODEVILLE_DATADIR@')
++        config.set('control', 'logfile', '@VARBASE@/log/cdvserver.log')
+     config.add_section('post-commit')
+ 
+     # next read the config file