Attachment 71237 Details for Bug 103803 – file.diff

[patch] file.diff

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

(hide)

Description:

Filename:

MIME Type:

Creator: Hirohisa Yamaguchi

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

Size: 1.73 KB

patch

obsolete

>diff -Npru ports.orig/mail/dk-milter/Makefile ports/mail/dk-milter/Makefile
>--- ports.orig/mail/dk-milter/Makefile	Tue Sep 26 02:44:40 2006
>+++ ports/mail/dk-milter/Makefile	Fri Sep 29 15:39:08 2006
>@@ -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)
>@@ -44,6 +49,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/dk-milter/files/milter-dk.sh.in ports/mail/dk-milter/files/milter-dk.sh.in
>--- ports.orig/mail/dk-milter/files/milter-dk.sh.in	Tue Sep 26 02:44:40 2006
>+++ ports/mail/dk-milter/files/milter-dk.sh.in	Fri Sep 29 15:36:48 2006
>@@ -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:-}"

Actions: View | Diff

Attachments on bug 103803: 71237