Attachment 71236 Details for Bug 103802 – file.diff

[patch] file.diff

file.diff (text/plain), 2.34 KB, created by Hirohisa Yamaguchi on 2006-09-29 08:40:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hirohisa Yamaguchi

Created: 2006-09-29 08:40:14 UTC

Size: 2.34 KB

patch

obsolete

>diff -Npru ports.orig/mail/dkim-milter/Makefile ports/mail/dkim-milter/Makefile
>--- ports.orig/mail/dkim-milter/Makefile	Mon Sep 25 02:01:15 2006
>+++ ports/mail/dkim-milter/Makefile	Fri Sep 29 15:12:13 2006
>@@ -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)
>@@ -51,6 +56,13 @@ SITE+=		${FILESDIR}/site.config.m4.milte
> .endif
> 
> .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:
>diff -Npru ports.orig/mail/dkim-milter/files/milter-dkim.sh.in ports/mail/dkim-milter/files/milter-dkim.sh.in
>--- ports.orig/mail/dkim-milter/files/milter-dkim.sh.in	Mon Sep 25 02:01:15 2006
>+++ ports/mail/dkim-milter/files/milter-dkim.sh.in	Fri Sep 29 13:55:13 2006
>@@ -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 -Npru ports.orig/mail/dkim-milter/pkg-message.postfix ports/mail/dkim-milter/pkg-message.postfix
>--- ports.orig/mail/dkim-milter/pkg-message.postfix	Mon Sep 25 02:01:15 2006
>+++ ports/mail/dkim-milter/pkg-message.postfix	Fri Sep 29 15:18:53 2006
>@@ -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.
> 
> ************************************************************************

Actions: View | Diff

Attachments on bug 103802: 71236