- 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

23 files changed, 13 insertions, 39 deletions

diff --git a/databases/pgpool-II-33/Makefile b/databases/pgpool-II-33/Makefile
index 96d25887e75f..bcafd6e709ed 100644
--- a/databases/pgpool-II-33/Makefile
+++ b/databases/pgpool-II-33/Makefile
@@ -39,7 +39,6 @@ LIBMEMCACHED_DESC=		Build with MemCached support
 LIBMEMCACHED_BUILD_DEPENDS=	libmemcached>=1.0:databases/libmemcached
 LIBMEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/lib/libmemcached
 
-SSL_DESC=		Build with OpenSSL support
 SSL_CONFIGURE_WITH=	openssl
 SSL_USE=		OPENSSL=yes
 
diff --git a/databases/pgpool-II/Makefile b/databases/pgpool-II/Makefile
index 84b73ad89588..44b75fe4a026 100644
--- a/databases/pgpool-II/Makefile
+++ b/databases/pgpool-II/Makefile
@@ -29,7 +29,6 @@ PORTDOCShtml=	pgpool-en.html pgpool-ja.html pgpool.css
 PORTDOCShtml+=	tutorial-en.html tutorial-ja.html
 
 OPTIONS_DEFINE+=	DOCS SSL
-SSL_DESC=	Build with OpenSSL support
 
 .include <bsd.port.options.mk>
 
diff --git a/deskutils/egroupware/Makefile b/deskutils/egroupware/Makefile
index 8a63a197ba9d..2d86af308c6e 100644
--- a/deskutils/egroupware/Makefile
+++ b/deskutils/egroupware/Makefile
@@ -31,10 +31,9 @@ SUB_LIST=	EG_DIR=${EG_DIR} \
 USE_GITHUB=	yes
 GH_ACCOUNT=	EGroupware
 
-OPTIONS_DEFINE=	MYSQL POSTGRES OSSL ZIP GD LDAP MBSTRING
-OPTIONS_DEFAULT=MYSQL OSSL ZIP
+OPTIONS_DEFINE=	MYSQL POSTGRES SSL ZIP GD LDAP MBSTRING
+OPTIONS_DEFAULT=MYSQL SSL ZIP
 
-OSSL_DESC=	Enable SSL connection support
 MBSTRING_DESC=	Support multi-byte character sets
 POSTGRES_DESC=	PostgreSQL database support
 ZIP_DESC=	Install PHP zip extension
@@ -42,7 +41,7 @@ ZIP_DESC=	Install PHP zip extension
 MYSQL_USE=	PHP=mysqli,pdo_mysql
 POSTGRES_USE=	PHP=pgsql,pdo_pgsql
 MBSTRING_USE=	PHP=mbstring
-OSSL_USE=	PHP=openssl
+SSL_USE=	PHP=openssl
 ZIP_USE=	PHP=zip
 GD_USE=		PHP=gd
 LDAP_USE=	PHP=ldap
diff --git a/irc/ircd-ratbox/Makefile b/irc/ircd-ratbox/Makefile
index f09196e0a2ef..b555ed15fa5a 100644
--- a/irc/ircd-ratbox/Makefile
+++ b/irc/ircd-ratbox/Makefile
@@ -52,8 +52,6 @@ PORTDOCS=	[^i]*.txt README.* technical/[^i]*.txt Tao-of-IRC.*
 
 OPTIONS_DEFINE=		OPENSSL IPV6 ZIPLINKS SHARED_MODS ASSERT SMALL_NET	\
 			SERVICES SHORTCUTS
-OPENSSL_DESC=		Support OpenSSL encrypted connections
-IPV6_DESC=		Enable IPv6 support
 ZIPLINKS_DESC=		Support compressed server links
 SHARED_MODS_DESC=	Support shared modules
 ASSERT_DESC=		Enable debugging code
diff --git a/lang/php56-extensions/Makefile b/lang/php56-extensions/Makefile
index 81ccccb8181a..385757313fb6 100644
--- a/lang/php56-extensions/Makefile
+++ b/lang/php56-extensions/Makefile
@@ -52,7 +52,6 @@ MYSQL_DESC=		MySQL database support
 MYSQLI_DESC=		MySQLi database support
 ODBC_DESC=		ODBC support
 OPCACHE_DESC=		OPcache support
