From: PHO <pho@cielonegro.org>
Date: Wed, 17 Feb 2010 08:04:46 +0000 (+0900)
Subject: rc file for NetBSD
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=52ddcf79f6e14cc42ad5067d2821b80b6151b7ba;p=Rakka.git

rc file for NetBSD
---

diff --git a/.gitignore b/.gitignore
index 9042833..e42ea34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ dist/
 Rakka/Resource/JavaScript.hs
 js/packed.js
 js/yuicompressor-*.jar
-repos/
\ No newline at end of file
+rc.d/*/rakka
+repos/
diff --git a/GNUmakefile b/GNUmakefile
index 020afa2..0e02010 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -2,4 +2,7 @@ RUN_COMMAND = sudo ./dist/build/rakka/rakka -p 8989 -l DEBUG -v
 
 CONFIGURE_ARGS = --disable-optimization -fbuild-test-suite
 
-include cabal-package.mk
\ No newline at end of file
+include cabal-package.mk
+
+build-hook:
+	$(MAKE) -C js
diff --git a/Main.hs b/Main.hs
index 78de22f..430fdfc 100644
--- a/Main.hs
+++ b/Main.hs
@@ -95,7 +95,7 @@ options = [ Option ['p'] ["port"]
 
           , Option ['r'] ["rebuild-index"]
                    (NoArg OptRebuildIndex)
-                   "Rebuild the index database."
+                   "Rebuild the index database. (Only for debug purposes)"
 
           , Option ['h'] ["help"]
                    (NoArg OptHelp)
diff --git a/Rakka.cabal b/Rakka.cabal
index bf0cc29..66117ce 100644
--- a/Rakka.cabal
+++ b/Rakka.cabal
@@ -10,8 +10,8 @@ Maintainer:    PHO <pho at cielonegro dot org>
 Stability:     experimental
 Homepage:      http://rakka.cielonegro.org/
 Category:      Web
-Tested-With:   GHC == 6.6.1
-Cabal-Version: >= 1.2
+Tested-With:   GHC == 6.12.1
+Cabal-Version: >= 1.6
 Build-Type:    Custom
 Data-Files:
     defaultPages/Feed.xml
@@ -26,6 +26,7 @@ Data-Files:
     defaultPages/StyleSheet/CieloNegro/Moon.xml
     defaultPages/StyleSheet/CieloNegro.xml
     defaultPages/StyleSheet/Default.xml
+    rc.d/NetBSD/rakka.in
     schemas/rakka-page-1.0.rng
 Extra-Source-Files:
     Rakka.buildinfo.in
@@ -35,14 +36,17 @@ Extra-Source-Files:
     js/base.js
     js/base64.js
     js/editPage.js
+    js/hashedParam.js
     js/hexDump.js
-    js/jquery-1.2.2.js
+    js/jquery-1.2.6.js
     js/jquery-dom.js
     js/localFile.js
     js/login.js
     js/parseuri.js
+    js/redirection.js
     js/screen.js
     js/search.js
+    js/systemConfig.js
     js/uri.js
     tests/RakkaUnitTest.hs
     tests/WikiParserTest.hs
diff --git a/configure.ac b/configure.ac
index bb6e7f6..50604f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,13 +9,20 @@ AC_CONFIG_SRCDIR([Rakka.cabal])
 if test "x$prefix" = "xNONE"; then
    prefix=$ac_default_prefix
 fi
+if test "x$exec_prefix" = "xNONE"; then
+   exec_prefix="$prefix"
+fi
 
 RAKKA_LOCALSTATEDIR=`eval echo "$localstatedir"`/rakka
 AC_SUBST([RAKKA_LOCALSTATEDIR])
 
+RAKKA_BINDIR=`eval echo "$bindir"`
+AC_SUBST([RAKKA_BINDIR])
+
 
 AC_CONFIG_FILES([
         Rakka.buildinfo
+        rc.d/NetBSD/rakka
 ])
 AC_OUTPUT
 
diff --git a/js/Makefile b/js/Makefile
index e3f1623..e6eedef 100644
--- a/js/Makefile
+++ b/js/Makefile
@@ -11,8 +11,8 @@ SOURCES = \
 	hexDump.js \
 	localFile.js \
 	login.js \
-	redirection.js \
 	parseuri.js \
+	redirection.js \
 	screen.js \
 	search.js \
 	systemConfig.js \
diff --git a/rc.d/NetBSD/rakka.in b/rc.d/NetBSD/rakka.in
new file mode 100644
index 0000000..444b824
--- /dev/null
+++ b/rc.d/NetBSD/rakka.in
@@ -0,0 +1,20 @@
+#!/bin/sh
+# -----------------------------------------------------
+#           Rakka's rc script for NetBSD
+# -----------------------------------------------------
+#        Put this file into your /etc/rc.d/
+# FreeBSD users should also be able to use this script.
+# -----------------------------------------------------
+
+# PROVIDE: rakka
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="rakka"
+rcvar=$name
+command="@RAKKA_BINDIR@/rakka"
+pidfile="@RAKKA_LOCALSTATEDIR@/pid"
+
+load_rc_config $name
+run_rc_command "$1"