- Add WITH_MYSQL and WITH_PGSQL knobs (1).

- Add SPF support (2).

Obtained from:	freebsd-ports@ (1), ports/74089 (2)
Submitted by:	Linh Pham <question+fbsdports(at)closedsrc.org> (2)

2 files changed, 33 insertions, 2 deletions

diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 58248c41f2da..3315783d163e 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Mail-SpamAssassin
 PORTVERSION=	3.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=	spamassassin/:apache Mail/:cpan
@@ -28,6 +28,10 @@ CONFIGURE_ARGS=	SYSCONFDIR="${PREFIX}/etc" \
 	       	CONTACT_ADDRESS="the administrator of that system" \
 		BUILD_SPAMC=yes RUN_NET_TESTS=yes
 
+.if defined(WITH_SPF_QUERY)
+RUN_DEPENDS+=	spfd:${PORTSDIR}/mail/p5-Mail-SPF-Query
+.endif
+
 .if !defined(WITHOUT_OPENSSL)
 USE_OPENSSL=	yes
 CFLAGS+=	-I${OPENSSLINC}
@@ -37,6 +41,16 @@ CONFIGURE_ARGS+=	ENABLE_SSL=yes
 CONFIGURE_ARGS+=	ENABLE_SSL=no
 .endif
 
+.if defined(WITH_MYSQL)
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+USE_SQLDB=	yes
+.endif
+
+.if defined(WITH_PGSQL)
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
+USE_SQLDB=	yes
+.endif
+
 MAN3=		Mail::SpamAssassin.3 \
 		Mail::SpamAssassin::ArchiveIterator.3 \
 		Mail::SpamAssassin::AutoWhitelist.3 \
@@ -74,6 +88,23 @@ PORTDOCS=	${DOCS} ${DOCSSQL:S|^|sql/|} ${DOCSCONTRIB:S|^|contrib/|} ${DOCSLDAP:S
 USE_RC_SUBR=	yes
 SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%RC_SUBR%%|${RC_SUBR}|g'
+.if defined(WITH_SQLDB)
+SED_SCRIPT+=	-e 's|%%SQL%%|-Q|g'
+.endif
+
+pre-patch:
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "================================================================"
+	@${ECHO_MSG} "You can use folowed options to install SpamAssassin with"
+	@${ECHO_MSG} "	an addition features:"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "WITHOUT_SSL=yes	 - disable SSL,"
+	@${ECHO_MSG} "WITH_MYSQL=yes	 - add MySQL support,"
+	@${ECHO_MSG} "WITH_PGSQL=yes	 - add PostgreSQL support,"
+	@${ECHO_MSG} "WITH_SPF_QUERY=yes - add SPF query support."
+	@${ECHO_MSG} "================================================================"
+	@${ECHO_MSG} ""
+
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 	@${SED} -e 's#B_CONFDIR)/local.cf#B_CONFDIR)/local.cf.sample#g' \
diff --git a/mail/p5-Mail-SpamAssassin/files/spamd.sh b/mail/p5-Mail-SpamAssassin/files/spamd.sh
index 4cc0fd5dc7ac..ba814c492a90 100644
--- a/mail/p5-Mail-SpamAssassin/files/spamd.sh
+++ b/mail/p5-Mail-SpamAssassin/files/spamd.sh
@@ -35,7 +35,7 @@ stop_postcmd()
 
 spamd_enable=${spamd_enable:-"NO"}
 spamd_pidfile=${spamd_pidfile:-"/var/run/spamd.pid"}
-spamd_flags=${spamd_flags:-"-c -d -r ${spamd_pidfile}"}
+spamd_flags=${spamd_flags:-"-c -d %%SQL%% -r ${spamd_pidfile}"}
 
 load_rc_config $name
 run_rc_command "$1"