From 285496b903962ff0c89633a81bc782a2bc52f01e Mon Sep 17 00:00:00 2001 From: pav Date: Thu, 20 Oct 2005 20:55:00 +0000 Subject: - Update to 1.0.a4 - Use RC_ORDER PR: ports/87732 Submitted by: Robin Breathe (maintainer) --- mail/dovecot-devel/Makefile | 13 ++++---- mail/dovecot-devel/distinfo | 4 +-- mail/dovecot-devel/files/dovecot.sh | 26 --------------- mail/dovecot-devel/files/dovecot.sh.in | 26 +++++++++++++++ .../dovecot-devel/files/patch-dovecot-example.conf | 39 +++++++++------------- mail/dovecot-devel/pkg-plist | 1 - mail/dovecot/Makefile | 13 ++++---- mail/dovecot/distinfo | 4 +-- mail/dovecot/files/dovecot.sh | 26 --------------- mail/dovecot/files/dovecot.sh.in | 26 +++++++++++++++ mail/dovecot/files/patch-dovecot-example.conf | 39 +++++++++------------- mail/dovecot/pkg-plist | 1 - 12 files changed, 100 insertions(+), 118 deletions(-) delete mode 100644 mail/dovecot-devel/files/dovecot.sh create mode 100644 mail/dovecot-devel/files/dovecot.sh.in delete mode 100644 mail/dovecot/files/dovecot.sh create mode 100644 mail/dovecot/files/dovecot.sh.in (limited to 'mail') diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile index 944e24c1deb8..6e5f9fcb14f1 100644 --- a/mail/dovecot-devel/Makefile +++ b/mail/dovecot-devel/Makefile @@ -7,7 +7,7 @@ # PORTNAME= dovecot -DISTVERSION= 1.0.alpha3 +DISTVERSION= 1.0.alpha4 CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/ @@ -15,7 +15,6 @@ MAINTAINER= robin@isometry.net COMMENT= Secure and compact IMAP and POP3 servers USE_ICONV= yes -USE_RC_SUBR= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -40,6 +39,12 @@ OPTIONS= SASL2 "SASL2 support" off \ .include +.if ${OSVERSION} < 500038 +USE_RC_SUBR= dovecot.sh +.else +USE_RCORDER= dovecot.sh +.endif + ## SASL2 support # # SASL provides authentication support to @@ -85,9 +90,6 @@ CONFIGURE_ARGS+= --with-mysql post-build: @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/dovecot-example.conf >${WRKDIR}/dovecot.conf.sample - @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%RC_SUBR%%,${RC_SUBR},g' \ - ${FILESDIR}/dovecot.sh >${WRKDIR}/dovecot.sh pre-install: @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -109,7 +111,6 @@ do-install: ${WRKSRC}/src/util/dovecotpw \ ${PREFIX}/sbin/ ${INSTALL_DATA} ${WRKDIR}/dovecot.conf.sample ${PREFIX}/etc/ - ${INSTALL_SCRIPT} ${WRKDIR}/dovecot.sh ${PREFIX}/etc/rc.d/ .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} diff --git a/mail/dovecot-devel/distinfo b/mail/dovecot-devel/distinfo index 0fafc6f72db5..9734480a7fcb 100644 --- a/mail/dovecot-devel/distinfo +++ b/mail/dovecot-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (dovecot-1.0.alpha3.tar.gz) = 2006624ce4328dcdef6a71376c3be05d -SIZE (dovecot-1.0.alpha3.tar.gz) = 1193017 +MD5 (dovecot-1.0.alpha4.tar.gz) = 65f8e2cd097e80b536a75c31a974b5de +SIZE (dovecot-1.0.alpha4.tar.gz) = 1203714 diff --git a/mail/dovecot-devel/files/dovecot.sh b/mail/dovecot-devel/files/dovecot.sh deleted file mode 100644 index f646cbce8ba3..000000000000 --- a/mail/dovecot-devel/files/dovecot.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dovecot -# REQUIRE: LOGIN -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable dovecot: -# -#dovecot_enable="YES" -# -dovecot_enable=${dovecot_enable-"NO"} - -. %%RC_SUBR%% - -name=dovecot -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/${name} -required_files=%%PREFIX%%/etc/${name}.conf - -load_rc_config ${name} -run_rc_command "$1" diff --git a/mail/dovecot-devel/files/dovecot.sh.in b/mail/dovecot-devel/files/dovecot.sh.in new file mode 100644 index 000000000000..f6697f1ba23a --- /dev/null +++ b/mail/dovecot-devel/files/dovecot.sh.in @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: dovecot +# REQUIRE: LOGIN +# KEYWORD: FreeBSD shutdown + +# +# Add the following lines to /etc/rc.conf to enable dovecot: +# +#dovecot_enable="YES" +# + +. %%RC_SUBR%% + +name=dovecot +rcvar=`set_rcvar` + +: ${dovecot_enable:="NO"} +command=%%PREFIX%%/sbin/${name} +required_files=%%PREFIX%%/etc/${name}.conf + +load_rc_config ${name} +run_rc_command "$1" diff --git a/mail/dovecot-devel/files/patch-dovecot-example.conf b/mail/dovecot-devel/files/patch-dovecot-example.conf index 9ac68104b117..d0b5d1a16b22 100644 --- a/mail/dovecot-devel/files/patch-dovecot-example.conf +++ b/mail/dovecot-devel/files/patch-dovecot-example.conf @@ -1,5 +1,5 @@ ---- dovecot-example.conf.orig Fri Jul 22 18:40:25 2005 -+++ dovecot-example.conf Fri Sep 9 00:02:06 2005 +--- dovecot-example.conf.orig Thu Oct 20 15:33:33 2005 ++++ dovecot-example.conf Thu Oct 20 15:38:40 2005 @@ -7,7 +7,7 @@ # Default values are shown after each value, it's not required to uncomment # any of the lines. Exception to this are paths, they're just examples @@ -32,7 +32,7 @@ # IP address. Useful for seeing who are actually using the IMAP processes # (eg. shared mailboxes or if same uid is used for multiple accounts). -#verbose_proctitle = no -+verbose_proctitle = no ++verbose_proctitle = yes # Show protocol level SSL errors. #verbose_ssl = no @@ -60,16 +60,7 @@ # If you need to set multiple mailbox locations or want to change default # namespace settings, you can do it by defining namespace sections: -@@ -321,7 +321,7 @@ - # know any MUA which would modify mail files directly. IMAP protocol also - # requires that the mails don't change, so it would be problematic in any case. - # If you care about performance, enable it. --#maildir_copy_with_hardlinks = no -+maildir_copy_with_hardlinks = yes - - # Which locking methods to use for locking mbox. There's four available: - # dotlock: Create .lock file. This is the oldest and most NFS-safe -@@ -389,12 +389,12 @@ +@@ -391,12 +391,12 @@ protocol imap { # Login executable location. @@ -85,7 +76,7 @@ # Maximum IMAP command line length in bytes. Some clients generate very long # command lines with huge mailboxes, so you may need to raise this if you get -@@ -403,7 +403,7 @@ +@@ -405,7 +405,7 @@ # Support for dynamically loadable modules. #mail_use_modules = no @@ -94,7 +85,7 @@ # Send IMAP capabilities in greeting message. This makes it unnecessary for # clients to request it with CAPABILITY command, so it saves one round-trip. -@@ -433,7 +433,7 @@ +@@ -435,7 +435,7 @@ # With mbox storage a mailbox can contain either mails or submailboxes, # but not both. Thunderbird separates these two by forcing server to # accept '/' suffix in mailbox names in subscriptions list. @@ -103,7 +94,7 @@ } ## -@@ -442,10 +442,10 @@ +@@ -444,10 +444,10 @@ protocol pop3 { # Login executable location. @@ -116,16 +107,16 @@ # Don't try to set mails non-recent or seen with POP3 sessions. This is # mostly intended to reduce disk I/O. With maildir it doesn't move files -@@ -475,7 +475,7 @@ - # Note that Outlook 2003 seems to have problems with %v.%u format which is - # Dovecot's default, so if you're building a new server it would be a good - # idea to change this. %08Xu%08Xv should be pretty fail-safe. -- #pop3_uidl_format = %v.%u +@@ -484,7 +484,7 @@ + # installations. %08Xu%08Xv will be the new default, so use it for new + # installations. + # +- #pop3_uidl_format = + pop3_uidl_format = %08Xu%08Xv # POP3 logout format string: # %t - number of TOP commands -@@ -489,7 +489,7 @@ +@@ -498,7 +498,7 @@ # Support for dynamically loadable modules. #mail_use_modules = no @@ -134,7 +125,7 @@ # Workarounds for various client bugs: # outlook-no-nuls: -@@ -498,7 +498,7 @@ +@@ -507,7 +507,7 @@ # oe-ns-eoh: # Outlook Express and Netscape Mail breaks if end of headers-line is # missing. This option simply sends it if it's missing. @@ -143,7 +134,7 @@ } ## -@@ -506,7 +506,7 @@ +@@ -515,7 +515,7 @@ ## # Executable location diff --git a/mail/dovecot-devel/pkg-plist b/mail/dovecot-devel/pkg-plist index f2f1199e71e0..a7af67d7b768 100644 --- a/mail/dovecot-devel/pkg-plist +++ b/mail/dovecot-devel/pkg-plist @@ -1,6 +1,5 @@ @comment $FreeBSD$ etc/dovecot.conf.sample -etc/rc.d/dovecot.sh libexec/dovecot/checkpassword-reply libexec/dovecot/deliver libexec/dovecot/dovecot-auth diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 944e24c1deb8..6e5f9fcb14f1 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -7,7 +7,7 @@ # PORTNAME= dovecot -DISTVERSION= 1.0.alpha3 +DISTVERSION= 1.0.alpha4 CATEGORIES= mail ipv6 MASTER_SITES= http://www.dovecot.org/releases/ @@ -15,7 +15,6 @@ MAINTAINER= robin@isometry.net COMMENT= Secure and compact IMAP and POP3 servers USE_ICONV= yes -USE_RC_SUBR= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -40,6 +39,12 @@ OPTIONS= SASL2 "SASL2 support" off \ .include +.if ${OSVERSION} < 500038 +USE_RC_SUBR= dovecot.sh +.else +USE_RCORDER= dovecot.sh +.endif + ## SASL2 support # # SASL provides authentication support to @@ -85,9 +90,6 @@ CONFIGURE_ARGS+= --with-mysql post-build: @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/dovecot-example.conf >${WRKDIR}/dovecot.conf.sample - @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%RC_SUBR%%,${RC_SUBR},g' \ - ${FILESDIR}/dovecot.sh >${WRKDIR}/dovecot.sh pre-install: @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -109,7 +111,6 @@ do-install: ${WRKSRC}/src/util/dovecotpw \ ${PREFIX}/sbin/ ${INSTALL_DATA} ${WRKDIR}/dovecot.conf.sample ${PREFIX}/etc/ - ${INSTALL_SCRIPT} ${WRKDIR}/dovecot.sh ${PREFIX}/etc/rc.d/ .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo index 0fafc6f72db5..9734480a7fcb 100644 --- a/mail/dovecot/distinfo +++ b/mail/dovecot/distinfo @@ -1,2 +1,2 @@ -MD5 (dovecot-1.0.alpha3.tar.gz) = 2006624ce4328dcdef6a71376c3be05d -SIZE (dovecot-1.0.alpha3.tar.gz) = 1193017 +MD5 (dovecot-1.0.alpha4.tar.gz) = 65f8e2cd097e80b536a75c31a974b5de +SIZE (dovecot-1.0.alpha4.tar.gz) = 1203714 diff --git a/mail/dovecot/files/dovecot.sh b/mail/dovecot/files/dovecot.sh deleted file mode 100644 index f646cbce8ba3..000000000000 --- a/mail/dovecot/files/dovecot.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dovecot -# REQUIRE: LOGIN -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable dovecot: -# -#dovecot_enable="YES" -# -dovecot_enable=${dovecot_enable-"NO"} - -. %%RC_SUBR%% - -name=dovecot -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/${name} -required_files=%%PREFIX%%/etc/${name}.conf - -load_rc_config ${name} -run_rc_command "$1" diff --git a/mail/dovecot/files/dovecot.sh.in b/mail/dovecot/files/dovecot.sh.in new file mode 100644 index 000000000000..f6697f1ba23a --- /dev/null +++ b/mail/dovecot/files/dovecot.sh.in @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: dovecot +# REQUIRE: LOGIN +# KEYWORD: FreeBSD shutdown + +# +# Add the following lines to /etc/rc.conf to enable dovecot: +# +#dovecot_enable="YES" +# + +. %%RC_SUBR%% + +name=dovecot +rcvar=`set_rcvar` + +: ${dovecot_enable:="NO"} +command=%%PREFIX%%/sbin/${name} +required_files=%%PREFIX%%/etc/${name}.conf + +load_rc_config ${name} +run_rc_command "$1" diff --git a/mail/dovecot/files/patch-dovecot-example.conf b/mail/dovecot/files/patch-dovecot-example.conf index 9ac68104b117..d0b5d1a16b22 100644 --- a/mail/dovecot/files/patch-dovecot-example.conf +++ b/mail/dovecot/files/patch-dovecot-example.conf @@ -1,5 +1,5 @@ ---- dovecot-example.conf.orig Fri Jul 22 18:40:25 2005 -+++ dovecot-example.conf Fri Sep 9 00:02:06 2005 +--- dovecot-example.conf.orig Thu Oct 20 15:33:33 2005 ++++ dovecot-example.conf Thu Oct 20 15:38:40 2005 @@ -7,7 +7,7 @@ # Default values are shown after each value, it's not required to uncomment # any of the lines. Exception to this are paths, they're just examples @@ -32,7 +32,7 @@ # IP address. Useful for seeing who are actually using the IMAP processes # (eg. shared mailboxes or if same uid is used for multiple accounts). -#verbose_proctitle = no -+verbose_proctitle = no ++verbose_proctitle = yes # Show protocol level SSL errors. #verbose_ssl = no @@ -60,16 +60,7 @@ # If you need to set multiple mailbox locations or want to change default # namespace settings, you can do it by defining namespace sections: -@@ -321,7 +321,7 @@ - # know any MUA which would modify mail files directly. IMAP protocol also - # requires that the mails don't change, so it would be problematic in any case. - # If you care about performance, enable it. --#maildir_copy_with_hardlinks = no -+maildir_copy_with_hardlinks = yes - - # Which locking methods to use for locking mbox. There's four available: - # dotlock: Create .lock file. This is the oldest and most NFS-safe -@@ -389,12 +389,12 @@ +@@ -391,12 +391,12 @@ protocol imap { # Login executable location. @@ -85,7 +76,7 @@ # Maximum IMAP command line length in bytes. Some clients generate very long # command lines with huge mailboxes, so you may need to raise this if you get -@@ -403,7 +403,7 @@ +@@ -405,7 +405,7 @@ # Support for dynamically loadable modules. #mail_use_modules = no @@ -94,7 +85,7 @@ # Send IMAP capabilities in greeting message. This makes it unnecessary for # clients to request it with CAPABILITY command, so it saves one round-trip. -@@ -433,7 +433,7 @@ +@@ -435,7 +435,7 @@ # With mbox storage a mailbox can contain either mails or submailboxes, # but not both. Thunderbird separates these two by forcing server to # accept '/' suffix in mailbox names in subscriptions list. @@ -103,7 +94,7 @@ } ## -@@ -442,10 +442,10 @@ +@@ -444,10 +444,10 @@ protocol pop3 { # Login executable location. @@ -116,16 +107,16 @@ # Don't try to set mails non-recent or seen with POP3 sessions. This is # mostly intended to reduce disk I/O. With maildir it doesn't move files -@@ -475,7 +475,7 @@ - # Note that Outlook 2003 seems to have problems with %v.%u format which is - # Dovecot's default, so if you're building a new server it would be a good - # idea to change this. %08Xu%08Xv should be pretty fail-safe. -- #pop3_uidl_format = %v.%u +@@ -484,7 +484,7 @@ + # installations. %08Xu%08Xv will be the new default, so use it for new + # installations. + # +- #pop3_uidl_format = + pop3_uidl_format = %08Xu%08Xv # POP3 logout format string: # %t - number of TOP commands -@@ -489,7 +489,7 @@ +@@ -498,7 +498,7 @@ # Support for dynamically loadable modules. #mail_use_modules = no @@ -134,7 +125,7 @@ # Workarounds for various client bugs: # outlook-no-nuls: -@@ -498,7 +498,7 @@ +@@ -507,7 +507,7 @@ # oe-ns-eoh: # Outlook Express and Netscape Mail breaks if end of headers-line is # missing. This option simply sends it if it's missing. @@ -143,7 +134,7 @@ } ## -@@ -506,7 +506,7 @@ +@@ -515,7 +515,7 @@ ## # Executable location diff --git a/mail/dovecot/pkg-plist b/mail/dovecot/pkg-plist index f2f1199e71e0..a7af67d7b768 100644 --- a/mail/dovecot/pkg-plist +++ b/mail/dovecot/pkg-plist @@ -1,6 +1,5 @@ @comment $FreeBSD$ etc/dovecot.conf.sample -etc/rc.d/dovecot.sh libexec/dovecot/checkpassword-reply libexec/dovecot/deliver libexec/dovecot/dovecot-auth -- cgit