summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorHajimu UMEMOTO <ume@FreeBSD.org>2001-04-06 18:53:09 +0000
committerHajimu UMEMOTO <ume@FreeBSD.org>2001-04-06 18:53:09 +0000
commite63942da4626c5b64c4855bb37c8c01e07a55a70 (patch)
tree6f765775495e7ce119afe6bedd1f3ae03055a17d /mail
parentModify ri.el and define an access key `Q' that does kill-buffer & (diff)
Since spool location is configurable by user, prevent making spool
at install time. Install mkimap script and show guidance, instead. Reported by: David A. Koran <dak@solo.net>
Notes
Notes: svn path=/head/; revision=40959
Diffstat (limited to 'mail')
-rw-r--r--mail/cyrus-imapd/Makefile21
-rw-r--r--mail/cyrus-imapd/files/imapd.conf5
-rw-r--r--mail/cyrus-imapd/pkg-message6
-rw-r--r--mail/cyrus-imapd/pkg-plist1
-rw-r--r--mail/cyrus-imapd2/Makefile21
-rw-r--r--mail/cyrus-imapd2/files/imapd.conf5
-rw-r--r--mail/cyrus-imapd2/pkg-message6
-rw-r--r--mail/cyrus-imapd2/pkg-plist1
-rw-r--r--mail/cyrus-imapd22/Makefile21
-rw-r--r--mail/cyrus-imapd22/files/imapd.conf5
-rw-r--r--mail/cyrus-imapd22/pkg-message6
-rw-r--r--mail/cyrus-imapd22/pkg-plist1
-rw-r--r--mail/cyrus-imapd23/Makefile21
-rw-r--r--mail/cyrus-imapd23/files/imapd.conf5
-rw-r--r--mail/cyrus-imapd23/pkg-message6
-rw-r--r--mail/cyrus-imapd23/pkg-plist1
-rw-r--r--mail/cyrus-imapd24/Makefile21
-rw-r--r--mail/cyrus-imapd24/files/imapd.conf5
-rw-r--r--mail/cyrus-imapd24/pkg-message6
-rw-r--r--mail/cyrus-imapd24/pkg-plist1
20 files changed, 75 insertions, 90 deletions
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index c562bd0340c5..516318122ba0 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -87,24 +87,9 @@ post-install:
${PREFIX}/etc/imapd.conf.dist
${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
${PREFIX}/etc/cyrus.conf.dist
- ${WRKSRC}/tools/mkimap ${FILESDIR}/imapd.conf
- ${CHOWN} -R cyrus:cyrus /var/imap
- ${CHOWN} -R cyrus:cyrus /var/spool/imap
- @${ECHO} "@cwd /var" >>${TMPPLIST}
- @${ECHO} "@exec ${MKDIR} imap" >>${TMPPLIST}
-.for dir in user socket sieve quota proc msg log deliverdb/db deliverdb db
- @${ECHO} "@exec ${MKDIR} imap/${dir}" >>${TMPPLIST}
- @${ECHO} "@dirrm imap/${dir}" >>${TMPPLIST}
-.endfor
- @${ECHO} "@dirrm imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHOWN} -R cyrus:cyrus imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHMOD} -R g-w,o= imap" >>${TMPPLIST}
- @${ECHO} "@mode u=rwx,go=" >>${TMPPLIST}
- @${ECHO} "@exec ${MKDIR} spool/imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHOWN} cyrus:cyrus spool/imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHMOD} g-w,o= spool/imap" >>${TMPPLIST}
- @${ECHO} "@dirrm spool/imap/stage." >>${TMPPLIST}
- @${ECHO} "@dirrm spool/imap" >>${TMPPLIST}
+ ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
+ ${PREFIX}/cyrus/bin/mkimap
@PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd/files/imapd.conf b/mail/cyrus-imapd/files/imapd.conf
index eaae8d05ad8a..fd96dd9482c0 100644
--- a/mail/cyrus-imapd/files/imapd.conf
+++ b/mail/cyrus-imapd/files/imapd.conf
@@ -135,5 +135,10 @@ sasl_pwcheck_method: pwcheck
#
#sasl_auto_transition: no
+# If you wish to enable TLS/SSL, put CERT into following place, then
+# uncomment this.
+#tls_cert_file: /var/imap/server.pem
+#tls_key_file: /var/imap/server.pem
+
#
# EOF
diff --git a/mail/cyrus-imapd/pkg-message b/mail/cyrus-imapd/pkg-message
new file mode 100644
index 000000000000..24125a8e21e4
--- /dev/null
+++ b/mail/cyrus-imapd/pkg-message
@@ -0,0 +1,6 @@
+****************************************************************************
+
+To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
+then run `/usr/local/cyrus/bin/mkimap /usr/local/etc/imapd.conf'.
+
+****************************************************************************
diff --git a/mail/cyrus-imapd/pkg-plist b/mail/cyrus-imapd/pkg-plist
index 257f9378dc4d..0d777307c18b 100644
--- a/mail/cyrus-imapd/pkg-plist
+++ b/mail/cyrus-imapd/pkg-plist
@@ -11,6 +11,7 @@ cyrus/bin/ipurge
cyrus/bin/lmtpd
cyrus/bin/master
cyrus/bin/mbpath
+cyrus/bin/mkimap
cyrus/bin/pop3d
cyrus/bin/reconstruct
cyrus/bin/timsieved
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index c562bd0340c5..516318122ba0 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -87,24 +87,9 @@ post-install:
${PREFIX}/etc/imapd.conf.dist
${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
${PREFIX}/etc/cyrus.conf.dist
- ${WRKSRC}/tools/mkimap ${FILESDIR}/imapd.conf
- ${CHOWN} -R cyrus:cyrus /var/imap
- ${CHOWN} -R cyrus:cyrus /var/spool/imap
- @${ECHO} "@cwd /var" >>${TMPPLIST}
- @${ECHO} "@exec ${MKDIR} imap" >>${TMPPLIST}
-.for dir in user socket sieve quota proc msg log deliverdb/db deliverdb db
- @${ECHO} "@exec ${MKDIR} imap/${dir}" >>${TMPPLIST}
- @${ECHO} "@dirrm imap/${dir}" >>${TMPPLIST}
-.endfor
- @${ECHO} "@dirrm imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHOWN} -R cyrus:cyrus imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHMOD} -R g-w,o= imap" >>${TMPPLIST}
- @${ECHO} "@mode u=rwx,go=" >>${TMPPLIST}
- @${ECHO} "@exec ${MKDIR} spool/imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHOWN} cyrus:cyrus spool/imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHMOD} g-w,o= spool/imap" >>${TMPPLIST}
- @${ECHO} "@dirrm spool/imap/stage." >>${TMPPLIST}
- @${ECHO} "@dirrm spool/imap" >>${TMPPLIST}
+ ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
+ ${PREFIX}/cyrus/bin/mkimap
@PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd2/files/imapd.conf b/mail/cyrus-imapd2/files/imapd.conf
index eaae8d05ad8a..fd96dd9482c0 100644
--- a/mail/cyrus-imapd2/files/imapd.conf
+++ b/mail/cyrus-imapd2/files/imapd.conf
@@ -135,5 +135,10 @@ sasl_pwcheck_method: pwcheck
#
#sasl_auto_transition: no
+# If you wish to enable TLS/SSL, put CERT into following place, then
+# uncomment this.
+#tls_cert_file: /var/imap/server.pem
+#tls_key_file: /var/imap/server.pem
+
#
# EOF
diff --git a/mail/cyrus-imapd2/pkg-message b/mail/cyrus-imapd2/pkg-message
new file mode 100644
index 000000000000..24125a8e21e4
--- /dev/null
+++ b/mail/cyrus-imapd2/pkg-message
@@ -0,0 +1,6 @@
+****************************************************************************
+
+To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
+then run `/usr/local/cyrus/bin/mkimap /usr/local/etc/imapd.conf'.
+
+****************************************************************************
diff --git a/mail/cyrus-imapd2/pkg-plist b/mail/cyrus-imapd2/pkg-plist
index 257f9378dc4d..0d777307c18b 100644
--- a/mail/cyrus-imapd2/pkg-plist
+++ b/mail/cyrus-imapd2/pkg-plist
@@ -11,6 +11,7 @@ cyrus/bin/ipurge
cyrus/bin/lmtpd
cyrus/bin/master
cyrus/bin/mbpath
+cyrus/bin/mkimap
cyrus/bin/pop3d
cyrus/bin/reconstruct
cyrus/bin/timsieved
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index c562bd0340c5..516318122ba0 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -87,24 +87,9 @@ post-install:
${PREFIX}/etc/imapd.conf.dist
${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
${PREFIX}/etc/cyrus.conf.dist
- ${WRKSRC}/tools/mkimap ${FILESDIR}/imapd.conf
- ${CHOWN} -R cyrus:cyrus /var/imap
- ${CHOWN} -R cyrus:cyrus /var/spool/imap
- @${ECHO} "@cwd /var" >>${TMPPLIST}
- @${ECHO} "@exec ${MKDIR} imap" >>${TMPPLIST}
-.for dir in user socket sieve quota proc msg log deliverdb/db deliverdb db
- @${ECHO} "@exec ${MKDIR} imap/${dir}" >>${TMPPLIST}
- @${ECHO} "@dirrm imap/${dir}" >>${TMPPLIST}
-.endfor
- @${ECHO} "@dirrm imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHOWN} -R cyrus:cyrus imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHMOD} -R g-w,o= imap" >>${TMPPLIST}
- @${ECHO} "@mode u=rwx,go=" >>${TMPPLIST}
- @${ECHO} "@exec ${MKDIR} spool/imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHOWN} cyrus:cyrus spool/imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHMOD} g-w,o= spool/imap" >>${TMPPLIST}
- @${ECHO} "@dirrm spool/imap/stage." >>${TMPPLIST}
- @${ECHO} "@dirrm spool/imap" >>${TMPPLIST}
+ ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
+ ${PREFIX}/cyrus/bin/mkimap
@PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd22/files/imapd.conf b/mail/cyrus-imapd22/files/imapd.conf
index eaae8d05ad8a..fd96dd9482c0 100644
--- a/mail/cyrus-imapd22/files/imapd.conf
+++ b/mail/cyrus-imapd22/files/imapd.conf
@@ -135,5 +135,10 @@ sasl_pwcheck_method: pwcheck
#
#sasl_auto_transition: no
+# If you wish to enable TLS/SSL, put CERT into following place, then
+# uncomment this.
+#tls_cert_file: /var/imap/server.pem
+#tls_key_file: /var/imap/server.pem
+
#
# EOF
diff --git a/mail/cyrus-imapd22/pkg-message b/mail/cyrus-imapd22/pkg-message
new file mode 100644
index 000000000000..24125a8e21e4
--- /dev/null
+++ b/mail/cyrus-imapd22/pkg-message
@@ -0,0 +1,6 @@
+****************************************************************************
+
+To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
+then run `/usr/local/cyrus/bin/mkimap /usr/local/etc/imapd.conf'.
+
+****************************************************************************
diff --git a/mail/cyrus-imapd22/pkg-plist b/mail/cyrus-imapd22/pkg-plist
index 257f9378dc4d..0d777307c18b 100644
--- a/mail/cyrus-imapd22/pkg-plist
+++ b/mail/cyrus-imapd22/pkg-plist
@@ -11,6 +11,7 @@ cyrus/bin/ipurge
cyrus/bin/lmtpd
cyrus/bin/master
cyrus/bin/mbpath
+cyrus/bin/mkimap
cyrus/bin/pop3d
cyrus/bin/reconstruct
cyrus/bin/timsieved
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index c562bd0340c5..516318122ba0 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -87,24 +87,9 @@ post-install:
${PREFIX}/etc/imapd.conf.dist
${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
${PREFIX}/etc/cyrus.conf.dist
- ${WRKSRC}/tools/mkimap ${FILESDIR}/imapd.conf
- ${CHOWN} -R cyrus:cyrus /var/imap
- ${CHOWN} -R cyrus:cyrus /var/spool/imap
- @${ECHO} "@cwd /var" >>${TMPPLIST}
- @${ECHO} "@exec ${MKDIR} imap" >>${TMPPLIST}
-.for dir in user socket sieve quota proc msg log deliverdb/db deliverdb db
- @${ECHO} "@exec ${MKDIR} imap/${dir}" >>${TMPPLIST}
- @${ECHO} "@dirrm imap/${dir}" >>${TMPPLIST}
-.endfor
- @${ECHO} "@dirrm imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHOWN} -R cyrus:cyrus imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHMOD} -R g-w,o= imap" >>${TMPPLIST}
- @${ECHO} "@mode u=rwx,go=" >>${TMPPLIST}
- @${ECHO} "@exec ${MKDIR} spool/imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHOWN} cyrus:cyrus spool/imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHMOD} g-w,o= spool/imap" >>${TMPPLIST}
- @${ECHO} "@dirrm spool/imap/stage." >>${TMPPLIST}
- @${ECHO} "@dirrm spool/imap" >>${TMPPLIST}
+ ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
+ ${PREFIX}/cyrus/bin/mkimap
@PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd23/files/imapd.conf b/mail/cyrus-imapd23/files/imapd.conf
index eaae8d05ad8a..fd96dd9482c0 100644
--- a/mail/cyrus-imapd23/files/imapd.conf
+++ b/mail/cyrus-imapd23/files/imapd.conf
@@ -135,5 +135,10 @@ sasl_pwcheck_method: pwcheck
#
#sasl_auto_transition: no
+# If you wish to enable TLS/SSL, put CERT into following place, then
+# uncomment this.
+#tls_cert_file: /var/imap/server.pem
+#tls_key_file: /var/imap/server.pem
+
#
# EOF
diff --git a/mail/cyrus-imapd23/pkg-message b/mail/cyrus-imapd23/pkg-message
new file mode 100644
index 000000000000..24125a8e21e4
--- /dev/null
+++ b/mail/cyrus-imapd23/pkg-message
@@ -0,0 +1,6 @@
+****************************************************************************
+
+To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
+then run `/usr/local/cyrus/bin/mkimap /usr/local/etc/imapd.conf'.
+
+****************************************************************************
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index 257f9378dc4d..0d777307c18b 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -11,6 +11,7 @@ cyrus/bin/ipurge
cyrus/bin/lmtpd
cyrus/bin/master
cyrus/bin/mbpath
+cyrus/bin/mkimap
cyrus/bin/pop3d
cyrus/bin/reconstruct
cyrus/bin/timsieved
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index c562bd0340c5..516318122ba0 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -87,24 +87,9 @@ post-install:
${PREFIX}/etc/imapd.conf.dist
${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
${PREFIX}/etc/cyrus.conf.dist
- ${WRKSRC}/tools/mkimap ${FILESDIR}/imapd.conf
- ${CHOWN} -R cyrus:cyrus /var/imap
- ${CHOWN} -R cyrus:cyrus /var/spool/imap
- @${ECHO} "@cwd /var" >>${TMPPLIST}
- @${ECHO} "@exec ${MKDIR} imap" >>${TMPPLIST}
-.for dir in user socket sieve quota proc msg log deliverdb/db deliverdb db
- @${ECHO} "@exec ${MKDIR} imap/${dir}" >>${TMPPLIST}
- @${ECHO} "@dirrm imap/${dir}" >>${TMPPLIST}
-.endfor
- @${ECHO} "@dirrm imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHOWN} -R cyrus:cyrus imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHMOD} -R g-w,o= imap" >>${TMPPLIST}
- @${ECHO} "@mode u=rwx,go=" >>${TMPPLIST}
- @${ECHO} "@exec ${MKDIR} spool/imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHOWN} cyrus:cyrus spool/imap" >>${TMPPLIST}
- @${ECHO} "@exec ${CHMOD} g-w,o= spool/imap" >>${TMPPLIST}
- @${ECHO} "@dirrm spool/imap/stage." >>${TMPPLIST}
- @${ECHO} "@dirrm spool/imap" >>${TMPPLIST}
+ ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
+ ${PREFIX}/cyrus/bin/mkimap
@PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf
index eaae8d05ad8a..fd96dd9482c0 100644
--- a/mail/cyrus-imapd24/files/imapd.conf
+++ b/mail/cyrus-imapd24/files/imapd.conf
@@ -135,5 +135,10 @@ sasl_pwcheck_method: pwcheck
#
#sasl_auto_transition: no
+# If you wish to enable TLS/SSL, put CERT into following place, then
+# uncomment this.
+#tls_cert_file: /var/imap/server.pem
+#tls_key_file: /var/imap/server.pem
+
#
# EOF
diff --git a/mail/cyrus-imapd24/pkg-message b/mail/cyrus-imapd24/pkg-message
new file mode 100644
index 000000000000..24125a8e21e4
--- /dev/null
+++ b/mail/cyrus-imapd24/pkg-message
@@ -0,0 +1,6 @@
+****************************************************************************
+
+To setup mail spool, modify /usr/local/etc/imapd.conf appropriately,
+then run `/usr/local/cyrus/bin/mkimap /usr/local/etc/imapd.conf'.
+
+****************************************************************************
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index 257f9378dc4d..0d777307c18b 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -11,6 +11,7 @@ cyrus/bin/ipurge
cyrus/bin/lmtpd
cyrus/bin/master
cyrus/bin/mbpath
+cyrus/bin/mkimap
cyrus/bin/pop3d
cyrus/bin/reconstruct
cyrus/bin/timsieved
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-03 17:13:07 +0000