diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/courier/Makefile | 44 | ||||
| -rw-r--r-- | mail/courier/Makefile.man | 4 | ||||
| -rw-r--r-- | mail/courier/Makefile.own | 5 | ||||
| -rw-r--r-- | mail/courier/distinfo | 6 | ||||
| -rw-r--r-- | mail/courier/files/courier.sh.in | 4 | ||||
| -rw-r--r-- | mail/courier/files/pkg-install.in | 2 | ||||
| -rw-r--r-- | mail/courier/files/pkg-message.in | 6 | ||||
| -rw-r--r-- | mail/courier/pkg-descr | 2 | ||||
| -rw-r--r-- | mail/courier/pkg-plist | 7 |
9 files changed, 65 insertions, 15 deletions
diff --git a/mail/courier/Makefile b/mail/courier/Makefile index 6fe7ec9e01d8..5b58caf80cf4 100644 --- a/mail/courier/Makefile +++ b/mail/courier/Makefile @@ -6,7 +6,7 @@ # PORTNAME= courier -PORTVERSION= 0.61.1 +PORTVERSION= 0.62.0 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= courier @@ -181,6 +181,13 @@ OPTIONS+=on OPTIONS+=off .endif +OPTIONS+=WEBMAILFLAGS "webmail show flags patch" +.if defined(WITH_WEBMAILFLAGS) +OPTIONS+=on +.else +OPTIONS+=off +.endif + OPTIONS+=WEBMAILXFACE "experimental webmail X-Face patch" .if defined(WITH_WEBMAILXFACE) OPTIONS+=on @@ -195,6 +202,20 @@ OPTIONS+=on OPTIONS+=off .endif +OPTIONS+=SYSTEMALIASES "symlink system /etc/aliases" +.if !defined(WITHOUT_SYSTEMALIASES) +OPTIONS+=on +.else +OPTIONS+=off +.endif + +OPTIONS+=EMPTYALIASES "create empty aliases file" +.if defined(WITH_EMPTYALIASES) +OPTIONS+=on +.else +OPTIONS+=off +.endif + .include <bsd.port.pre.mk> .include "${.CURDIR}/Makefile.doc" .include "${.CURDIR}/Makefile.man" @@ -213,6 +234,22 @@ PLIST_SUB+= WITHLDAP="@comment " SUB_LIST+= WITHLDAP="@comment " .endif +.if defined(WITH_SYSTEMALIASES) && !defined(WITHOUT_SYSTEMALIASES) +PLIST_SUB+= WITHSYSTEMALIASES="" +SUB_LIST+= WITHSYSTEMALIASES="" +.else +PLIST_SUB+= WITHSYSTEMALIASES="@comment " +SUB_LIST+= WITHSYSTEMALIASES="@comment " +.endif + +.if defined(WITH_EMPTYALIASES) && !defined(WITHOUT_EMPTYALIASES) +PLIST_SUB+= WITHEMPTYALIASES="" +SUB_LIST+= WITHEMPTYALIASES="" +.else +PLIST_SUB+= WITHEMPTYALIASES="@comment " +SUB_LIST+= WITHEMPTYALIASES="@comment " +.endif + .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep) .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep" .endif @@ -286,6 +323,11 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-maildrop__maildir.C EXTRA_PATCHES+= ${FILESDIR}/extra-patch-webmail__msg2html.c .endif +.if defined(WITH_WEBMAILFLAGS) || !defined(WITHOUT_WEBMAILFLAGS) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-webmail__folder.c ${FILESDIR}/extra-patch-webmail__maildir.c +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-webmail__maildir.h ${FILESDIR}/extra-patch-webmail__images__sqwebmail.css +.endif + .if defined(WITH_WEBMAILRSENT) || !defined(WITHOUT_WEBMAILRSENT) CONFIGURE_ARGS+=--enable-autorenamesent .else diff --git a/mail/courier/Makefile.man b/mail/courier/Makefile.man index 474eba4c81cf..dd6def1c6ef7 100644 --- a/mail/courier/Makefile.man +++ b/mail/courier/Makefile.man @@ -62,11 +62,11 @@ MLINKS= dot-forward.1 dotforward.1 \ .if defined(WITH_LDAP) && !defined(WITHOUT_LDAP) #MAN8+= courierldapaliasd.8 .endif - + .if defined(WITH_SENDFAX) && !defined(WITHOUT_SENDFAX) MAN8+= courierfax.8 .endif - + .if defined(WITH_UUCP) && !defined(WITHOUT_UUCP) MAN8+= courieruucp.8 MLINKS+=courieruucp.8 makeuucpneighbors.8 diff --git a/mail/courier/Makefile.own b/mail/courier/Makefile.own index daa607a972cb..3d1b346df0ba 100644 --- a/mail/courier/Makefile.own +++ b/mail/courier/Makefile.own @@ -58,7 +58,10 @@ OWNER0= bin/courier-config \ libexec/filters/dupfilter \ libexec/filters/perlfilter \ sbin/courier \ - sbin/courierldapaliasd \ sbin/couriertcpd \ sbin/showconfig \ sbin/webmaild + +.if defined(WITH_LDAP) && !defined(WITHOUT_LDAP) +OWNER0+=sbin/courierldapaliasd +.endif diff --git a/mail/courier/distinfo b/mail/courier/distinfo index 70038f9fca1e..775b48a8a834 100644 --- a/mail/courier/distinfo +++ b/mail/courier/distinfo @@ -1,3 +1,3 @@ -MD5 (courier-0.61.1.tar.bz2) = a0feca15632f376401d865765ff172e3 -SHA256 (courier-0.61.1.tar.bz2) = 979ff8342f53478c8f14cb79290d1a795433375c8ad18fc5aa950595a9973c90 -SIZE (courier-0.61.1.tar.bz2) = 7229642 +MD5 (courier-0.62.0.tar.bz2) = 2b7acca41c778c241ed08f3ea633d8ea +SHA256 (courier-0.62.0.tar.bz2) = af826d6759be544127bcee95e4812649defdb4d4ff55193955b2c5d911d8e755 +SIZE (courier-0.62.0.tar.bz2) = 7314085 diff --git a/mail/courier/files/courier.sh.in b/mail/courier/files/courier.sh.in index 703fa7abd17a..a2ec2e2f7fa4 100644 --- a/mail/courier/files/courier.sh.in +++ b/mail/courier/files/courier.sh.in @@ -11,6 +11,10 @@ # REQUIRE: LOGIN courier_authdaemond # BEFORE: securelevel # KEYWORD: shutdown +# +# NOTE for FreeBSD 5.0+: +# If you want this script to start with the base rc scripts +# move courier.sh to /etc/rc.d/courier prefix="%%PREFIX%%" exec_prefix="${prefix}" diff --git a/mail/courier/files/pkg-install.in b/mail/courier/files/pkg-install.in index 4edbdd45361c..c6e6ebd6002d 100644 --- a/mail/courier/files/pkg-install.in +++ b/mail/courier/files/pkg-install.in @@ -39,7 +39,7 @@ yesno() { replace() { local orig repl - + orig=$1 repl=$2 if [ -e ${orig} ]; then diff --git a/mail/courier/files/pkg-message.in b/mail/courier/files/pkg-message.in index 286912be6fd4..79319066d9e7 100644 --- a/mail/courier/files/pkg-message.in +++ b/mail/courier/files/pkg-message.in @@ -23,15 +23,15 @@ To enable Courier-MTA to start at boot time, set these variables in your /etc/rc.conf file: - courier_enable="YES" - sendmail_enable="NONE" + courier_enable="YES" + sendmail_enable="NONE" Also, you will want to disable some Sendmail specific daily maintenance routines in your /etc/periodic.conf file: daily_clean_hoststat_enable="NO" - daily_status_mail_rejects_enable="NO" + daily_status_mail_rejects_enable="NO" daily_status_include_submit_mailq="NO" daily_submit_queuerun="NO" diff --git a/mail/courier/pkg-descr b/mail/courier/pkg-descr index afa430889188..6cdbcfd7d379 100644 --- a/mail/courier/pkg-descr +++ b/mail/courier/pkg-descr @@ -1,7 +1,7 @@ Courier is a modular multiprotocol mail server that's designed to strike a balance between reasonable performance, flexibility and features: - + * Can be configured to function as an intermediate mail relay, or as a mail server that receives mail for one or more domains, or anything in between. diff --git a/mail/courier/pkg-plist b/mail/courier/pkg-plist index 60ace6dbfaf6..a886094989f4 100644 --- a/mail/courier/pkg-plist +++ b/mail/courier/pkg-plist @@ -63,7 +63,6 @@ bin/sendmail bin/testmxlookup bin/webmlmd bin/webmlmd.rc -etc/courier/aliases/system etc/courier/courierd.dist etc/courier/crontab etc/courier/dsndelayed.txt @@ -111,7 +110,9 @@ etc/courier/smtpaccess/default etc/courier/sqwebmaild.dist etc/courier/webmail.authpam etc/courier/webmlmrc.dist -@exec [ -e /etc/aliases ] && ln -sf /etc/aliases %D/etc/courier/aliases/system +%%WITHSYSTEMALIASES%%@exec [ -e /etc/aliases ] && ln -sf /etc/aliases %D/etc/courier/aliases/system +%%WITHEMPTYALIASES%%@exec true > %D/etc/courier/aliases/system +@unexec rm -f %D/etc/courier/aliases/system @exec [ -f %D/etc/courier/courierd.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/courierd.dist @exec [ -f %D/etc/courier/esmtpd-msa.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/esmtpd-msa.dist @exec [ -f %D/etc/courier/esmtpd-ssl.dist ] && %%LOCALBASE%%/share/sysconftool/sysconftool %D/etc/courier/esmtpd-ssl.dist @@ -174,7 +175,7 @@ libexec/filters/perlfilter @dirrm libexec/courier/modules @dirrm libexec/courier/webmail @dirrm libexec/courier -@dirrm libexec/filters +@dirrmtry libexec/filters sbin/aliaslookup sbin/courier sbin/courieresmtpd |