diff options
| author | sf <sf@FreeBSD.org> | 2001-06-29 22:02:04 +0000 |
|---|---|---|
| committer | sf <sf@FreeBSD.org> | 2001-06-29 22:02:04 +0000 |
| commit | 05b7091ebafe1f8b05ec270d5b8ef7f7b5b0187e (patch) | |
| tree | 72ffc26f32da46dbdfb25c4ac80ff0765fd6326a /mail | |
| parent | 535f6aaca99c6ebb6e6105db95227b5d799acdef (diff) | |
| download | FreeBSD-ports-05b7091ebafe1f8b05ec270d5b8ef7f7b5b0187e.zip FreeBSD-ports-05b7091ebafe1f8b05ec270d5b8ef7f7b5b0187e.tar.gz | |
o remove etc/imap/mailboxes only if empty.
o successfully exits even if etc/imap directory fails to remove.
o do not overwrite mailboxes at pkg_add.
o and then bump PORTREVISION.
PR: 28496
Submitted by: "Scot W. Hetzel" <hetzels@westbend.net>
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/cyrus/Makefile | 10 | ||||
| -rw-r--r-- | mail/cyrus/pkg-plist | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile index a3609b3..bed8548 100644 --- a/mail/cyrus/Makefile +++ b/mail/cyrus/Makefile @@ -7,7 +7,7 @@ PORTNAME= cyrus PORTVERSION= 1.6.24 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail tcl82 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ @@ -45,6 +45,7 @@ DOCS= README acl-extension anoncvs bugs changes copyrights install \ mailing-list overview quota-extension server-design HTDOCS= anoncvs bugs changes index install mailing-list overview \ questions readme sieve-protocol sieve + post-install: @ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota .if !defined(NOPORTDOCS) @@ -78,12 +79,13 @@ post-install: ${CHMOD} 640 ${PREFIX}/etc/imap/mailboxes ${CHOWN} cyrus:cyrus ${PREFIX}/etc/imap/mailboxes @${ECHO} "@exec ${MKDIR} %D/etc/imap" >>${TMPPLIST} + @${ECHO} "@unexec if [ ! -s %D/etc/imap/mailboxes ]; then ${RM} %D/etc/imap/mailboxes; fi" >>${TMPPLIST} .for dir in user quota proc log msg @${ECHO} "@exec ${MKDIR} %D/etc/imap/${dir}" >>${TMPPLIST} - @${ECHO} "@dirrm etc/imap/${dir}" >>${TMPPLIST} + @${ECHO} "@unexec rmdir %D/etc/imap/${dir} 2>/dev/null || true" >>${TMPPLIST} .endfor - @${ECHO} "@dirrm etc/imap" >>${TMPPLIST} - @${ECHO} "@exec ${CP} /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST} + @${ECHO} "@unexec rmdir %D/etc/imap 2>/dev/null || true" >>${TMPPLIST} + @${ECHO} "@exec ${TOUCH} %D/etc/imap/mailboxes" >>${TMPPLIST} @${ECHO} "@exec ${CHOWN} -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST} @${ECHO} "@exec ${CHMOD} -R g-w,o= %D/etc/imap" >>${TMPPLIST} @${ECHO} "@mode u=rwx,go=" >>${TMPPLIST} diff --git a/mail/cyrus/pkg-plist b/mail/cyrus/pkg-plist index 552aff8..8e6811e 100644 --- a/mail/cyrus/pkg-plist +++ b/mail/cyrus/pkg-plist @@ -15,7 +15,6 @@ cyrus/bin/pop3d cyrus/bin/reconstruct cyrus/bin/syncnews cyrus/bin/timsieved -etc/imap/mailboxes etc/imapd.conf.dist etc/inetd.conf.cyrus include/cyrus/acl.h |
