ports/66542: mail/dspam, add Sendmail as LDA

[Rob Evers]

>Number:         66542
>Category:       ports
>Synopsis:       mail/dspam, add Sendmail as LDA
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 11 11:40:21 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Rob Evers
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD flappie.debank.tv 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Sun Feb 29 20:35:15 CET 2004 rob at flappie.debank.tv:/usr/obj/usr/src/sys/FLAPPIE i386


>Description:
 -Add Sendmail as LDA
 -fix pkg-message
 -fix mysql README install
 -Add some OPTIONS checks

PORTREVISION bump should not be needed, as 
this doesn't change things on working installs.

>How-To-Repeat:
>Fix:

--- dspam.patch begins here ---
diff -ruN dspam.orig/Makefile dspam/Makefile
--- dspam.orig/Makefile	Tue May 11 18:02:42 2004
+++ dspam/Makefile	Tue May 11 19:50:25 2004
@@ -17,6 +17,7 @@
 		MYSQL_COMPRESS "Compress dspam <--> MySQL" off \
 		MAILDROP "Use Maildrop as local delivery agent" off \
 		PROCMAIL "Use Procmail as local delivery agent" off \
+		SENDMAIL_LDA "Use Sendmail as local delivery agent" off \
 		SENDMAIL "Play nice with sendmail server" off \
 		QMAIL "Play nice with Qmail mail server" off \
 		ENABLE_SPAM_DELIVERY "Deliver messages marked as spam" off \
@@ -82,6 +83,14 @@
 CONFIGURE_ARGS+=	--with-local-delivery-agent='${LOCALBASE}/bin/procmail $u'
 .endif
 
+.if defined(WITH_SENDMAIL_LDA) && exists(/usr/sbin/sendmail)
+CONFIGURE_ARGS+=	--with-local-delivery-agent=/usr/sbin/sendmail
+.else
+.if defined(WITH_SENDMAIL_LDA) && exists(${LOCALBASE}/sbin/sendmail)
+CONFIGURE_ARGS+=	--with-local-delivery-agent='${LOCALBASE}/sbin/sendmail'
+.endif
+.endif
+
 .if defined(WITH_SENDMAIL)
 CONFIGURE_ARGS+=	--with-dspam-mode=4511
 .endif
@@ -145,11 +154,15 @@
 		s|-ldb-4.1|-ldb41|g' ${WRKSRC}/configure
 
 pre-configure:
-.if defined(WITH_MAILDROP) && defined(WITH_PROCMAIL)
+.if defined(WITH_MAILDROP) && (defined(WITH_PROCMAIL) || defined(WITH_SENDMAIL_LDA))
+	@${ECHO_CMD} "You can only use one local delivery agent at once."
+	@${FALSE}
+.endif
+.if defined(WITH_PROCMAIL) && (defined(WITH_MAILDROP) || defined(WITH_SENDMAIL_LDA))
 	@${ECHO_CMD} "You can only use one local delivery agent at once."
 	@${FALSE}
 .endif
-.if defined(WITH_VIRT_USERS) && !defined(WITH_MYSQL)
+.if !defined(WITH_MYSQL) && (defined(WITH_MYSQL_COMPRESS) || defined(WITH_VIRT_USERS))
 	@${ECHO_CMD} "You need MySQL support to use this feature."
 	@${FALSE}
 .endif
@@ -158,7 +171,7 @@
 .if defined(WITH_MYSQL)
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/tools.mysql_drv && \
-		${INSTALL_DATA} README *.sql.* ${EXAMPLESDIR}
+		${INSTALL_DATA} README *.sql* ${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/mysql.data ${EXAMPLESDIR}
 .endif
 .if !defined(NOPORTDOCS)
diff -ruN dspam.orig/pkg-message dspam/pkg-message
--- dspam.orig/pkg-message	Tue May 11 18:02:42 2004
+++ dspam/pkg-message	Tue May 11 19:54:11 2004
@@ -4,7 +4,7 @@
  how to configure DSPAM with your MTA. Examples are provided for
  sendmail, exim and other popular MTAs.
 %%MYSQL%%
-%%MYSQL%% See %%DOCSDIR%%/mysql/README
+%%MYSQL%% See %%EXAMPLESDIR%%/README
 %%MYSQL%% for instructions on how to configure MySQL
 %%MYSQL%% for use with DSPAM.
 %%MYSQL%%
--- dspam.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: