svn commit: r514585 - in head/security: amavisd-new maia

[Rene Ladan]

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}