- Replace WITH_APACHE2 by USE_APACHE, rename httpd.conf.xxx to

  httpd-xxx.conf and fix configuration if APACHE_VERSION > 20.

- Don't use the MCAL back-end by default for Kronolith, it is
  deprecated.

- Deinstall bug reported by John Nielsen <john (at) jnielsen.net>:
  respect LHORDEDIR.

- Fix horde-passwd installation / deinstallation.

- Don't bump PORTREVISION, because running installations are not
  concerned.

2 files changed, 31 insertions, 1 deletions

diff --git a/deskutils/horde-kronolith/files/pkg-deinstall.in b/deskutils/horde-kronolith/files/pkg-deinstall.in
new file mode 100644
index 000000000000..896c740dd4da
--- /dev/null
+++ b/deskutils/horde-kronolith/files/pkg-deinstall.in
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Backup Kronolith config files, if needed.
+
+if [ x$2 != xDEINSTALL ]; then
+    exit
+fi
+
+if [ -z "${PACKAGE_BUILDING}" ]; then
+  for cf in `ls %%KRONOLITHDIR%%/config/*php`; do
+    diff -bBqw $cf $cf.dist >/dev/null 2>&1
+    case $? in
+      0)  # original config file, will be deleted by pkg-plist
+          ;;
+      1)  # config file has been updated, must be backuped
+          cp -p $cf $cf.previous
+          echo "===> Backing-up..."
+          echo "--->   $cf has been saved ***"
+          echo "--->      as $cf.previous ***"
+          ;;
+      *)  # not found?
+          ;;
+    esac
+  done
+fi
diff --git a/deskutils/horde-kronolith/files/pkg-message.in b/deskutils/horde-kronolith/files/pkg-message.in
index e7f0e3401e17..54946bd7d451 100644
--- a/deskutils/horde-kronolith/files/pkg-message.in
+++ b/deskutils/horde-kronolith/files/pkg-message.in
@@ -5,7 +5,7 @@ blank configuration files.
 Horde must be configured; if not, see `pkg_info -D -x horde'.
 
 With PHP4:
-If you choose the mcal backend, libmcal must be configured with the driver
+If you choosed the mcal backend, libmcal must be configured with the driver
 mstore for the user www:
 
 - mkdir /var/calendar
@@ -21,6 +21,9 @@ SQL scripts in %%KRONOLITHDIR%%/scripts/sql.
 WARNING! if you are upgrading from Kronolith v. 1.1.x, you have to alter
 ******** your schemas.
          Please read the doc %%DOCSDIR%%/UPGRADING.
+         Please note that the MCAL back-end is deprecated!
+         To migrate from MCAL to SQL, you can use the provided script
+         %%KRONOLITHDIR%%/scripts/migrate_to_sql_driver.php
 
 Finally, you must login to Horde as a Horde Administrator to finish the
 configuration.