diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-05-23 11:53:59 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-05-23 11:53:59 +0000 |
| commit | 1e313a184c8e8b10ba78c53f4a3e81a73c9e837d (patch) | |
| tree | 80ad6c9fb8e8f7845df29db163f3cc770d260f25 /mail | |
| parent | Actually do update to RC3. (diff) | |
Additional patches from maintainer.
PR: 38391
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=59790
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/horde-turba/Makefile | 8 | ||||
| -rw-r--r-- | mail/horde-turba/pkg-plist | 1 | ||||
| -rw-r--r-- | mail/horde4-turba/Makefile | 8 | ||||
| -rw-r--r-- | mail/horde4-turba/pkg-plist | 1 | ||||
| -rw-r--r-- | mail/turba/Makefile | 8 | ||||
| -rw-r--r-- | mail/turba/pkg-plist | 1 |
6 files changed, 21 insertions, 6 deletions
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile index 4a05bd60fe4b..eb592f783f2f 100644 --- a/mail/horde-turba/Makefile +++ b/mail/horde-turba/Makefile @@ -109,10 +109,14 @@ do-install: @${CHOWN} -R www:www ${TURBADIR} @${CHMOD} -R o-rwx ${CONFDIR} @${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC} - @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ + @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ ${HORDE_INC}/httpd.conf.turba - @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \ + @${CP} -p ${HORDEDIR}/config/registry.php \ + ${HORDEDIR}/config/registry.php.beforeTurba + @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \ ${HORDEDIR}/config/registry.php + @${CP} -p ${HORDEDIR}/config/registry.php \ + ${HORDEDIR}/config/registry.php.afterTurba .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist index a6bddbe43dd4..ed01e81e37ab 100644 --- a/mail/horde-turba/pkg-plist +++ b/mail/horde-turba/pkg-plist @@ -227,3 +227,4 @@ etc/horde/httpd.conf.turba @dirrm %%TURBADIR%%/templates/wml @dirrm %%TURBADIR%%/templates @dirrm %%TURBADIR%% +@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterTurba; then rm -f %D/www/horde/config/registry.php.afterTurba; mv %D/www/horde/config/registry.php.beforeTurba %D/www/horde/config/registry.php; fi diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile index 4a05bd60fe4b..eb592f783f2f 100644 --- a/mail/horde4-turba/Makefile +++ b/mail/horde4-turba/Makefile @@ -109,10 +109,14 @@ do-install: @${CHOWN} -R www:www ${TURBADIR} @${CHMOD} -R o-rwx ${CONFDIR} @${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC} - @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ + @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ ${HORDE_INC}/httpd.conf.turba - @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \ + @${CP} -p ${HORDEDIR}/config/registry.php \ + ${HORDEDIR}/config/registry.php.beforeTurba + @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \ ${HORDEDIR}/config/registry.php + @${CP} -p ${HORDEDIR}/config/registry.php \ + ${HORDEDIR}/config/registry.php.afterTurba .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist index a6bddbe43dd4..ed01e81e37ab 100644 --- a/mail/horde4-turba/pkg-plist +++ b/mail/horde4-turba/pkg-plist @@ -227,3 +227,4 @@ etc/horde/httpd.conf.turba @dirrm %%TURBADIR%%/templates/wml @dirrm %%TURBADIR%%/templates @dirrm %%TURBADIR%% +@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterTurba; then rm -f %D/www/horde/config/registry.php.afterTurba; mv %D/www/horde/config/registry.php.beforeTurba %D/www/horde/config/registry.php; fi diff --git a/mail/turba/Makefile b/mail/turba/Makefile index 4a05bd60fe4b..eb592f783f2f 100644 --- a/mail/turba/Makefile +++ b/mail/turba/Makefile @@ -109,10 +109,14 @@ do-install: @${CHOWN} -R www:www ${TURBADIR} @${CHMOD} -R o-rwx ${CONFDIR} @${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC} - @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ + @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ ${HORDE_INC}/httpd.conf.turba - @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \ + @${CP} -p ${HORDEDIR}/config/registry.php \ + ${HORDEDIR}/config/registry.php.beforeTurba + @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \ ${HORDEDIR}/config/registry.php + @${CP} -p ${HORDEDIR}/config/registry.php \ + ${HORDEDIR}/config/registry.php.afterTurba .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} diff --git a/mail/turba/pkg-plist b/mail/turba/pkg-plist index a6bddbe43dd4..ed01e81e37ab 100644 --- a/mail/turba/pkg-plist +++ b/mail/turba/pkg-plist @@ -227,3 +227,4 @@ etc/horde/httpd.conf.turba @dirrm %%TURBADIR%%/templates/wml @dirrm %%TURBADIR%%/templates @dirrm %%TURBADIR%% +@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterTurba; then rm -f %D/www/horde/config/registry.php.afterTurba; mv %D/www/horde/config/registry.php.beforeTurba %D/www/horde/config/registry.php; fi |