3 files changed, 44 insertions, 2 deletions

diff --git a/mail/postfix-policyd-spf/Makefile b/mail/postfix-policyd-spf/Makefile
index 60d9fbeead20..8195f44ce5e1 100644
--- a/mail/postfix-policyd-spf/Makefile
+++ b/mail/postfix-policyd-spf/Makefile
@@ -10,19 +10,28 @@ PORTVERSION=		1.0.1
 PORTREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		http://www.libspf2.org/patch/
+PKGNAMEPREFIX=		postfix-
+PKGNAMESUFFIX=		-spf
 
 MAINTAINER=		marcus@corp.grupos.com.br
 COMMENT=		Implements SPF for postfix, as a policy daemon
 
 LIB_DEPENDS=		spf2.1:${PORTSDIR}/mail/libspf2
 
+CONFLICTS=		policyd-1.*
+
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ENV+=		CFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib"
 GNU_CONFIGURE=		yes
 USE_GETOPT_LONG=	yes
 
-PLIST_FILES=		sbin/policyd
+PKGMESSAGE=		${WRKDIR}/pkg-message
+SUB_FILES=		pkg-message
+
+PLIST_FILES=		sbin/postfix-policyd-spf
+
+DOCSDIR=		${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
@@ -30,8 +39,9 @@ PORTDOCS=	*
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/postfix-policyd-spf/files/patch-Makefile.in b/mail/postfix-policyd-spf/files/patch-Makefile.in
new file mode 100644
index 000000000000..7b187e2fcebe
--- /dev/null
+++ b/mail/postfix-policyd-spf/files/patch-Makefile.in
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	Mon Jun 28 13:59:26 2004
++++ Makefile.in	Mon Apr 18 11:24:56 2005
+@@ -192,8 +192,8 @@
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/postfix-policyd-spf"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/postfix-policyd-spf; \
+ 	  else :; fi; \
+ 	done
+ 
diff --git a/mail/postfix-policyd-spf/files/pkg-message.in b/mail/postfix-policyd-spf/files/pkg-message.in
new file mode 100644
index 000000000000..ba88a494399f
--- /dev/null
+++ b/mail/postfix-policyd-spf/files/pkg-message.in
@@ -0,0 +1,19 @@
+***
+*** NOTE: Now %%PREFIX%%/sbin/policyd has renamed to %%PREFIX%%/sbin/postfix-policyd-spf
+***
+
+To run this from %%PREFIX%%/etc/postfix/master.cf:
+
+policy  unix  -       n       n       -       -       spawn
+  user=nobody argv=%%PREFIX%%/sbin/postfix-policyd-spf
+
+To use this from Postfix SMTPD, use in %%PREFIX%%/etc/postfix/main.cf:
+
+smtpd_recipient_restrictions = ...
+                               reject_unknown_sender_domain
+                               reject_unauth_destination
+                               check_policy_service unix:private/policy
+                               ...
+
+NOTE: specify check_policy_service AFTER reject_unauth_destination
+or else your system can become an open relay.