From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Nov 20 13:51:36 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2A97C16A50B for ; Mon, 20 Nov 2006 13:51:36 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1BFE43E30 for ; Mon, 20 Nov 2006 13:50:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kAKDoHJm018958 for ; Mon, 20 Nov 2006 13:50:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kAKDoHMl018957; Mon, 20 Nov 2006 13:50:17 GMT (envelope-from gnats) Resent-Date: Mon, 20 Nov 2006 13:50:17 GMT Resent-Message-Id: <200611201350.kAKDoHMl018957@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, Thomas Abthorpe Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ACE1A16A4C9 for ; Mon, 20 Nov 2006 13:40:28 +0000 (UTC) (envelope-from tabthorpe@stthomasanglican.org) Received: from tbaytel.net (front3-drytel.tbaytel.net [216.211.26.175]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6E2943D7F for ; Mon, 20 Nov 2006 13:40:04 +0000 (GMT) (envelope-from tabthorpe@stthomasanglican.org) Received: from stjames.stthomasanglican.org ([216.211.67.156] verified) by front3.tbaytel.net (CommuniGate Pro SMTP 5.0.8) with ESMTPS id 35136516; Mon, 20 Nov 2006 08:40:19 -0500 Received: from stjames.stthomasanglican.org (localhost [127.0.0.1]) by stjames.stthomasanglican.org (8.13.8/8.13.8) with ESMTP id kAKDdOEq005793 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 20 Nov 2006 08:39:25 -0500 (EST) (envelope-from tabthorpe@stjames.stthomasanglican.org) Received: (from root@localhost) by stjames.stthomasanglican.org (8.13.8/8.13.8/Submit) id kAKDdOOQ005792; Mon, 20 Nov 2006 08:39:24 -0500 (EST) (envelope-from tabthorpe) Message-Id: <200611201339.kAKDdOOQ005792@stjames.stthomasanglican.org> Date: Mon, 20 Nov 2006 08:39:24 -0500 (EST) From: Thomas Abthorpe To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: thomas@goodking.ca Subject: ports/105688: [MAINTAINER] mail/spamass-milter: respect WITH_SENDMAIL_BASE X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Nov 2006 13:51:36 -0000 >Number: 105688 >Category: ports >Synopsis: [MAINTAINER] mail/spamass-milter: respect WITH_SENDMAIL_BASE >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: Mon Nov 20 13:50:11 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Thomas Abthorpe >Release: FreeBSD 6.2-RC1 i386 >Organization: GoodKing.Ca >Environment: System: FreeBSD stjames.stthomasanglican.org 6.2-RC1 FreeBSD 6.2-RC1 #2: Thu Nov 16 13:55:53 EST 2006 >Description: - force make to honour WITH_SENDMAIL_BASE enivronment variable - thanks to Robert Huff for pointing it out Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- spamass-milter-0.3.1_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/mail/spamass-milter/Makefile /usr/home/ports/mail/spamass-milter/Makefile --- /usr/ports/mail/spamass-milter/Makefile Wed Nov 15 14:42:19 2006 +++ /usr/home/ports/mail/spamass-milter/Makefile Fri Nov 17 15:00:50 2006 @@ -7,7 +7,7 @@ PORTNAME= spamass-milter PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= spamass-milt @@ -25,8 +25,7 @@ # or # WITH_SENDMAIL_PORT=yes # -# If unspecified, check for an up-to-date system version but give an -# installed port preference over it. +# If unspecified, give base precedence. # .include @@ -47,17 +46,18 @@ .if !defined(WITH_SENDMAIL_BASE) && \ !defined(WITH_SENDMAIL_PORT) && \ - !exists(${LOCALBASE}/lib/libmilter.a) WITH_SENDMAIL_BASE=yes .endif -.if defined(WITH_SENDMAIL_BASE) -.if exists(/usr/lib/libmilter.a) +.if defined(WITH_SENDMAIL_BASE) && exists(/usr/lib/libmilter.a) MILTERBASE= /usr .else +.if !exists(/usr/lib/libmilter.a) BROKEN= Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes .endif -.else +.endif + +.if defined(WITH_SENDMAIL_PORT) BUILD_DEPENDS+= ${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail MILTERBASE?= ${LOCALBASE} .endif @@ -81,11 +81,22 @@ MAN1= spamass-milter.1 -pre-fetch: +pre-patch: + +.if !defined(WITH_SENDMAIL_PORT) + @${ECHO_CMD} "" + @${ECHO_CMD} "By default, ${PORTNAME} builds against the base system." + @${ECHO_CMD} "If you want to use the sendmail port please set the environment" + @${ECHO_CMD} "variable WITH_SENDMAIL_PORT" + @${ECHO_CMD} "" +.endif + +.if !defined(WITH_ADDAUTH_PATCH) @${ECHO_CMD} "" @${ECHO_CMD} "You may set environment variable WITH_ADDAUTH_PATCH to bypass" @${ECHO_CMD} "checks if a connection authenticated via SMTP." @${ECHO_CMD} "" +.endif post-patch: @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ --- spamass-milter-0.3.1_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: