2 files changed, 29 insertions, 5 deletions

diff --git a/www/horde-base/files/pkg-install.in b/www/horde-base/files/pkg-install.in
index f7c747d933a9..28db88333734 100644
--- a/www/horde-base/files/pkg-install.in
+++ b/www/horde-base/files/pkg-install.in
@@ -7,6 +7,8 @@
 
 PATH=/usr/sbin:/usr/bin:/bin ; export PATH
 
+WITH_SUPHP=%%WITH_SUPHP%%
+
 hordedir=%%HORDEDIR%%
 hordeusr=%%HORDEADMUSR%%
 hordegrp=%%HORDEGRP%%
@@ -74,6 +76,10 @@ create_user() {
 case $2 in
     PRE-INSTALL)
 
+        if [ $WITH_SUPHP != "yes" ]; then
+            exit 0
+        fi
+
         # Create the horde user and group if they do not already exist
 
         if pw user show -n $hordeusr >/dev/null 2>&1 ; then
@@ -88,9 +94,24 @@ case $2 in
 	;;
     POST-INSTALL)
 
-    	# Change ownership of the Horde directory
-
-        echo "===> Adjusting file ownership in $hordedir"
-        chown -R $hordeusr:$hordegrp $hordedir || exit 1
+        if [ $WITH_SUPHP = "yes" ]; then
+    	    # Change ownership of the Horde directory
+
+            echo "===> Adjusting file ownership in $hordedir"
+            chown -R $hordeusr:$hordegrp $hordedir || exit 1
+        fi
+
+        if [ -z "${PACKAGE_BUILDING}" ]; then
+            # Don't reset the config to default (PR ports/88621)
+
+            for cf in `ls %%HORDEDIR%%/config/*php`; do
+                if [ -f $cf.previous ]; then
+                    mv $cf $cf.new
+                    echo "--->   $cf not installed ***"
+                    echo "--->       please copy from $cf.previous ***"
+                    echo "--->                or from $cf.new      ***"
+                fi
+            done
+        fi
 	;;
 esac
diff --git a/www/horde-base/files/pkg-message.in b/www/horde-base/files/pkg-message.in
index b910ccbe6f2b..20dc02d0e715 100644
--- a/www/horde-base/files/pkg-message.in
+++ b/www/horde-base/files/pkg-message.in
@@ -1,6 +1,9 @@
 ************************************************************************
 Horde has been installed in %%HORDEDIR%% with your blank
-configuration files.
+configuration files. After a reinstallation, you have to explicitely
+merge your files %%HORDEDIR%%/config/conf.php.new
+and %%HORDEDIR%%/config/conf.php.previous
+into %%HORDEDIR%%/config/conf.php .
 
 If you want Horde to access a database, you have to run the
 appropriate scripts located in %%HORDEDIR%%/scripts/sql.