diff options
| author | Alejandro Pulver <alepulver@FreeBSD.org> | 2006-10-01 15:08:24 +0000 |
|---|---|---|
| committer | Alejandro Pulver <alepulver@FreeBSD.org> | 2006-10-01 15:08:24 +0000 |
| commit | 3133dce1763f419ce0d0bed7207e809d920e5590 (patch) | |
| tree | 4d5671c1d6ec95742f12548d2ce1d4e53b59b163 /mail/dk-milter | |
| parent | 035448711553b6fac2d127e3df715273a4f09e8c (diff) | |
| download | ports-3133dce1763f419ce0d0bed7207e809d920e5590.tar.gz ports-3133dce1763f419ce0d0bed7207e809d920e5590.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/103803
Submitted by: Hirohisa Yamaguchi <umq@ueo.co.jp>
Notes
Notes:
svn path=/head/; revision=174245
Diffstat (limited to 'mail/dk-milter')
| -rw-r--r-- | mail/dk-milter/Makefile | 16 | ||||
| -rw-r--r-- | mail/dk-milter/files/milter-dk.sh.in | 2 |
2 files changed, 15 insertions, 3 deletions
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile index 8108bb90b4d2..a441e5fec925 100644 --- a/mail/dk-milter/Makefile +++ b/mail/dk-milter/Makefile @@ -17,10 +17,15 @@ COMMENT= Domainkeys milter for Sendmail USE_RC_SUBR= milter-dk.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) @@ -45,6 +50,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/dk-milter/files/milter-dk.sh.in b/mail/dk-milter/files/milter-dk.sh.in index 25d103de5847..0f7ded3b6d7b 100644 --- a/mail/dk-milter/files/milter-dk.sh.in +++ b/mail/dk-milter/files/milter-dk.sh.in @@ -75,7 +75,7 @@ else if [ "x$1" != "xrestart" ]; then for profile in ${milterdk_profiles}; do echo "===> milterdk profile: ${profile}" - $0 $1 ${profile} + %%RC_SCRIPT%% $1 ${profile} retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${profile} (${retcode}) ${failed:-}" |