diff options
| author | Marc G. Fournier <scrappy@FreeBSD.org> | 2006-04-15 16:29:25 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@FreeBSD.org> | 2006-04-15 16:29:25 +0000 |
| commit | 40c0be9ecac7f00b6ecb0417c486724bfc1295d4 (patch) | |
| tree | fb9646133f8a9c0c0c2dcea4a35fcfada4dc46f7 /www/horde4-base | |
| parent | cb82aed396f484e94eccf0d8aca9999d1447c4e0 (diff) | |
After a recent discussion on freebsd-ports, I have modified the Horde
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.
PR:
Submitted by: Shaun Amott <shaun@inerd.com>
Notes
Notes:
svn path=/head/; revision=159616
Diffstat (limited to 'www/horde4-base')
| -rw-r--r-- | www/horde4-base/Makefile | 10 | ||||
| -rw-r--r-- | www/horde4-base/pkg-plist | 7 |
2 files changed, 3 insertions, 14 deletions
diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile index 768c66701098..d3ead20ceed6 100644 --- a/www/horde4-base/Makefile +++ b/www/horde4-base/Makefile @@ -137,7 +137,7 @@ USE_PHP+= mcrypt . if !defined(WITHOUT_MYSQL) USE_PHP+= mysql . endif -. if defined(WITH_POSTGRESQL) +. if defined(WITH_POSTGRESQL) || defined(WITH_PGSQL) USE_PHP+= pgsql . endif . if defined(WITH_SQLITE) @@ -339,11 +339,7 @@ do-install: @${CP} -Rp ${WRKSRC}/${REP} ${HORDEDIR} .endfor @${CP} -p ${WRKSRC}/*.php ${HORDEDIR} -.for FILE in ${CONFFILE} - @if [ ! -f ${CONFDIR}/${FILE} ]; then \ - ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \ - fi -.endfor + @${CP} ${WRKSRC}/scripts/set_perms.sh ${HORDESBIN}/horde_set_perms.sh @${CHMOD} u+x ${HORDESBIN}/horde_set_perms.sh .if ${APACHE_VERSION} >= 20 @@ -373,7 +369,7 @@ do-install: .endif post-install: - ${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} diff --git a/www/horde4-base/pkg-plist b/www/horde4-base/pkg-plist index ecf416f5f932..b6c9440b422b 100644 --- a/www/horde4-base/pkg-plist +++ b/www/horde4-base/pkg-plist @@ -35,20 +35,13 @@ %%HORDEDIR%%/admin/templates.php %%HORDEDIR%%/admin/user.php %%HORDEDIR%%/config/.htaccess -%%HORDEDIR%%/config/conf.php %%HORDEDIR%%/config/conf.php.dist %%HORDEDIR%%/config/conf.xml -%%HORDEDIR%%/config/hooks.php %%HORDEDIR%%/config/hooks.php.dist -%%HORDEDIR%%/config/mime_drivers.php %%HORDEDIR%%/config/mime_drivers.php.dist -%%HORDEDIR%%/config/motd.php %%HORDEDIR%%/config/motd.php.dist -%%HORDEDIR%%/config/nls.php %%HORDEDIR%%/config/nls.php.dist -%%HORDEDIR%%/config/prefs.php %%HORDEDIR%%/config/prefs.php.dist -%%HORDEDIR%%/config/registry.php %%HORDEDIR%%/config/registry.php.dist %%HORDEDIR%%/index.php %%HORDEDIR%%/js/addEvent.php |