diff options
| author | ume <ume@FreeBSD.org> | 2003-08-31 15:05:45 +0800 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2003-08-31 15:05:45 +0800 |
| commit | ed2a8ec6120102f05b25d9c6cc54b6a47980275a (patch) | |
| tree | 4212ae4823477a3d845c76dabd54503e3cb42c5d /mail/cyrus-imapd24 | |
| parent | e0904f3685c360d5ccb77b2336732a16271cd1e8 (diff) | |
| download | freebsd-ports-gnome-ed2a8ec6120102f05b25d9c6cc54b6a47980275a.tar.gz freebsd-ports-gnome-ed2a8ec6120102f05b25d9c6cc54b6a47980275a.tar.zst freebsd-ports-gnome-ed2a8ec6120102f05b25d9c6cc54b6a47980275a.zip | |
Previous commit to use USE_RC_SUBR was incomplete.
Diffstat (limited to 'mail/cyrus-imapd24')
| -rw-r--r-- | mail/cyrus-imapd24/Makefile | 10 | ||||
| -rw-r--r-- | mail/cyrus-imapd24/files/imapd.sh | 2 | ||||
| -rw-r--r-- | mail/cyrus-imapd24/pkg-message | 2 | ||||
| -rw-r--r-- | mail/cyrus-imapd24/pkg-plist | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 27a9b718accf..60ab2850cd12 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -7,7 +7,7 @@ PORTNAME= cyrus-imapd PORTVERSION= 2.2.1.b -#PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ @@ -142,6 +142,9 @@ USE_OPENSSL= yes CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} .endif +RC_SCRIPTS_SUB= PREFIX=${PREFIX} \ + RC_SUBR=${RC_SUBR} + pre-everything:: .if !defined(WITH_BDB_VER) @if ${LDCONFIG} -r | ${GREP} -qwE -e "-ldb(41|4)"; then \ @@ -202,8 +205,9 @@ post-install: @${ECHO} "@dirrm share/doc/cyrus-imapd22/man" >>${TMPPLIST} @${ECHO} "@dirrm share/doc/cyrus-imapd22" >>${TMPPLIST} .endif - ${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \ - ${PREFIX}/etc/rc.d/imapd.sh.sample + @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ + ${FILESDIR}/imapd.sh > ${PREFIX}/etc/rc.d/imapd.sh + @${CHMOD} 755 ${PREFIX}/etc/rc.d/imapd.sh ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${PREFIX}/etc/imapd.conf.dist ${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \ diff --git a/mail/cyrus-imapd24/files/imapd.sh b/mail/cyrus-imapd24/files/imapd.sh index c3e61b10917d..45228af9ab0a 100644 --- a/mail/cyrus-imapd24/files/imapd.sh +++ b/mail/cyrus-imapd24/files/imapd.sh @@ -21,7 +21,7 @@ prefix=%%PREFIX%% # # DO NOT CHANGE THESE DEFAULT VALUES HERE # -cyrus_imapd_enable="YES" # Enable imapd +cyrus_imapd_enable="NO" # Enable imapd #cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd cyrus_imapd_flags="-d" # Flags to imapd program diff --git a/mail/cyrus-imapd24/pkg-message b/mail/cyrus-imapd24/pkg-message index e4429259e376..ff816e46e925 100644 --- a/mail/cyrus-imapd24/pkg-message +++ b/mail/cyrus-imapd24/pkg-message @@ -2,5 +2,7 @@ To setup mail spool, modify /usr/local/etc/imapd.conf appropriately, then run /usr/local/cyrus/bin/mkimap. +To run Cyrus IMAPd from startup, add cyrus_imapd_enable="YES" in your +/etc/rc.conf. **************************************************************************** diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist index c400b5a1bb65..d60cce6f568f 100644 --- a/mail/cyrus-imapd24/pkg-plist +++ b/mail/cyrus-imapd24/pkg-plist @@ -45,7 +45,7 @@ etc/cyrus.conf.dist @unexec if cmp -s %D/etc/imapd.conf %D/etc/imapd.conf.dist; then rm -f %D/etc/imapd.conf; fi etc/imapd.conf.dist @exec [ -f %B/imapd.conf ] || cp %B/%f %B/imapd.conf -etc/rc.d/imapd.sh.sample +etc/rc.d/imapd.sh include/cyrus/acl.h include/cyrus/assert.h include/cyrus/auth.h |