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 /mail/horde4-imp | |
| parent | - Modernize rc script handling (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 'mail/horde4-imp')
| -rw-r--r-- | mail/horde4-imp/Makefile | 9 | ||||
| -rw-r--r-- | mail/horde4-imp/pkg-plist | 8 |
2 files changed, 3 insertions, 14 deletions
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile index d53367d4c703..45e068589393 100644 --- a/mail/horde4-imp/Makefile +++ b/mail/horde4-imp/Makefile @@ -120,7 +120,7 @@ PEARDIR?= ${LOCALBASE}/share/pear PLIST_SUB= IMPDIR=${LIMPDIR} 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= IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR} IMPDIR= ${PREFIX}/${LIMPDIR} @@ -226,11 +226,7 @@ do-install: @${CP} -Rp ${WRKSRC}/${REP} ${IMPDIR} .endfor @${CP} -p ${WRKSRC}/*.php ${IMPDIR} -.for FILE in ${CONFFILE} - @if [ ! -f ${CONFDIR}/${FILE} ]; then \ - ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \ - fi -.endfor + @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR} @${INSTALL_DATA} ${WRKDIR}/httpd-imp.conf ${HORDE_INC} @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR} @@ -244,6 +240,7 @@ do-install: .endif post-install: + @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} diff --git a/mail/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist index a5a551a09a26..b549ed80a254 100644 --- a/mail/horde4-imp/pkg-plist +++ b/mail/horde4-imp/pkg-plist @@ -11,21 +11,13 @@ %%IMPDIR%%/compose.php %%IMPDIR%%/config/.htaccess %%IMPDIR%%/config/conf.xml -%%IMPDIR%%/config/filter.txt %%IMPDIR%%/config/filter.txt.dist -%%IMPDIR%%/config/header.php %%IMPDIR%%/config/header.php.dist -%%IMPDIR%%/config/menu.php %%IMPDIR%%/config/menu.php.dist -%%IMPDIR%%/config/mime_drivers.php %%IMPDIR%%/config/mime_drivers.php.dist -%%IMPDIR%%/config/motd.php %%IMPDIR%%/config/motd.php.dist -%%IMPDIR%%/config/prefs.php %%IMPDIR%%/config/prefs.php.dist -%%IMPDIR%%/config/servers.php %%IMPDIR%%/config/servers.php.dist -%%IMPDIR%%/config/trailer.txt %%IMPDIR%%/config/trailer.txt.dist %%IMPDIR%%/contacts.php %%IMPDIR%%/expand.php |