From owner-svn-ports-all@FreeBSD.ORG Sat Jul 5 15:09:16 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E8CD5BC; Sat, 5 Jul 2014 15:09:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3BC6E220B; Sat, 5 Jul 2014 15:09:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s65F9GkH095920; Sat, 5 Jul 2014 15:09:16 GMT (envelope-from vsevolod@svn.freebsd.org) Received: (from vsevolod@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s65F9FJc095918; Sat, 5 Jul 2014 15:09:15 GMT (envelope-from vsevolod@svn.freebsd.org) Message-Id: <201407051509.s65F9FJc095918@svn.freebsd.org> From: Vsevolod Stakhov Date: Sat, 5 Jul 2014 15:09:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360760 - head/mail/exim X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jul 2014 15:09:16 -0000 Author: vsevolod Date: Sat Jul 5 15:09:15 2014 New Revision: 360760 URL: http://svnweb.freebsd.org/changeset/ports/360760 QAT: https://qat.redports.org/buildarchive/r360760/ Log: - Add runtime dependency on perl for exim utilities [1], [2] - Support berkeley DB lookups [3] - Remove unnecessary options checks [1] - Improve description for EXIMON option - Bump portrevision PR: 189019 [2], 181863 [3] Submitted by: ak [1], tim at bishnet.net [2], odavydenko at gmail.com [3] Modified: head/mail/exim/Makefile head/mail/exim/options Modified: head/mail/exim/Makefile ============================================================================== --- head/mail/exim/Makefile Sat Jul 5 15:09:06 2014 (r360759) +++ head/mail/exim/Makefile Sat Jul 5 15:09:15 2014 (r360760) @@ -3,7 +3,7 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/} MASTER_SITE_SUBDIR= exim4/:exim @@ -17,7 +17,8 @@ COMMENT?= High performance MTA for Unix LICENSE= GPLv2 -USES= tar:bzip2 +USES= tar:bzip2 perl5 +USE_PERL5= run # Exim build system is job unsafe atm MAKE_JOBS_UNSAFE= yes @@ -44,7 +45,7 @@ OPTIONS_SUB= yes AUTH_SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 BDB_USE= bdb=yes DMARC_LIB_DEPENDS= libopendmarc.so:${PORTSDIR}/mail/opendmarc -EMBEDDED_PERL_USES= perl5 +EMBEDDED_PERL_USE= perl5=run,build EXIMON_USE= xorg=x11,xaw,xt GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls ICONV_USES= iconv:lib,build @@ -64,21 +65,6 @@ XCLIENT_EXTRA_PATCHES= ${FILESDIR}/extra .include -.if ${PORT_OPTIONS:MSA_EXIM} -.if ${PORT_OPTIONS:MKAS} -IGNORE= You cannot select both SA_EXIM and KAS options -.endif -.if ${PORT_OPTIONS:MSO_1024} -IGNORE= You cannot select both SA_EXIM and SO_1024 options -.endif -.endif - -.if ${PORT_OPTIONS:MKAS} -.if ${PORT_OPTIONS:MSO_1024} -IGNORE= You cannot select both SA_KAS and SO_1024 options -.endif -.endif - # OCSP is supported for openssl only .if ${PORT_OPTIONS:MOCSP} .if ! ${PORT_OPTIONS:MTLS} Modified: head/mail/exim/options ============================================================================== --- head/mail/exim/options Sat Jul 5 15:09:06 2014 (r360759) +++ head/mail/exim/options Sat Jul 5 15:09:15 2014 (r360760) @@ -55,7 +55,7 @@ OPTIONS_RADIO= TLS LS OPTIONS_GROUP_AUTH= AUTH_CRAM_MD5 AUTH_DOVECOT AUTH_PLAINTEXT AUTH_RADIUS AUTH_SASL AUTH_SPA SASLAUTHD PAM PASSWD AUTH_DESC= SMTP Authorization -OPTIONS_GROUP_LOOKUP= CDB DNSDB DSEARCH LSEARCH MYSQL NIS OPENLDAP PGSQL REDIS SQLITE +OPTIONS_GROUP_LOOKUP= CDB BDB DNSDB DSEARCH LSEARCH MYSQL NIS OPENLDAP PGSQL REDIS SQLITE LOOKUP_DESC= Lookup support OPTIONS_GROUP_STORAGE= MAILDIR MAILSTORE MBX STORAGE_DESC= Supported storage formats @@ -68,6 +68,7 @@ AUTH_PLAINTEXT_DESC= Enable plaintext au AUTH_RADIUS_DESC= Enable radius (RFC 2865) authentication AUTH_SASL_DESC= Enable use of Cyrus SASL auth library AUTH_SPA_DESC= Enable Secure Password Authentication +BDB_DESC= Enable Berkeley DB lookups CDB_DESC= Enable CDB-style lookups CONTENT_SCAN_DESC= Enable exiscan email content scanner DAEMON_DESC= Install scripts to run as a daemon @@ -78,7 +79,7 @@ DMARC_DESC= Enable DMARC support DNSDB_DESC= Enable DNS-style lookups DSEARCH_DESC= Enable directory-list lookups EMBEDDED_PERL_DESC= Enable embedded Perl interpreter -EXIMON_DESC= Build eximon monitor (requires X server) +EXIMON_DESC= Build eximon monitor (requires X libraries) ICONV_DESC= Enable header charset conversion KAS_DESC= Build with Kaspersky AntiSpam local scan LISTMATCH_RHS_DESC= Enable pre-4.77 behaviour for match_*