From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Feb 27 18:45:57 2006 Return-Path: X-Original-To: freebsd-ports-bugs@FreeBSD.org Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B106A16A43E; Mon, 27 Feb 2006 18:45:57 +0000 (GMT) (envelope-from jamesog@starbug.netinertia.co.uk) Received: from starbug.netinertia.co.uk (starbug.netinertia.co.uk [217.147.82.211]) by mx1.FreeBSD.org (Postfix) with ESMTP id 637AD43D64; Mon, 27 Feb 2006 18:45:48 +0000 (GMT) (envelope-from jamesog@starbug.netinertia.co.uk) Received: from jamesog by starbug.netinertia.co.uk with local (Exim 4.60 (FreeBSD)) (envelope-from ) id 1FDnNY-000G0R-2R; Mon, 27 Feb 2006 18:45:52 +0000 Date: Mon, 27 Feb 2006 18:45:52 +0000 From: James O'Gorman To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Message-ID: <20060227184551.GA56194@netinertia.co.uk> References: <200602271840.k1RIe9ER088355@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="FL5UXtIhxfXey3p5" Content-Disposition: inline In-Reply-To: <200602271840.k1RIe9ER088355@freefall.freebsd.org> User-Agent: Mutt/1.5.11 Sender: James O'Gorman Cc: Subject: Re: ports/93908: [PATCH] Add OPTIONS to mail/exim 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, 27 Feb 2006 18:45:57 -0000 --FL5UXtIhxfXey3p5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sorry, attached wrong patch. Correct patched now attached. James --FL5UXtIhxfXey3p5 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="exim-addoptions.diff" Binary files /usr/ports/mail/exim/.swp and ./.swp differ diff -urN /usr/ports/mail/exim/Makefile ./Makefile --- /usr/ports/mail/exim/Makefile Thu Jan 26 14:20:23 2006 +++ ./Makefile Mon Feb 27 18:44:02 2006 @@ -21,6 +21,46 @@ .include "options" +OPTIONS= SA_EXIM "Include SA Exim" Off \ + EXIMON "Include Eximon" Off \ + CONTENT_SCAN "Malware and spam scanning" On \ + OLD_DEMIME "Old \"demime\" ACL condition" On \ + TCP_WRAPPERS "Link against libwrap" Off \ + MYSQL "Include MySQL support" Off \ + PGSQL "Include PostgreSQL support" Off \ + SQLITE "Include SQLite support" Off \ + SASLAUTHD "Use SASL authentication daemon" Off \ + IPV6 "Enable IPv6" On \ + OPENLDAP "Include OpenLDAP support" Off \ + TLS "Include TLS support" On \ + PERL "Include Perl support" On \ + PAM "Include PAM support" On \ + AUTH_CRAM_MD5 "CRAM-MD5 authentication" On \ + AUTH_PLAINTEXT "PLAIN authentication" On \ + AUTH_SPA "SPA authentication" On \ + AUTH_SASL "SASL authentication" Off \ + AUTH_RADIUS "RADIUS authentication" Off \ + MAILDIR "Maildir support" On \ + MAILSTORE "Mailstore support" On \ + MBX "MBX support" On \ + CDB "CDB-style lookup support" On \ + DNSDB "CDB-style lookup support" On \ + DSEARCH "CDB-style lookup support" On \ + LSEARCH "CDB-style lookup support" On \ + NIS "NIS support" On \ + PASSWD "/etc/passwd support" On \ + LMTP "LMTP Support" On \ + ALT_CONFIG_PREFIX "Allow configs in alt locations" On \ + WISHLIST "Enable wishlist items" Off \ + SPF "Sender Policy Framework" Off \ + DOMAINKEYS "DomainKeys support" Off \ + SRS "Sender Rewriting Scheme" Off \ + READLINE "Enable readline for test expansion" Off \ + SUID "Install Exim binary SUID" On \ + DAEMON "Install scripts to run as a daemon" On + +.include + .if defined(WITH_SA_EXIM) MASTER_SITES+= http://marc.merlins.org/linux/exim/files/:sa_exim \ ${MASTER_SITE_SOURCEFORGE_EXTENDED:S/$/:sa_exim/} @@ -537,8 +577,6 @@ .if !defined(WITHOUT_OLD_DEMIME) SEDLIST+= -e 's,^\# (WITH_OLD_DEMIME=),\1,' .endif - -.include .if defined(EXIMON_ONLY) && ${MASTERDIR} == ${PKGDIR} .error EXIMON_ONLY is not user settable --FL5UXtIhxfXey3p5--