-OPENSSL_DESC=		OpenSSL support
 PCNTL_DESC=		pcntl support (CLI only)
 PDF_DESC=		PDFlib support (implies GD)
 PDO_DESC=		PHP Data Objects Interface (PDO)
diff --git a/lang/php56/Makefile b/lang/php56/Makefile
index bd40b59aad75..2df5b1decec9 100644
--- a/lang/php56/Makefile
+++ b/lang/php56/Makefile
@@ -47,7 +47,6 @@ FPM_DESC=	Build FPM version
 EMBED_DESC=	Build embedded library
 DEBUG_DESC=	Enable debug
 DTRACE_DESC=	Enable DTrace support
-IPV6_DESC=	Enable ipv6 support
 MAILHEAD_DESC=	Enable mail header patch
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
diff --git a/lang/php70-extensions/Makefile b/lang/php70-extensions/Makefile
index 619301865a02..bc46689d9cc8 100644
--- a/lang/php70-extensions/Makefile
+++ b/lang/php70-extensions/Makefile
@@ -51,7 +51,6 @@ MCRYPT_DESC=		Encryption support
 MYSQLI_DESC=		MySQLi database support
 ODBC_DESC=		ODBC support
 OPCACHE_DESC=		OPcache support
-OPENSSL_DESC=		OpenSSL support
 PCNTL_DESC=		pcntl support (CLI only)
 PDF_DESC=		PDFlib support (implies GD)
 PDO_DESC=		PHP Data Objects Interface (PDO)
diff --git a/lang/php70/Makefile b/lang/php70/Makefile
index 80460e0d6046..e066eb7ea1a1 100644
--- a/lang/php70/Makefile
+++ b/lang/php70/Makefile
@@ -50,7 +50,6 @@ EMBED_DESC=	Build embedded library
 DEBUG_DESC=	Enable debug
 PHPDBG_DESC=	Interactive PHP debugger
 DTRACE_DESC=	Enable DTrace support
-IPV6_DESC=	Enable ipv6 support
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
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
 
diff --git a/net-mgmt/ocsinventory-agent/Makefile b/net-mgmt/ocsinventory-agent/Makefile
index 11618ac14b59..bda57aba4cb7 100644
--- a/net-mgmt/ocsinventory-agent/Makefile
+++ b/net-mgmt/ocsinventory-agent/Makefile
@@ -36,7 +36,6 @@ OPTIONS_DEFINE=	DAEMON IPMI SSL PRINTER SNMP
 
 DAEMON_DESC=	Daemon mode
 IPMI_DESC=	Collect information about IPMI
-SSL_DESC=	Get SSL communications working
 PRINTER_DESC=	Printers detection
 SNMP_DESC=	Scan network devices using SNMP
 
diff --git a/net/rwhoisd/Makefile b/net/rwhoisd/Makefile
index 1ad2490213f5..3f176bf2f988 100644
--- a/net/rwhoisd/Makefile
+++ b/net/rwhoisd/Makefile
@@ -31,7 +31,6 @@ ETCFILES=	rwhoisd.allow rwhoisd.auth_area rwhoisd.conf rwhoisd.deny \
 PLIST_SUB+=	ETCFILES="${ETCFILES}"
 
 OPTIONS_DEFINE=	IPV6 DOCS
-IPV6_DESC=	Enable IPV6 support
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 
 post-patch:
diff --git a/security/silktools/Makefile b/security/silktools/Makefile
index 34b8f7b1c66c..549a0cd15024 100644
--- a/security/silktools/Makefile
+++ b/security/silktools/Makefile
@@ -39,7 +39,6 @@ CARES_CONFIGURE_WITH=	c-ares=${LOCALBASE}
 CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
 
 IPV6_CONFIGURE_ENABLE=	ipv6
-IPV6_DESC=	Support for analysis of flow records containing IPv6 addresses
 
 GNUTLS_CONFIGURE_WITH=	gnutls=${LOCALBASE}
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
diff --git a/sysutils/bacula-client/Makefile b/sysutils/bacula-client/Makefile
index 115f8ef9b459..3278f45596fd 100644
--- a/sysutils/bacula-client/Makefile
+++ b/sysutils/bacula-client/Makefile
@@ -11,10 +11,7 @@ USE_RC_SUBR=	bacula-fd
 PLIST=		${PKGDIR}/pkg-plist.client
 MASTERDIR=	${.CURDIR}/../../sysutils/bacula-server
 
