From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 11 11:40:23 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A42A716A4CF for ; Tue, 11 May 2004 11:40:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37CE843D4C for ; Tue, 11 May 2004 11:40:22 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i4BIeMNo096267 for ; Tue, 11 May 2004 11:40:22 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i4BIeMip096266; Tue, 11 May 2004 11:40:22 -0700 (PDT) (envelope-from gnats) Resent-Date: Tue, 11 May 2004 11:40:22 -0700 (PDT) Resent-Message-Id: <200405111840.i4BIeMip096266@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rob Evers Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 135ED16A4CE for ; Tue, 11 May 2004 11:31:45 -0700 (PDT) Received: from flappie.debank.tv (flappie.debank.tv [212.206.127.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id D895843D2F for ; Tue, 11 May 2004 11:31:43 -0700 (PDT) (envelope-from rob@debank.tv) Received: from localhost (localhost.debank.tv [127.0.0.1]) by flappie.debank.tv (Postfix) with ESMTP id A5FAD52C0 for ; Tue, 11 May 2004 20:31:42 +0200 (CEST) Received: from flappie.debank.tv ([127.0.0.1]) by localhost (flappie.debank.tv [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 47337-03-3 for ; Tue, 11 May 2004 20:31:40 +0200 (CEST) Received: by flappie.debank.tv (Postfix, from userid 1001) id C990552BF; Tue, 11 May 2004 20:31:40 +0200 (CEST) Message-Id: <20040511183140.C990552BF@flappie.debank.tv> Date: Tue, 11 May 2004 20:31:40 +0200 (CEST) From: Rob Evers To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/66542: mail/dspam, add Sendmail as LDA X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Rob Evers List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 May 2004 18:40:23 -0000 >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@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: