- Remove redundant definitions of IPV6_DESC and [OPEN]SSL_DESC when closely

  matching standard ones from `Mk/bsd.options.desc.mk'
- Rename couple of options to standard name or the one that better reflects
  their usage

5 files changed, 6 insertions, 10 deletions

diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index d2f39a96570e..73b867b685a4 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -53,8 +53,6 @@ MYSQL_DESC=	Use MySQL db to store white/red/delaylists
 MATCHRE_DESC=	Match IP ranges and CIDR blocks in lists
 SENDERB_DESC=	Country Code checks
 MIMEMOD_DESC=	Multiple Attachement detection
-SSL_DESC=	SSL secure sockets support
-IPV6_DESC=	IPv6 sockets support
 
 OPTIONS_DEFAULT=	EMVALID SPF SRS SEND FBACKW CLAMAV DNSBL MATCHRE SENDERB MIMEMOD SSL
 
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 51e2e22d1e07..96a2141f89f8 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -36,7 +36,7 @@ ALL_TARGET=	bsf
 OPTIONS_DEFINE=	SSL SSL_AND_PLAINTEXT DRAC NETSCAPE_BRAIN_DAMAGE DOCS
 OPTIONS_DEFAULT=	SSL
 OPTIONS_SUB=	yes
-SSL_DESC=		Compile with SSL support
+
 SSL_AND_PLAINTEXT_DESC=	Allow plain text passwords and SSL
 DRAC_DESC=		Dynamically open MTA for relaying
 NETSCAPE_BRAIN_DAMAGE_DESC=	See Makefile for documentation
diff --git a/mail/panda-imap/Makefile b/mail/panda-imap/Makefile
index 586050db9448..5226c883ffc1 100644
--- a/mail/panda-imap/Makefile
+++ b/mail/panda-imap/Makefile
@@ -33,7 +33,7 @@ ALL_TARGET=	bsf
 OPTIONS_DEFINE=	SSL SSL_AND_PLAINTEXT DRAC NETSCAPE_BRAIN_DAMAGE DOCS
 OPTIONS_DEFAULT=	SSL
 OPTIONS_SUB=	yes
-SSL_DESC=		Compile with SSL support
+
 SSL_AND_PLAINTEXT_DESC=	Allow plain text passwords and SSL
 DRAC_DESC=		Dynamically open MTA for relaying
 NETSCAPE_BRAIN_DAMAGE_DESC=	See Makefile for documentation
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 9f36fb0dad55..887efa6905de 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -41,7 +41,7 @@ PKGDEINSTALL=	${PKGINSTALL}
 
 OPTIONS_DEFINE=	APOP_ONLY APOP DOCUMENTATION DRAC FULL_POPD_DEBUG PAM \
 	POPPASSD SAMPLE_POPUSERS SHY_ENABLED \
-	SSL STANDALONE_MODE U_OPTION
+	OPENSSL STANDALONE_MODE U_OPTION
 
 APOP_ONLY_DESC=	build with APOP authentication only
 APOP_DESC=	build with APOP
@@ -52,14 +52,13 @@ PAM_DESC=	build with PAM authentication
 POPPASSD_DESC=	build the poppassd daemon
 SAMPLE_POPUSERS_DESC=	build a default reject file
 SHY_ENABLED_DESC=	hide qpopper version in POP3 banner
-SSL_DESC=	build with SSL/TLS support
 STANDALONE_MODE_DESC=	build qpopper to be run without inetd
 U_OPTION_DESC=	include support for user .qpopper-options
 
-OPTIONS_DEFAULT=	APOP SSL U_OPTION
+OPTIONS_DEFAULT=	APOP OPENSSL U_OPTION
 OPTIONS_SUB=	yes
 
-SSL_USES=	ssl
+OPENSSL_USES=	ssl
 
 .include <bsd.port.pre.mk>
 
@@ -119,7 +118,7 @@ USE_RC_SUBR=	 ${PORTNAME}
 .endif
 
 # The default is to build without SSL/TLS support.
-.if ${PORT_OPTIONS:MSSL}
+.if ${PORT_OPTIONS:MOPENSSL}
 CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 .endif
 
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 93c7b0dc3bbd..8e14c1097032 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -55,7 +55,6 @@ OPTIONS_SINGLE_GPG=	GNUPG_NONE GNUPG GNUPG2
 OPTIONS_DEFAULT=	AS_ROOT GNUPG SSL UPDATE_AND_COMPILE
 
 AS_ROOT_DESC=		Run spamd as root (recommended)
-SSL_DESC=		Build spamd/spamc with SSL support
 
 DATABASE_DESC=		Optional user-config/bayes database backends