Date: Wed, 19 May 2010 18:21:00 GMT From: Marshal Newrock <marshal@zordio.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/146737: mail/spamass-milter Add OPTIONS to Makefile Message-ID: <201005191821.o4JIL0DT002768@www.freebsd.org> Resent-Message-ID: <201005191830.o4JIU6j4028375@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 146737
>Category: ports
>Synopsis: mail/spamass-milter Add OPTIONS to Makefile
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed May 19 18:30:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Marshal Newrock
>Release: 7.2
>Organization:
>Environment:
FreeBSD pkg.zordio.com 7.2-RELEASE-p2 FreeBSD 7.2-RELEASE-p2 #0: Wed Jun 24 00:57:44 UTC 2009 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
OPTIONS is very convenient. A recent build for us went wrong due to not remembering to set environment variables for this port.
Patch was tested on an 80-column terminal, where I found that detailed descriptions don't fit. I looked at the informational messages near the end of the port, but it didn't seem necessary to change them, unless "environment variable" should be changed to "option".
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- Makefile.orig 2010-05-19 14:18:58.000000000 -0400
+++ Makefile 2010-05-19 14:46:30.000000000 -0400
@@ -20,6 +20,11 @@
MAKE_JOBS_SAFE= yes
+OPTIONS= ADDAUTH_PATCH "Adds -a option" Off \
+ REJECTTEXT_PATCH "Adds -R option" Off \
+ LDAP "Adds LDAP support" Off \
+ SENDMAIL_PORT "Build against sendmail port" Off
+
##
# Use the following quirks to choose which sendmail to use (ports or system):
#
@@ -45,10 +50,6 @@
.endif
.endif
-.if exists(${LOCALBASE}/lib/libldap.so)
-WITH_LDAP=yes
-.endif
-
.if !defined(WITHOUT_LDAP) && defined(WITH_LDAP)
USE_OPENLDAP=yes
CPPFLAGS+= -I${LOCALBASE}/include
@@ -60,15 +61,14 @@
WITH_SENDMAIL_BASE=yes
.endif
-.if defined(WITH_SENDMAIL_BASE)
+.if !defined(WITH_SENDMAIL_PORT) # use base sendmail
.if exists(/usr/lib/libmilter.a)
MILTERBASE= /usr
.else
IGNORE= base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes
.endif
.endif
-
-.if defined(WITH_SENDMAIL_PORT)
+.else
BUILD_DEPENDS+= ${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/sendmail
MILTERBASE?= ${LOCALBASE}
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005191821.o4JIL0DT002768>