1 files changed, 26 insertions, 18 deletions

diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index 125f7296a038..4b903031dec5 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -6,29 +6,28 @@
 #
 
 PORTNAME=	spamass-milter
-PORTVERSION=	0.2.0
-PORTREVISION=	5
+PORTVERSION=	0.3.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	spamass-milt
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Sendmail Milter (mail filter) for SpamAssassin
+COMMENT=	Sendmail Milter (mail filter) plugin for SpamAssassin
 
 BUILD_DEPENDS=	spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 RUN_DEPENDS=	spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 
+##
+# Use the following quirks to choose which sendmail to use (ports or system):
 #
-# You can choose the sendmail to be used by specifying
+#   WITH_SENDMAIL_BASE=yes
+# or
+#   WITH_SENDMAIL_PORT=yes
 #
-# WITH_SENDMAIL_BASE=yes
-#  or
-# WITH_SENDMAIL_PORT=yes
+# If unspecified, check for an up-to-date system version but give an
+# installed port preference over it.
 #
 
-# if no preference was set, check for an up to date base version
-# but give an installed port preference over it.
-
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libldap.so)
@@ -36,7 +35,7 @@ WITH_LDAP=yes
 .endif
 
 .if !defined(WITHOUT_LDAP) && defined(WITH_LDAP)
-USE_OPENLDAP=		yes
+USE_OPENLDAP=yes
 .endif
 
 .if !defined(WITH_SENDMAIL_BASE) && \
@@ -56,36 +55,45 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
 MILTERBASE?=	${LOCALBASE}
 .endif
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
+.endif
+
 MILTERINC=	${MILTERBASE}/include
 MILTERLIB=	${MILTERBASE}/lib
 
 CPPFLAGS+=	-I${MILTERINC}
 LDFLAGS+=	-L${MILTERLIB}
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-
 USE_REINPLACE=	yes
-
 USE_RC_SUBR=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 MAN1=		spamass-milter.1
 
 post-patch:
-	@${SED} -e 's|/usr/local|${PREFIX}|g' \
-		${FILESDIR}/activation.txt > ${WRKDIR}/activation.txt
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/spamass-milter.sh > ${WRKDIR}/spamass-milter.sh
+	@${SED} -e's,%%PREFIX%%,${PREFIX},g' \
+		${FILESDIR}/activation.txt > ${WRKDIR}/activation.txt
 .if !defined(WITHOUT_LDAP) && defined(WITH_LDAP)
 	@${REINPLACE_CMD} -e 's|-lmilter|-lmilter -lldap|g' ${WRKSRC}/configure
 .endif
+	@${SED} -e's,%%DOCSDIR%%,${DOCSDIR},g' \
+		${MASTERDIR}/pkg-message > ${PKGMESSAGE}
 
 post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/spamass-milter.sh ${PREFIX}/etc/rc.d/spamass-milter.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/spamass-milter.sh ${PREFIX}/etc/rc.d/spamass-milter.sh
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/activation.txt ${DOCSDIR}/activation.txt
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
 .endif
 	@${CAT} ${PKGMESSAGE}