rc file for NetBSD

diff --git a/.gitignore b/.gitignore
index 9042833719d2174ff6f2bce5de51b4d1b391f075..e42ea3424f483ba29e5bb7f3a57b84bda8ed3039 100644 (file)
--- 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 020afa29a718733926f59a5fffe32391b993a964..0e02010d99239d25e10774392d9b541e1b7280a6 100644 (file)
--- 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 78de22fad823e90529f0b5cd0948b33ebbea0dc1..430fdfc62d1281f5e23d6a78344ffde065c37df8 100644 (file)
--- 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 bf0cc2972c27b461000ff18833b74e5e5525939e..66117ced4b5f5f8d2c7889578dea4281cb42f094 100644 (file)
--- 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 bb6e7f68d9ecdb669a4d25ee53069923eacafe37..50604f870d7c3bf37bf4b9ea6f46a1f44d552a72 100644 (file)
--- 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 e3f1623716753621f0ec2a8394ca74f62b460a4f..e6eedefc5eb4c81dc09ec60ca4806815a1bff0ce 100644 (file)
--- 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 (file)
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"