security/openssl111: Rename to openssl

 - Honoring promise from DEPRECATED message
 - Unbreak people's builds

PR:		243014
MFH:		2020Q1

12 files changed, 19 insertions, 3 deletions

diff --git a/MOVED b/MOVED
index 9b8ccd815e0f..fa5f2faf18f9 100644
--- a/MOVED
+++ b/MOVED
@@ -13724,3 +13724,4 @@ lang/erlang-runtime16|lang/erlang-runtime21|2020-01-01|Has expired: No longer su
 lang/erlang-runtime17|lang/erlang-runtime21|2020-01-01|Has expired: No longer supported upstream, use lang/erlang >=21
 lang/erlang-runtime18|lang/erlang-runtime21|2020-01-01|Has expired: No longer supported upstream, use lang/erlang >=21
 lang/erlang-runtime19|lang/erlang-runtime21|2020-01-01|Has expired: No longer supported upstream, use lang/erlang >=21
+security/openssl111|security/openssl|2020-01-01|Upgrade security/openssl to 1.1.1 as promised in deprecation message
diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk
index 2de01295cb3b..cd712b69505c 100644
--- a/Mk/Uses/ssl.mk
+++ b/Mk/Uses/ssl.mk
@@ -10,7 +10,7 @@
 #
 # DEFAULT_VERSIONS+=	ssl=<openssl variant>
 #
-# Variants being base, openssl, openssl111, libressl, and libressl-devel.
+# Variants being base, openssl, libressl, and libressl-devel.
 #
 # The Makefile sets these variables:
 # OPENSSLBASE		- "/usr" or ${LOCALBASE}
diff --git a/UPDATING b/UPDATING
index 8ad08b772c75..dab9215eb462 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,21 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20200101:
+  AFFECTS: users of security/openssl and security/openssl111
+  AUTHOR: brnrd@FreeBSD.org
+
+  The openssl port was removed on 2019-12-31, subsequently the openssl111
+  port was renamed to openssl on 2020-01-01.
+
+  The shared library version of OpenSSL has been bumped.
+
+  Users of DEFAULT_VERSIONS= ssl=openssl111 must update this to
+  ssl=openssl. 
+
+  You must rebuild all ports that depend on OpenSSL if you use OpenSSL
+  from ports.
+
 20191226:
   AFFECTS: users of sysutils/dsbmd
   AUTHOR: mk@freeshell.de
diff --git a/security/Makefile b/security/Makefile
index b598876fb938..1210240f20e8 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -402,8 +402,8 @@
     SUBDIR += openscep
     SUBDIR += openssh-askpass
     SUBDIR += openssh-portable
+    SUBDIR += openssl
     SUBDIR += openssl-unsafe
-    SUBDIR += openssl111
     SUBDIR += openssl_tpm_engine
     SUBDIR += openvas8
     SUBDIR += openvas8-cli
diff --git a/security/openssl111/Makefile b/security/openssl/Makefile
index 11182937920d..4558eaca7062 100644
--- a/security/openssl111/Makefile
+++ b/security/openssl/Makefile
@@ -3,10 +3,10 @@
 
 PORTNAME=	openssl
 PORTVERSION=	1.1.1d
+PORTEPOCH=	1
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.openssl.org/source/ \
 		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
-PKGNAMESUFFIX=	111
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	TLSv1.3 capable SSL and crypto library
diff --git a/security/openssl111/distinfo b/security/openssl/distinfo
index e502f0e44f9c..e502f0e44f9c 100644
--- a/security/openssl111/distinfo
+++ b/security/openssl/distinfo
diff --git a/security/openssl111/files/extra-patch-util_process__docs.pl b/security/openssl/files/extra-patch-util_process__docs.pl
index d81c00d4656f..d81c00d4656f 100644
--- a/security/openssl111/files/extra-patch-util_process__docs.pl
+++ b/security/openssl/files/extra-patch-util_process__docs.pl
diff --git a/security/openssl111/files/patch-config b/security/openssl/files/patch-config
index 753e22c6d62d..753e22c6d62d 100644
--- a/security/openssl111/files/patch-config
+++ b/security/openssl/files/patch-config
diff --git a/security/openssl111/files/pkg-message.in b/security/openssl/files/pkg-message.in
index 0cae95bfd9f1..0cae95bfd9f1 100644
--- a/security/openssl111/files/pkg-message.in
+++ b/security/openssl/files/pkg-message.in
diff --git a/security/openssl111/pkg-descr b/security/openssl/pkg-descr
index c0f70fb4503f..c0f70fb4503f 100644
--- a/security/openssl111/pkg-descr
+++ b/security/openssl/pkg-descr
diff --git a/security/openssl111/pkg-plist b/security/openssl/pkg-plist
index 1983b830bfd7..1983b830bfd7 100644
--- a/security/openssl111/pkg-plist
+++ b/security/openssl/pkg-plist
diff --git a/security/openssl111/version.mk b/security/openssl/version.mk
index dee699deda06..dee699deda06 100644
--- a/security/openssl111/version.mk
+++ b/security/openssl/version.mk