mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00
Code Issues Releases Activity

After a recent discussion on freebsd-ports, I have modified the Horde

Browse Source 
ports, so that they now do not overwrite existing configuration files.
Rather than backing up the old ones and allowing the user to merge the
files by hand, config files are left untouched.

Submitted by:   Shaun Amott <shaun@inerd.com>
This commit is contained in:
Marc G. Fournier 2006-04-15 16:23:50 +00:00
parent f25b2bf7b3
commit c39f144013
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=159613
33 changed files with 270 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devel/chora/files/pkg-deinstall.in
View File

@ -12,13 +12,10 @@ if [ -z "${PACKAGE_BUILDING}" ]; then
for cf in `ls %%CHORADIR%%/config/*php %%CHORADIR%%/config/*txt`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
0) # original config file, will be deleted by pkg-plist
0) # original config file, delete it
rm -f $cf
;;
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 ***"
1) # config file has been updated, leave it alone
;;
*) # not found?
;;

23
devel/chora/files/pkg-install.in Normal file
View File

@ -0,0 +1,23 @@
#!/bin/sh
#
# $FreeBSD$
#
PATH=/usr/sbin:/usr/bin:/bin ; export PATH
case $2 in
PRE-INSTALL)
;;
POST-INSTALL)
if [ -z "${PACKAGE_BUILDING}" ]; then
# Copy over sample config files unless they already exist
for cf in `ls %%CHORADIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
if [ ! -f $cf ]; then
cp -p $cf.dist $cf
fi
done
fi
;;
esac

9
devel/horde-chora/files/pkg-deinstall.in
View File

@ -12,13 +12,10 @@ if [ -z "${PACKAGE_BUILDING}" ]; then
for cf in `ls %%CHORADIR%%/config/*php %%CHORADIR%%/config/*txt`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
0) # original config file, will be deleted by pkg-plist
0) # original config file, delete it
rm -f $cf
;;
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 ***"
1) # config file has been updated, leave it alone
;;
*) # not found?
;;

23
devel/horde-chora/files/pkg-install.in Normal file
View File

@ -0,0 +1,23 @@
#!/bin/sh
#
# $FreeBSD$
#
PATH=/usr/sbin:/usr/bin:/bin ; export PATH
case $2 in
PRE-INSTALL)
;;
POST-INSTALL)
if [ -z "${PACKAGE_BUILDING}" ]; then
# Copy over sample config files unless they already exist
for cf in `ls %%CHORADIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
if [ ! -f $cf ]; then
cp -p $cf.dist $cf
fi
done
fi
;;
esac

10
mail/horde-imp/files/pkg-deinstall.in
View File

@ -2,7 +2,6 @@
#
# $FreeBSD$
#
# Backup IMP config files, if needed.
if [ x$2 != xDEINSTALL ]; then
exit
@ -12,13 +11,10 @@ if [ -z "${PACKAGE_BUILDING}" ]; then
for cf in `ls %%IMPDIR%%/config/*php %%IMPDIR%%/config/*txt`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
0) # original config file, will be deleted by pkg-plist
0) # original config file, delete it
rm -f $cf
;;
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 ***"
1) # config file has been updated, leave it alone
;;
*) # not found?
;;

23
mail/horde-imp/files/pkg-install.in Normal file
View File

@ -0,0 +1,23 @@
#!/bin/sh
#
# $FreeBSD$
#
PATH=/usr/sbin:/usr/bin:/bin ; export PATH
case $2 in
PRE-INSTALL)
;;
POST-INSTALL)
if [ -z "${PACKAGE_BUILDING}" ]; then
# Copy over sample config files unless they already exist
for cf in `ls %%IMPDIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
if [ ! -f $cf ]; then
cp -p $cf.dist $cf
fi
done
fi
;;
esac

11
mail/horde-ingo/Makefile
View File

@ -20,7 +20,7 @@ MASTER_SITES= ftp://ftp.horde.org/pub/ingo/ \
DISTNAME= ${PORTNAME}-h3-${PORTVERSION}
MAINTAINER= shaun@inerd.com
COMMENT= Horde's email-filter management application
COMMENT= Horde\'s email-filter management application
#-----------------------------------------------------------------------
# You may define this option:
@ -39,7 +39,7 @@ USE_APACHE= 1.3+ # needed to test APACHE_VERSION
PLIST_SUB= INGODIR=${LINGODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
PKGMESSAGE= ${WRKDIR}/pkg-message
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
SUB_FILES= pkg-message pkg-deinstall
SUB_FILES= pkg-message pkg-install pkg-deinstall
SUB_LIST= INGODIR=${INGODIR}
DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \
@ -76,11 +76,7 @@ do-install:
@${CP} -Rp ${WRKSRC}/${REP} ${INGODIR}
.endfor
@${CP} -p ${WRKSRC}/*.php ${INGODIR}
.for FILE in ${CONFFILE}
@if [ ! -f ${CONFDIR}/${FILE} ]; then \
${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
fi
.endfor
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC}
@ -93,6 +89,7 @@ do-install:
.endif
post-install:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}

9
mail/horde-ingo/files/pkg-deinstall.in
View File

@ -12,13 +12,10 @@ if [ -z "${PACKAGE_BUILDING}" ]; then
for cf in `ls %%INGODIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
0) # original config file, will be deleted by pkg-plist
0) # original config file, delete it
rm -f $cf
;;
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 ***"
1) # config file has been updated, leave it alone
;;
*) # not found?
;;

23
mail/horde-ingo/files/pkg-install.in Normal file
View File

@ -0,0 +1,23 @@
#!/bin/sh
#
# $FreeBSD$
#
PATH=/usr/sbin:/usr/bin:/bin ; export PATH
case $2 in
PRE-INSTALL)
;;
POST-INSTALL)
if [ -z "${PACKAGE_BUILDING}" ]; then
# Copy over sample config files unless they already exist
for cf in `ls %%INGODIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
if [ ! -f $cf ]; then
cp -p $cf.dist $cf
fi
done
fi
;;
esac

3
mail/horde-ingo/pkg-plist
View File

@ -8,12 +8,9 @@
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%INGODIR%%/blacklist.php
%%INGODIR%%/config/.htaccess
%%INGODIR%%/config/backends.php
%%INGODIR%%/config/backends.php.dist
%%INGODIR%%/config/conf.xml
%%INGODIR%%/config/fields.php
%%INGODIR%%/config/fields.php.dist
%%INGODIR%%/config/prefs.php
%%INGODIR%%/config/prefs.php.dist
%%INGODIR%%/filters.php
%%INGODIR%%/forward.php

10
mail/horde4-imp/files/pkg-deinstall.in
View File

@ -2,7 +2,6 @@
#
# $FreeBSD$
#
# Backup IMP config files, if needed.
if [ x$2 != xDEINSTALL ]; then
exit
@ -12,13 +11,10 @@ if [ -z "${PACKAGE_BUILDING}" ]; then
for cf in `ls %%IMPDIR%%/config/*php %%IMPDIR%%/config/*txt`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
0) # original config file, will be deleted by pkg-plist
0) # original config file, delete it
rm -f $cf
;;
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 ***"
1) # config file has been updated, leave it alone
;;
*) # not found?
;;

23
mail/horde4-imp/files/pkg-install.in Normal file
View File

@ -0,0 +1,23 @@
#!/bin/sh
#
# $FreeBSD$
#
PATH=/usr/sbin:/usr/bin:/bin ; export PATH
case $2 in
PRE-INSTALL)
;;
POST-INSTALL)
if [ -z "${PACKAGE_BUILDING}" ]; then
# Copy over sample config files unless they already exist
for cf in `ls %%IMPDIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
if [ ! -f $cf ]; then
cp -p $cf.dist $cf
fi
done
fi
;;
esac

11
mail/horde4-ingo/Makefile
View File

@ -20,7 +20,7 @@ MASTER_SITES= ftp://ftp.horde.org/pub/ingo/ \
DISTNAME= ${PORTNAME}-h3-${PORTVERSION}
MAINTAINER= shaun@inerd.com
COMMENT= Horde's email-filter management application
COMMENT= Horde\'s email-filter management application
#-----------------------------------------------------------------------
# You may define this option:
@ -39,7 +39,7 @@ USE_APACHE= 1.3+ # needed to test APACHE_VERSION
PLIST_SUB= INGODIR=${LINGODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
PKGMESSAGE= ${WRKDIR}/pkg-message
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
SUB_FILES= pkg-message pkg-deinstall
SUB_FILES= pkg-message pkg-install pkg-deinstall
SUB_LIST= INGODIR=${INGODIR}
DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \
@ -76,11 +76,7 @@ do-install:
@${CP} -Rp ${WRKSRC}/${REP} ${INGODIR}
.endfor
@${CP} -p ${WRKSRC}/*.php ${INGODIR}
.for FILE in ${CONFFILE}
@if [ ! -f ${CONFDIR}/${FILE} ]; then \
${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
fi
.endfor
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC}
@ -93,6 +89,7 @@ do-install:
.endif
post-install:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}

9
mail/horde4-ingo/files/pkg-deinstall.in
View File

@ -12,13 +12,10 @@ if [ -z "${PACKAGE_BUILDING}" ]; then
for cf in `ls %%INGODIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
0) # original config file, will be deleted by pkg-plist
0) # original config file, delete it
rm -f $cf
;;
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 ***"
1) # config file has been updated, leave it alone
;;
*) # not found?
;;

23
mail/horde4-ingo/files/pkg-install.in Normal file
View File

@ -0,0 +1,23 @@
#!/bin/sh
#
# $FreeBSD$
#
PATH=/usr/sbin:/usr/bin:/bin ; export PATH
case $2 in
PRE-INSTALL)
;;
POST-INSTALL)
if [ -z "${PACKAGE_BUILDING}" ]; then
# Copy over sample config files unless they already exist
for cf in `ls %%INGODIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
if [ ! -f $cf ]; then
cp -p $cf.dist $cf
fi
done
fi
;;
esac

3
mail/horde4-ingo/pkg-plist
View File

@ -8,12 +8,9 @@
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%INGODIR%%/blacklist.php
%%INGODIR%%/config/.htaccess
%%INGODIR%%/config/backends.php
%%INGODIR%%/config/backends.php.dist
%%INGODIR%%/config/conf.xml
%%INGODIR%%/config/fields.php
%%INGODIR%%/config/fields.php.dist
%%INGODIR%%/config/prefs.php
%%INGODIR%%/config/prefs.php.dist
%%INGODIR%%/filters.php
%%INGODIR%%/forward.php

10
mail/imp/files/pkg-deinstall.in
View File

@ -2,7 +2,6 @@
#
# $FreeBSD$
#
# Backup IMP config files, if needed.
if [ x$2 != xDEINSTALL ]; then
exit
@ -12,13 +11,10 @@ if [ -z "${PACKAGE_BUILDING}" ]; then
for cf in `ls %%IMPDIR%%/config/*php %%IMPDIR%%/config/*txt`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
0) # original config file, will be deleted by pkg-plist
0) # original config file, delete it
rm -f $cf
;;
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 ***"
1) # config file has been updated, leave it alone
;;
*) # not found?
;;

23
mail/imp/files/pkg-install.in Normal file
View File

@ -0,0 +1,23 @@
#!/bin/sh
#
# $FreeBSD$
#
PATH=/usr/sbin:/usr/bin:/bin ; export PATH
case $2 in
PRE-INSTALL)
;;
POST-INSTALL)
if [ -z "${PACKAGE_BUILDING}" ]; then
# Copy over sample config files unless they already exist
for cf in `ls %%IMPDIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
if [ ! -f $cf ]; then
cp -p $cf.dist $cf
fi
done
fi
;;
esac

11
mail/ingo/Makefile
View File

@ -20,7 +20,7 @@ MASTER_SITES= ftp://ftp.horde.org/pub/ingo/ \
DISTNAME= ${PORTNAME}-h3-${PORTVERSION}
MAINTAINER= shaun@inerd.com
COMMENT= Horde's email-filter management application
COMMENT= Horde\'s email-filter management application
#-----------------------------------------------------------------------
# You may define this option:
@ -39,7 +39,7 @@ USE_APACHE= 1.3+ # needed to test APACHE_VERSION
PLIST_SUB= INGODIR=${LINGODIR} HORDE_INC=${HORDE_INC:S|^${LOCALBASE}/||}
PKGMESSAGE= ${WRKDIR}/pkg-message
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
SUB_FILES= pkg-message pkg-deinstall
SUB_FILES= pkg-message pkg-install pkg-deinstall
SUB_LIST= INGODIR=${INGODIR}
DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \
@ -76,11 +76,7 @@ do-install:
@${CP} -Rp ${WRKSRC}/${REP} ${INGODIR}
.endfor
@${CP} -p ${WRKSRC}/*.php ${INGODIR}
.for FILE in ${CONFFILE}
@if [ ! -f ${CONFDIR}/${FILE} ]; then \
${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \
fi
.endfor
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR}
@${CHMOD} -R o-rwx ${CONFDIR}
@${INSTALL_DATA} ${WRKDIR}/httpd-ingo.conf ${HORDE_INC}
@ -93,6 +89,7 @@ do-install:
.endif
post-install:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}

9
mail/ingo/files/pkg-deinstall.in
View File

@ -12,13 +12,10 @@ if [ -z "${PACKAGE_BUILDING}" ]; then
for cf in `ls %%INGODIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
0) # original config file, will be deleted by pkg-plist
0) # original config file, delete it
rm -f $cf
;;
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 ***"
1) # config file has been updated, leave it alone
;;
*) # not found?
;;

23
mail/ingo/files/pkg-install.in Normal file
View File

@ -0,0 +1,23 @@
#!/bin/sh
#
# $FreeBSD$
#
PATH=/usr/sbin:/usr/bin:/bin ; export PATH
case $2 in
PRE-INSTALL)
;;
POST-INSTALL)
if [ -z "${PACKAGE_BUILDING}" ]; then
# Copy over sample config files unless they already exist
for cf in `ls %%INGODIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
if [ ! -f $cf ]; then
cp -p $cf.dist $cf
fi
done
fi
;;
esac

3
mail/ingo/pkg-plist
View File

@ -8,12 +8,9 @@
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%INGODIR%%/blacklist.php
%%INGODIR%%/config/.htaccess
%%INGODIR%%/config/backends.php
%%INGODIR%%/config/backends.php.dist
%%INGODIR%%/config/conf.xml
%%INGODIR%%/config/fields.php
%%INGODIR%%/config/fields.php.dist
%%INGODIR%%/config/prefs.php
%%INGODIR%%/config/prefs.php.dist
%%INGODIR%%/filters.php
%%INGODIR%%/forward.php

9
www/horde-base/files/pkg-deinstall.in
View File

@ -22,13 +22,10 @@ handle_config() {
for cf in `ls %%HORDEDIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
0) # original config file, will be deleted by pkg-plist
0) # original config file, delete
rm -f $cf
;;
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 ***"
1) # config file has been updated, leave it
;;
*) # not found?
;;

11
www/horde-base/files/pkg-install.in
View File

@ -102,14 +102,11 @@ case $2 in
fi
if [ -z "${PACKAGE_BUILDING}" ]; then
# Don't reset the config to default (PR ports/88621)
# Copy over sample config files unless they already exist
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 ***"
for cf in `ls %%HORDEDIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
if [ ! -f $cf ]; then
cp -p $cf.dist $cf
fi
done
fi

5
www/horde-base/files/pkg-message.in
View File

@ -1,9 +1,6 @@
************************************************************************
Horde has been installed in %%HORDEDIR%% with your blank
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 .
configuration files.
WARNING! the first user will get logged in as an administrator!
********

10
www/horde-passwd/files/pkg-deinstall.in
View File

@ -2,7 +2,6 @@
#
# $FreeBSD$
#
# Backup horde-passwd config files, if needed.
if [ x$2 != xDEINSTALL ]; then
exit
@ -12,13 +11,10 @@ if [ -z "${PACKAGE_BUILDING}" ]; then
for cf in `ls %%PWDDIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
0) # original config file, will be deleted by pkg-plist
0) # original config file, delete it
rm -f $cf
;;
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 ***"
1) # config file has been updated, leave it alone
;;
*) # not found?
;;

23
www/horde-passwd/files/pkg-install.in Normal file
View File

@ -0,0 +1,23 @@
#!/bin/sh
#
# $FreeBSD$
#
PATH=/usr/sbin:/usr/bin:/bin ; export PATH
case $2 in
PRE-INSTALL)
;;
POST-INSTALL)
if [ -z "${PACKAGE_BUILDING}" ]; then
# Copy over sample config files unless they already exist
for cf in `ls %%PWDDIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
if [ ! -f $cf ]; then
cp -p $cf.dist $cf
fi
done
fi
;;
esac

9
www/horde/files/pkg-deinstall.in
View File

@ -22,13 +22,10 @@ handle_config() {
for cf in `ls %%HORDEDIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
0) # original config file, will be deleted by pkg-plist
0) # original config file, delete
rm -f $cf
;;
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 ***"
1) # config file has been updated, leave it
;;
*) # not found?
;;

11
www/horde/files/pkg-install.in
View File

@ -102,14 +102,11 @@ case $2 in
fi
if [ -z "${PACKAGE_BUILDING}" ]; then
# Don't reset the config to default (PR ports/88621)
# Copy over sample config files unless they already exist
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 ***"
for cf in `ls %%HORDEDIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
if [ ! -f $cf ]; then
cp -p $cf.dist $cf
fi
done
fi

5
www/horde/files/pkg-message.in
View File

@ -1,9 +1,6 @@
************************************************************************
Horde has been installed in %%HORDEDIR%% with your blank
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 .
configuration files.
WARNING! the first user will get logged in as an administrator!
********

9
www/horde4-base/files/pkg-deinstall.in
View File

@ -22,13 +22,10 @@ handle_config() {
for cf in `ls %%HORDEDIR%%/config/*php`; do
diff -bBqw $cf $cf.dist >/dev/null 2>&1
case $? in
0) # original config file, will be deleted by pkg-plist
0) # original config file, delete
rm -f $cf
;;
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 ***"
1) # config file has been updated, leave it
;;
*) # not found?
;;

11
www/horde4-base/files/pkg-install.in
View File

@ -102,14 +102,11 @@ case $2 in
fi
if [ -z "${PACKAGE_BUILDING}" ]; then
# Don't reset the config to default (PR ports/88621)
# Copy over sample config files unless they already exist
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 ***"
for cf in `ls %%HORDEDIR%%/config/*.dist | sed -e 's/\.dist//g'`; do
if [ ! -f $cf ]; then
cp -p $cf.dist $cf
fi
done
fi

5
www/horde4-base/files/pkg-message.in
View File

@ -1,9 +1,6 @@
************************************************************************
Horde has been installed in %%HORDEDIR%% with your blank
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 .
configuration files.
WARNING! the first user will get logged in as an administrator!
********