-OPTIONS_DEFINE=	NLS PYTHON ENABLE_IPV6
-OPTIONS_DEFAULT=ENABLE_IPV6
-
-ENABLE_IPV6_DESC=	Enable IPv6 support
+OPTIONS_DEFINE=	NLS PYTHON IPV6
 
 BROKEN_aarch64=		Fails to link: missing sbrk
 
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index c2bc4dcb5fa4..8c7c917c4a23 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -32,10 +32,9 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I/usr/include/readline -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE?=	SQLITE3 MYSQL PGSQL MTX PYTHON NLS ENABLE_IPV6
-OPTIONS_DEFAULT?=	NLS PGSQL ENABLE_IPV6
+OPTIONS_DEFINE?=	SQLITE3 MYSQL PGSQL MTX PYTHON NLS IPV6
+OPTIONS_DEFAULT?=	NLS PGSQL
 MTX_DESC=		Install mtx for control of autochanger devices
-ENABLE_IPV6_DESC=	Enable IPv6 support
 
 .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server"  #Till end of the file
 
@@ -142,7 +141,7 @@ readline_CONFIGURE=	yes
 .endif
 
 # if IPv6 is not in the kernel, it generates many errors
-.if ! ${PORT_OPTIONS:MENABLE_IPV6}
+.if ! ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 5e0970e9146f..3760b146b1bd 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -29,7 +29,6 @@ OPTIONS_DEFAULT=	JSON
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
 SPOOF_DESC=		Build with spoof source support
-IPV6_DESC=		Build with IPV6 support
 SMTP_DESC=		Build with SMTP support
 JSON_DESC=		Build with JSON-C support
 GEOIP_DESC=		Build with GeoIP support
diff --git a/sysutils/syslog-ng36/Makefile b/sysutils/syslog-ng36/Makefile
index 1810a8f2780f..ec0d62985d27 100644
--- a/sysutils/syslog-ng36/Makefile
+++ b/sysutils/syslog-ng36/Makefile
@@ -31,7 +31,6 @@ OPTIONS_DEFAULT=	OPENSSL JSON
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
 SPOOF_DESC=		Build with spoof source support
-IPV6_DESC=		Build with IPV6 support
 SMTP_DESC=		Build with SMTP support
 JSON_DESC=		Build with JSON-C support
 GEOIP_DESC=		Build with GeoIP support
diff --git a/sysutils/syslog-ng37/Makefile b/sysutils/syslog-ng37/Makefile
index adc7fd27db07..b343b82c4d63 100644
--- a/sysutils/syslog-ng37/Makefile
+++ b/sysutils/syslog-ng37/Makefile
@@ -35,7 +35,6 @@ OPTIONS_DEFAULT=	JSON
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
 SPOOF_DESC=		Build with spoof source support
-IPV6_DESC=		Build with IPV6 support
 SMTP_DESC=		Build with SMTP support
 JSON_DESC=		Build with JSON-C support
 GEOIP_DESC=		Build with GeoIP support
diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile
index 8dff3641468c..001543051a69 100644
--- a/www/bozohttpd/Makefile
+++ b/www/bozohttpd/Makefile
@@ -26,7 +26,6 @@ USES=		cpe uidfix tar:bzip2
 CPE_VENDOR=	eterna
 
 HTPASSWD_DESC=		Enable htpassword support
-SSL_DESC=		Enable SSL support
 CGI_DESC=		Enable CGI support
 
 .include <bsd.port.options.mk>
diff --git a/www/mongoose/Makefile b/www/mongoose/Makefile
index 2df549e426a0..39552c42104d 100644
--- a/www/mongoose/Makefile
+++ b/www/mongoose/Makefile
@@ -39,8 +39,6 @@ DIRECTORY_LISTING_DESC=	Enable directory listing
 LOGGING_DESC=		Enable logging
 SSI_DESC=		Enable SSI
 THREADS_DESC=		Enable threads
-SSL_DESC=		Enable SSL
-IPV6_DESC=		Enable IPv6 support
 DEBUG_HEXDUMP_DESC=	Enable hexdump of sent and received traffic
 
 SSL_USES=		ssl