diff options
| author | alepulver <alepulver@FreeBSD.org> | 2006-10-01 23:06:48 +0800 |
|---|---|---|
| committer | alepulver <alepulver@FreeBSD.org> | 2006-10-01 23:06:48 +0800 |
| commit | 1e47a33e2f2f6e71386124fd4413dae83e19d758 (patch) | |
| tree | 9fb9a0ba69a5e09ea54333dc44b81056a8f21d70 | |
| parent | ab029d9377819d956ebede9150908fe564756e30 (diff) | |
| download | freebsd-ports-gnome-1e47a33e2f2f6e71386124fd4413dae83e19d758.tar.gz freebsd-ports-gnome-1e47a33e2f2f6e71386124fd4413dae83e19d758.tar.zst freebsd-ports-gnome-1e47a33e2f2f6e71386124fd4413dae83e19d758.zip | |
- Fix starting up multiple instance.
- Fix RUN_DEPENDS does not work correctly by mistake.
- Support mail/postfix-current like security/amavisd-milter port does.
PR: ports/103802
Submitted by: Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)
| -rw-r--r-- | mail/dkim-milter/Makefile | 16 | ||||
| -rw-r--r-- | mail/dkim-milter/files/milter-dkim.sh.in | 2 | ||||
| -rw-r--r-- | mail/dkim-milter/pkg-message.postfix | 3 |
3 files changed, 16 insertions, 5 deletions
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile index 3d8cce1e6fde..245e0af2a580 100644 --- a/mail/dkim-milter/Makefile +++ b/mail/dkim-milter/Makefile @@ -23,10 +23,15 @@ COMMENT= Domainkeys milter for Sendmail USE_RC_SUBR= milter-dkim.sh -.if defined(WITH_POSTFIX_MILTER) +.if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT) SENDMAIL_MILTER_IN_BASE= yes -RUN_DEPENDS+= postfix>=2[3-9]*:${PORTSDIR}/mail/postfix PKGMESSAGE= pkg-message.postfix + +.if defined(WITH_POSTFIX_CURRENT) +RUN_DEPENDS+= ${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current +.else +RUN_DEPENDS+= ${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix +.endif .endif .if !defined(SENDMAIL_MILTER_IN_BASE) @@ -52,6 +57,13 @@ SITE+= ${FILESDIR}/site.config.m4.milter .include <bsd.port.pre.mk> +# .sh suffix is stripped in recent releases. +.if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101 )) +SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}" +.else +SUB_LIST= "RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR}" +.endif + .if defined(SENDMAIL_WITHOUT_MILTER) pre-fetch: @${ECHO_MSG} diff --git a/mail/dkim-milter/files/milter-dkim.sh.in b/mail/dkim-milter/files/milter-dkim.sh.in index 28e98c2493d4..ba2f35254023 100644 --- a/mail/dkim-milter/files/milter-dkim.sh.in +++ b/mail/dkim-milter/files/milter-dkim.sh.in @@ -76,7 +76,7 @@ else if [ "x$1" != "xrestart" ]; then for profile in ${milterdkim_profiles}; do echo "===> milterdkim profile: ${profile}" - $0 $1 ${profile} + %%RC_SCRIPT%% $1 ${profile} retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${profile} (${retcode}) ${failed:-}" diff --git a/mail/dkim-milter/pkg-message.postfix b/mail/dkim-milter/pkg-message.postfix index 9fd8257c205d..48ee6898cf84 100644 --- a/mail/dkim-milter/pkg-message.postfix +++ b/mail/dkim-milter/pkg-message.postfix @@ -10,7 +10,6 @@ your /etc/rc.conf. Extra options can be found in startup script. Note: milter sockets must be accessible from postfix/smtpd; - setting milterdkim_user appropriate or using inet sockets might be - required. + using inet sockets might be preferred. ************************************************************************ |