3 files changed, 25 insertions, 18 deletions
diff --git a/www/instiki/files/instiki.in b/www/instiki/files/instiki.in
index 8dd072b43ece..645638f61ac1 100644
--- a/www/instiki/files/instiki.in
+++ b/www/instiki/files/instiki.in
@@ -6,7 +6,7 @@
 # Add the following line to /etc/rc.conf[.local] to enable instiki:
 # instiki_enable (bool):      Set to "NO" by default
 #                             Set it to "YES" to enable instiki
-# instiki_flags (str):        Set to "--port %%INSTIKIPORT%% --storage %%PREFIX%%/%%INSTIKIDIR%%/storage --daemon" by default.
+# instiki_flags (str):        Set to "--port %%INSTIKIPORT%% --daemon" by default.
 #                             Extra flags passed to start command
 #
 
@@ -20,9 +20,12 @@ rcvar=${name}_enable
 command="%%PREFIX%%/%%INSTIKIDIR%%/instiki"
 command_interpreter="%%RUBY_WITH_SUFFIX%%"
 
-: ${doormand_enable="NO"}
-: ${instiki_flags="--port %%INSTIKIPORT%% --storage %%PREFIX%%/%%INSTIKIDIR%%/storage --daemon"}
+: ${instiki_enable="NO"}
+: ${instiki_flags="--port %%INSTIKIPORT%% --daemon"}
 
-sig_stop=-TERM
+sig_stop=-KILL
 
 load_rc_config $name
+
+run_rc_command "$1"
+
diff --git a/www/instiki/files/patch-vendor_rails_activesupport_lib_active_support_clean_logger.rb b/www/instiki/files/patch-vendor_rails_activesupport_lib_active_support_clean_logger.rb
deleted file mode 100644
index 1409cd25ebcc..000000000000
--- a/www/instiki/files/patch-vendor_rails_activesupport_lib_active_support_clean_logger.rb
+++ /dev/null
@@ -1,14 +0,0 @@
---- vendor/rails/activesupport/lib/active_support/clean_logger.rb.orig	2005-09-21 00:31:08.000000000 -0700
-+++ vendor/rails/activesupport/lib/active_support/clean_logger.rb	2005-09-21 00:45:36.000000000 -0700
-@@ -10,7 +10,9 @@
-   end
- 
-   private
--    remove_const "Format"
-+    if const_defined?(:Format) # Not defined in Ruby 1.8.3
-+      remove_const "Format"
-+    end
-     Format = "%s\n"
-     def format_message(severity, timestamp, msg, progname)
-       Format % [msg]
---- patch-as_clean_logger_rb ends here ---
diff --git a/www/instiki/files/pkg-deinstall.in b/www/instiki/files/pkg-deinstall.in
new file mode 100644
index 000000000000..e810545974e9
--- /dev/null
+++ b/www/instiki/files/pkg-deinstall.in
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+
+if [ "$2" != "DEINSTALL" ]; then
+    exit 0
+fi
+
+echo "comparing databases in %%PREFIX%%/%%INSTIKIDIR%%/db"
+
+cd %%PREFIX%%/%%INSTIKIDIR%%/db || exit 1
+if ! cmp -s -z production.db.sqlite3 default.db.sqlite3; then
+    echo "production.db.sqlite3 changed from default, not removing"
+else
+    echo "production.db.sqlite3 unchanged from default, removing"
+    rm production.db.sqlite3
+fi
+
+exit 0