From owner-svn-ports-all@freebsd.org Wed Oct 16 13:01:36 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 83A5F1646A8; Wed, 16 Oct 2019 13:01:36 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46tXVm2cLwz3CqS; Wed, 16 Oct 2019 13:01:36 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 39CD875AA; Wed, 16 Oct 2019 13:01:36 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9GD1arO010252; Wed, 16 Oct 2019 13:01:36 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9GD1Zmh010250; Wed, 16 Oct 2019 13:01:35 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201910161301.x9GD1Zmh010250@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Wed, 16 Oct 2019 13:01:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514585 - in head/security: amavisd-new maia X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: in head/security: amavisd-new maia X-SVN-Commit-Revision: 514585 X-SVN-Commit-Repository: ports 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.29 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: Wed, 16 Oct 2019 13:01:36 -0000 Author: rene Date: Wed Oct 16 13:01:35 2019 New Revision: 514585 URL: https://svnweb.freebsd.org/changeset/ports/514585 Log: security/maia,amavisd-new: drop optional dependency on expired mail/altermime Modified: head/security/amavisd-new/Makefile head/security/maia/Makefile Modified: head/security/amavisd-new/Makefile ============================================================================== --- head/security/amavisd-new/Makefile Wed Oct 16 12:47:13 2019 (r514584) +++ head/security/amavisd-new/Makefile Wed Oct 16 13:01:35 2019 (r514585) @@ -41,7 +41,7 @@ AMAVISDIR?= /var/amavis AMAVISQUARANTINE?= /var/virusmails DAEMON?= /usr/sbin/daemon -p -OPTIONS_DEFINE= IPV6 BDB SNMP SQLITE MYSQL PGSQL LDAP SASL SPAMASSASSIN P0F ALTERMIME \ +OPTIONS_DEFINE= IPV6 BDB SNMP SQLITE MYSQL PGSQL LDAP SASL SPAMASSASSIN P0F \ FILE RAR UNRAR ARJ UNARJ LHA ARC NOMARCH CAB RPM ZOO UNZOO LZOP \ P7ZIP MSWORD TNEF DOCS OPTIONS_DEFAULT= BDB SPAMASSASSIN FILE UNRAR ARJ LHA ARC CAB RPM ZOO LZOP \ @@ -55,7 +55,6 @@ LDAP_DESC= Use LDAP for lookups SASL_DESC= Use SASL authentication SPAMASSASSIN_DESC= Use mail/spamassassin P0F_DESC= Passive operating system fingerprinting -ALTERMIME_DESC= Use AlterMime for defanging/disclaimers FILE_DESC= Use newer file(1) utility from ports RAR_DESC= RAR support with archivers/rar UNRAR_DESC= RAR support with archivers/unrar @@ -134,10 +133,6 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/p0f:net-mgmt/p0f USE_RC_SUBR+= amavis-p0fanalyzer .else AMAVIS_NOP0F= "@comment " -.endif - -.if ${PORT_OPTIONS:MALTERMIME} -RUN_DEPENDS+= ${LOCALBASE}/bin/altermime:mail/altermime .endif .if ${PORT_OPTIONS:MFILE} Modified: head/security/maia/Makefile ============================================================================== --- head/security/maia/Makefile Wed Oct 16 12:47:13 2019 (r514584) +++ head/security/maia/Makefile Wed Oct 16 13:01:35 2019 (r514585) @@ -43,7 +43,7 @@ PEAR_DIR?= ${LOCALBASE}/share/pear PLIST_SUB+= USERS="${USERS}" GROUPS="${GROUPS}" WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" OPTIONS_DEFINE= APACHE LIGHTTPD WEBHOST MYSQL MYSQLSERVER PGSQL PGSQLSERVER DOVECOT2 \ - POSTFIX PFA CLAMAV SPAMASSASSIN BDB ALTERMIME CRYPT \ + POSTFIX PFA CLAMAV SPAMASSASSIN BDB CRYPT \ IPCOUNTRY DOMAINKEYS SPF DKIM FILE RAR UNRAR ARJ UNARJ LHA ARC NOMARCH CAB \ RPM ZOO UNZOO LZOP P7ZIP TNEF DOCS @@ -64,7 +64,6 @@ PFA_DESC= Use Postfixadmin CLAMAV_DESC= Use ClamAV anti-virus SPAMASSASSIN_DESC= Use SpamAssassin BDB_DESC= Use BerkeleyDB -ALTERMIME_DESC= Use AlterMime CRYPT_DESC= Encryption support IPCOUNTRY_DESC= SpamAssassin IP Country plugin DOMAINKEYS_DESC= SpamAssassin DomainKey plugin @@ -192,10 +191,6 @@ RUN_DEPENDS+= spamassassin>=0:mail/spamassassin .if ${PORT_OPTIONS:MBDB} RUN_DEPENDS+= p5-BerkeleyDB>=0:databases/p5-BerkeleyDB -.endif - -.if ${PORT_OPTIONS:MALTERMIME} -RUN_DEPENDS+= altermime:mail/altermime .endif .if ${PORT_OPTIONS:MCRYPT}