aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorHajimu UMEMOTO <ume@FreeBSD.org>2003-08-31 07:05:45 +0000
committerHajimu UMEMOTO <ume@FreeBSD.org>2003-08-31 07:05:45 +0000
commit76c498ae6d437cbbb5f9d4a9d75b9a30ff691106 (patch)
tree358d79db5571b38e54f4561bfaabaa43dab6f23e /mail
parent6751ed7d7017b0178a79f87e243543c718def2c1 (diff)
downloadports-76c498ae6d437cbbb5f9d4a9d75b9a30ff691106.tar.gz
ports-76c498ae6d437cbbb5f9d4a9d75b9a30ff691106.zip
Previous commit to use USE_RC_SUBR was incomplete.
Notes
Notes: svn path=/head/; revision=88167
Diffstat (limited to 'mail')
-rw-r--r--mail/cyrus-imapd2/Makefile10
-rw-r--r--mail/cyrus-imapd2/files/imapd.sh2
-rw-r--r--mail/cyrus-imapd2/pkg-message2
-rw-r--r--mail/cyrus-imapd2/pkg-plist2
-rw-r--r--mail/cyrus-imapd22/Makefile10
-rw-r--r--mail/cyrus-imapd22/files/imapd.sh2
-rw-r--r--mail/cyrus-imapd22/pkg-message2
-rw-r--r--mail/cyrus-imapd22/pkg-plist2
-rw-r--r--mail/cyrus-imapd23/Makefile10
-rw-r--r--mail/cyrus-imapd23/files/imapd.sh2
-rw-r--r--mail/cyrus-imapd23/pkg-message2
-rw-r--r--mail/cyrus-imapd23/pkg-plist2
-rw-r--r--mail/cyrus-imapd24/Makefile10
-rw-r--r--mail/cyrus-imapd24/files/imapd.sh2
-rw-r--r--mail/cyrus-imapd24/pkg-message2
-rw-r--r--mail/cyrus-imapd24/pkg-plist2
16 files changed, 44 insertions, 20 deletions
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 20f1065af07e..3684af670f90 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.1.15
-#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/ \
@@ -120,6 +120,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 \
@@ -178,8 +181,9 @@ post-install:
@${ECHO} "@dirrm share/doc/cyrus-imapd2/man" >>${TMPPLIST}
@${ECHO} "@dirrm share/doc/cyrus-imapd2" >>${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-imapd2/files/imapd.sh b/mail/cyrus-imapd2/files/imapd.sh
index c3e61b10917d..45228af9ab0a 100644
--- a/mail/cyrus-imapd2/files/imapd.sh
+++ b/mail/cyrus-imapd2/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-imapd2/pkg-message b/mail/cyrus-imapd2/pkg-message
index e4429259e376..ff816e46e925 100644
--- a/mail/cyrus-imapd2/pkg-message
+++ b/mail/cyrus-imapd2/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-imapd2/pkg-plist b/mail/cyrus-imapd2/pkg-plist
index 9cea1b0da89f..ddde37ab1d7e 100644
--- a/mail/cyrus-imapd2/pkg-plist
+++ b/mail/cyrus-imapd2/pkg-plist
@@ -41,7 +41,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/acap.h
include/cyrus/acl.h
include/cyrus/assert.h
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 27a9b718accf..60ab2850cd12 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/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-imapd22/files/imapd.sh b/mail/cyrus-imapd22/files/imapd.sh
index c3e61b10917d..45228af9ab0a 100644
--- a/mail/cyrus-imapd22/files/imapd.sh
+++ b/mail/cyrus-imapd22/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-imapd22/pkg-message b/mail/cyrus-imapd22/pkg-message
index e4429259e376..ff816e46e925 100644
--- a/mail/cyrus-imapd22/pkg-message
+++ b/mail/cyrus-imapd22/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-imapd22/pkg-plist b/mail/cyrus-imapd22/pkg-plist
index c400b5a1bb65..d60cce6f568f 100644
--- a/mail/cyrus-imapd22/pkg-plist
+++ b/mail/cyrus-imapd22/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
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 27a9b718accf..60ab2850cd12 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/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-imapd23/files/imapd.sh b/mail/cyrus-imapd23/files/imapd.sh
index c3e61b10917d..45228af9ab0a 100644
--- a/mail/cyrus-imapd23/files/imapd.sh
+++ b/mail/cyrus-imapd23/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-imapd23/pkg-message b/mail/cyrus-imapd23/pkg-message
index e4429259e376..ff816e46e925 100644
--- a/mail/cyrus-imapd23/pkg-message
+++ b/mail/cyrus-imapd23/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-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index c400b5a1bb65..d60cce6f568f 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/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
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 10:37:35 +0000