Date: Mon, 20 Nov 2006 08:39:24 -0500 (EST) From: Thomas Abthorpe <thomas@goodking.ca> To: FreeBSD-gnats-submit@FreeBSD.org Cc: thomas@goodking.ca Subject: ports/105688: [MAINTAINER] mail/spamass-milter: respect WITH_SENDMAIL_BASE Message-ID: <200611201339.kAKDdOOQ005792@stjames.stthomasanglican.org> Resent-Message-ID: <200611201350.kAKDoHMl018957@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <roberthuff_AT_rcn.com> 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 <bsd.port.pre.mk>
@@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611201339.kAKDdOOQ005792>