Missed in previous.

4 files changed, 101 insertions, 0 deletions

diff --git a/www/kahua/patches/patch-ac b/www/kahua/patches/patch-ac
new file mode 100644
index 00000000000..7e1086e1853
--- /dev/null
+++ b/www/kahua/patches/patch-ac
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.1 2007/01/25 01:14:05 uebayasi Exp $
+
+--- doc/Modules/kahua.config.ja.orig	2006-12-26 11:54:59.000000000 +0900
++++ doc/Modules/kahua.config.ja
+@@ -197,7 +197,7 @@ Alias /kahua/ "/usr/local/kahua/var/kahu
+ 
+ 開発ユーザのデータベースファイルのパスを指定します。
+ 
+-サイトバンドル使用時のデフォルト値は #`",(ref (kahua-config) 'etc-directory)/user.conf"、
++サイトバンドル使用時のデフォルト値は #`",(ref (kahua-config) 'conf-directory)/user.conf"、
+ サイトバンドル不使用時のデフォルト値は ${localstatedir}/kahua/user.confです。
+ 
+ *** [slot] spvr-concurrency
+@@ -239,7 +239,8 @@ kahua-spvrが使用するスレッドプールの大き
+  kahua-temporary-directory
+  kahua-log-directory
+  kahua-run-directory
+- kahua-etc-directory
++ kahua-conf-directory
++ kahua-skel-directory
+  kahua-default-database-name
+ }}}
+ 
diff --git a/www/kahua/patches/patch-ad b/www/kahua/patches/patch-ad
new file mode 100644
index 00000000000..ee8cf38ac97
--- /dev/null
+++ b/www/kahua/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2007/01/25 01:14:05 uebayasi Exp $
+
+--- src/kahua-package.scm.orig	2006-12-28 01:02:57.000000000 +0900
++++ src/kahua-package.scm
+@@ -150,7 +150,7 @@
+   (let-args args ((creator "creator=s")
+ 		  (mail "mail=s")
+ 		  . projects)
+-    (let1 skel (build-path (kahua-etc-directory) "skel") ; FIXME!!
++    (let1 skel (build-path (kahua-skel-directory) "skel") ; FIXME!!
+       (for-each (cut generate skel <> creator mail) projects))))
+ 
+ (define *command-table*
diff --git a/www/kahua/patches/patch-ae b/www/kahua/patches/patch-ae
new file mode 100644
index 00000000000..bc8e3032fa7
--- /dev/null
+++ b/www/kahua/patches/patch-ae
@@ -0,0 +1,41 @@
+$NetBSD: patch-ae,v 1.1 2007/01/25 01:14:05 uebayasi Exp $
+
+--- src/kahua/config.scm.in.orig	2006-12-29 20:19:52.000000000 +0900
++++ src/kahua/config.scm.in
+@@ -38,7 +38,8 @@
+ 	  kahua-temporary-directory
+ 	  kahua-log-directory
+ 	  kahua-run-directory
+-	  kahua-etc-directory
++	  kahua-conf-directory
++	  kahua-skel-directory
+ 	  kahua-default-database-name
+ 
+ 	  ;; Global Getter
+@@ -111,7 +112,7 @@
+ 
+    (log-directory :init-keyword :log-directory :init-value "logs" :place :wdir)
+    (run-directory :init-keyword :run-directory :init-value "" :place :wdir)
+-   (etc-directory :init-keyword :etc-directory :init-value "##sysconfdir##" :place :site)
++   (conf-directory :init-keyword :conf-directory :init-value "##sysconfdir##" :place :site)
+ 
+    ;; static-document-path - where kahua process puts static documents.
+    ;;     Httpd must be able to show the contents under this directory.
+@@ -256,7 +257,7 @@
+ 	      temporary-directory
+ 	      log-directory
+ 	      run-directory
+-	      etc-directory
++	      conf-directory
+ 	      default-database-name
+ 	      auto-restart)
+ 
+@@ -372,7 +373,7 @@
+ 			   :shared-mode #o750 :private-mode #o700 :creator ,create-site-child-dir)
+     (run-directory         :value "run"
+ 			   :shared-mode #o750 :private-mode #o700 :creator ,create-site-child-dir)
+-    (etc-directory         :value "etc"
++    (conf-directory         :value "etc"
+ 			   :shared-mode #o750 :private-mode #o700 :creator ,create-site-child-dir)
+     (static-document-path  :value "static"
+ 			   :shared-mode #o775 :private-mode #o755 :creator ,create-site-child-dir)
diff --git a/www/kahua/patches/patch-af b/www/kahua/patches/patch-af
new file mode 100644
index 00000000000..0a67fc1b4f4
--- /dev/null
+++ b/www/kahua/patches/patch-af
@@ -0,0 +1,24 @@
+$NetBSD: patch-af,v 1.1 2007/01/25 01:14:05 uebayasi Exp $
+
+--- test/config.scm.orig	2006-10-08 10:36:20.000000000 +0900
++++ test/config.scm
+@@ -56,7 +56,8 @@
+ 	    ("kahua-temporary-directory" ,kahua-temporary-directory "_work/tmp")
+ 	    ("kahua-log-directory" ,kahua-log-directory "_work/logs")
+ 	    ("kahua-run-directory" ,kahua-run-directory "_work/run")
+-	    ("kahua-etc-directory" ,kahua-etc-directory "_work/etc")
++	    ("kahua-conf-directory" ,kahua-conf-directory "_work/etc")
++	    ("kahua-skel-directory" ,kahua-skel-directory "_work/share/kahua/skel")
+ 	    ("kahua-userconf-file" ,kahua-userconf-file "_work/etc/user.conf")
+ 	    ("kahua-config-file" ,kahua-config-file "_work/etc/kahua.conf")))
+ (test* "kahua-sockbase" #`"unix:,(sys-normalize-pathname \"_work/socket\" :absolute #t)"
+@@ -86,7 +87,8 @@
+ 	    ("kahua-temporary-directory" ,kahua-temporary-directory "_site/tmp")
+ 	    ("kahua-log-directory" ,kahua-log-directory "_site/logs")
+ 	    ("kahua-run-directory" ,kahua-run-directory "_site/run")
+-	    ("kahua-etc-directory" ,kahua-etc-directory "_site/etc")
++	    ("kahua-conf-directory" ,kahua-conf-directory "_site/etc")
++	    ("kahua-skel-directory" ,kahua-skel-directory "_site/share/kahua/skel")
+ 	    ("kahua-userconf-file" ,kahua-userconf-file "_site/etc/user.conf")
+ 	    ("kahua-config-file" ,kahua-config-file "_site/etc/kahua.conf")))
+ (test* "kahua-sockbase" #`"unix:,(sys-normalize-pathname \"_site/socket\" :absolute #t)"