diff --git a/databases/mysql51/Portfile b/databases/mysql51/Portfile
index 28464011e55..da887fa3400 100644
--- a/databases/mysql51/Portfile
+++ b/databases/mysql51/Portfile
@@ -4,7 +4,7 @@ PortSystem          1.0
 PortGroup           deprecated 1.0
 
 # Support ended 2013-12
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name                mysql51
 set name_mysql      ${name}
diff --git a/databases/mysql55/Portfile b/databases/mysql55/Portfile
index 65c71509559..49dd6972c9e 100644
--- a/databases/mysql55/Portfile
+++ b/databases/mysql55/Portfile
@@ -4,7 +4,7 @@ PortSystem          1.0
 PortGroup           deprecated 1.0
 
 # Support ended 2018-12
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name                mysql55
 set name_mysql      ${name}
diff --git a/databases/mysql56/Portfile b/databases/mysql56/Portfile
index db64029a91f..442707ae832 100644
--- a/databases/mysql56/Portfile
+++ b/databases/mysql56/Portfile
@@ -3,9 +3,8 @@
 PortSystem          1.0
 PortGroup           deprecated 1.0
 
-# New 5.6.x releases will be available until 2021-02;
-# however, support for macOS has ended early (2018-10-19)
-deprecated.upstream_support no
+# EOL 2021-02; support for macOS ended early (2018-10-19)
+deprecated.eol_version yes
 
 name                mysql56
 set name_mysql      ${name}
diff --git a/databases/postgresql82-doc/Portfile b/databases/postgresql82-doc/Portfile
index c9acaf1372e..b10e6dc5800 100644
--- a/databases/postgresql82-doc/Portfile
+++ b/databases/postgresql82-doc/Portfile
@@ -4,7 +4,7 @@ PortSystem 1.0
 PortGroup deprecated 1.0
 
 # Final release was on 2011-12-05
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name			postgresql82-doc
 version			8.2.23
diff --git a/databases/postgresql82-server/Portfile b/databases/postgresql82-server/Portfile
index 6afb1dbe029..a9a064ad69f 100644
--- a/databases/postgresql82-server/Portfile
+++ b/databases/postgresql82-server/Portfile
@@ -4,7 +4,7 @@ PortSystem 1.0
 PortGroup deprecated 1.0
 
 # Final release was on 2011-12-05
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name                postgresql82-server
 version             8.2.23
diff --git a/databases/postgresql82/Portfile b/databases/postgresql82/Portfile
index a95a2b35e09..d990f7b75c9 100644
--- a/databases/postgresql82/Portfile
+++ b/databases/postgresql82/Portfile
@@ -5,7 +5,7 @@ PortGroup deprecated 1.0
 PortGroup openssl 1.0
 
 # Final release was on 2011-12-05
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 # building arm64 fails with unsupported option '-mthreads' and unsupported spinlock
 supported_archs i386 ppc ppc64 x86_64
diff --git a/databases/postgresql83-doc/Portfile b/databases/postgresql83-doc/Portfile
index fa573e6d81a..8e2dd48fbd5 100644
--- a/databases/postgresql83-doc/Portfile
+++ b/databases/postgresql83-doc/Portfile
@@ -4,7 +4,7 @@ PortSystem 1.0
 PortGroup deprecated 1.0
 
 # Final release was on 2013-02-07
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name			postgresql83-doc
 version			8.3.23
diff --git a/databases/postgresql83-server/Portfile b/databases/postgresql83-server/Portfile
index cb46d80401e..bf952b410cb 100644
--- a/databases/postgresql83-server/Portfile
+++ b/databases/postgresql83-server/Portfile
@@ -4,7 +4,7 @@ PortSystem 1.0
 PortGroup deprecated 1.0
 
 # Final release was on 2013-02-07
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name                postgresql83-server
 version             8.3.23
diff --git a/databases/postgresql83/Portfile b/databases/postgresql83/Portfile
index e095711430f..2187dd770f3 100644
--- a/databases/postgresql83/Portfile
+++ b/databases/postgresql83/Portfile
@@ -5,7 +5,7 @@ PortGroup deprecated 1.0
 PortGroup openssl 1.0
 
 # Final release was on 2013-02-07
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 # building arm64 fails with unsupported option '-mthreads' and unsupported spinlock
 supported_archs i386 ppc ppc64 x86_64
diff --git a/databases/postgresql84-doc/Portfile b/databases/postgresql84-doc/Portfile
index 05cc01a8da5..7fd9240f73b 100644
--- a/databases/postgresql84-doc/Portfile
+++ b/databases/postgresql84-doc/Portfile
@@ -4,7 +4,7 @@ PortSystem 1.0
 PortGroup deprecated 1.0
 
 # Final release was on 2014-07-24
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name			postgresql84-doc
 conflicts       postgresql90-doc postgresql91-doc postgresql92-doc \
diff --git a/databases/postgresql84-server/Portfile b/databases/postgresql84-server/Portfile
index d6c35216248..a932ea28a9e 100644
--- a/databases/postgresql84-server/Portfile
+++ b/databases/postgresql84-server/Portfile
@@ -4,7 +4,7 @@ PortSystem 1.0
 PortGroup deprecated 1.0
 
 # Final release was on 2014-07-24
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name                postgresql84-server
 version             8.4.22
diff --git a/databases/postgresql84/Portfile b/databases/postgresql84/Portfile
index def29985471..c8bd9001f0b 100644
--- a/databases/postgresql84/Portfile
+++ b/databases/postgresql84/Portfile
@@ -5,7 +5,7 @@ PortGroup deprecated 1.0
 PortGroup openssl 1.0
 
 # Final release was on 2014-07-24
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 # building arm64 fails with unsupported option '-mthreads' and unsupported spinlock
 supported_archs i386 ppc ppc64 x86_64
diff --git a/databases/postgresql90-doc/Portfile b/databases/postgresql90-doc/Portfile
index d8f7836ce7b..99d895deb87 100644
--- a/databases/postgresql90-doc/Portfile
+++ b/databases/postgresql90-doc/Portfile
@@ -4,7 +4,7 @@ PortSystem 1.0
 PortGroup deprecated 1.0
 
 # Final release was on 2015-10-08
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name			postgresql90-doc
 conflicts       postgresql84-doc postgresql91-doc postgresql92-doc \
diff --git a/databases/postgresql90-server/Portfile b/databases/postgresql90-server/Portfile
index ddf99a47dad..f253ce611f2 100644
--- a/databases/postgresql90-server/Portfile
+++ b/databases/postgresql90-server/Portfile
@@ -4,7 +4,7 @@ PortSystem 1.0
 PortGroup deprecated 1.0
 
 # Final release was on 2015-10-08
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name                postgresql90-server
 version             9.0.23
diff --git a/databases/postgresql90/Portfile b/databases/postgresql90/Portfile
index 7370deef4d2..b3cbf2a0619 100644
--- a/databases/postgresql90/Portfile
+++ b/databases/postgresql90/Portfile
@@ -6,7 +6,7 @@ PortGroup deprecated 1.0
 PortGroup openssl 1.0
 
 # Final release was on 2015-10-08
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 # building arm64 fails with unsupported option '-mthreads' and unsupported spinlock
 supported_archs i386 ppc ppc64 x86_64
diff --git a/databases/postgresql91-doc/Portfile b/databases/postgresql91-doc/Portfile
index 36fda9185a8..4b9fc0d1b53 100644
--- a/databases/postgresql91-doc/Portfile
+++ b/databases/postgresql91-doc/Portfile
@@ -4,7 +4,7 @@ PortSystem 1.0
 PortGroup deprecated 1.0
 
 # Final release was on 2016-10-27
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name			postgresql91-doc
 conflicts       postgresql90-doc postgresql92-doc postgresql93-doc \
diff --git a/databases/postgresql91-server/Portfile b/databases/postgresql91-server/Portfile
index 43be381e16c..f6b5474e89e 100644
--- a/databases/postgresql91-server/Portfile
+++ b/databases/postgresql91-server/Portfile
@@ -4,7 +4,7 @@ PortSystem 1.0
 PortGroup deprecated 1.0
 
 # Final release was on 2016-10-27
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name                postgresql91-server
 version             9.1.24
diff --git a/databases/postgresql91/Portfile b/databases/postgresql91/Portfile
index 2a76159ff25..5b5d8df7998 100644
--- a/databases/postgresql91/Portfile
+++ b/databases/postgresql91/Portfile
@@ -6,7 +6,7 @@ PortGroup deprecated 1.0
 PortGroup openssl 1.0
 
 # Final release was on 2016-10-27
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 # building arm64 fails with unsupported option '-mthreads' and unsupported spinlock
 supported_archs i386 ppc ppc64 x86_64
diff --git a/databases/postgresql92-doc/Portfile b/databases/postgresql92-doc/Portfile
index d9db1b80d15..24a95f2955a 100644
--- a/databases/postgresql92-doc/Portfile
+++ b/databases/postgresql92-doc/Portfile
@@ -4,7 +4,7 @@ PortSystem 1.0
 PortGroup deprecated 1.0
 
 # Final release was on 2017-11-09
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name			postgresql92-doc
 conflicts       postgresql84-doc postgresql90-doc postgresql91-doc \
diff --git a/databases/postgresql92-server/Portfile b/databases/postgresql92-server/Portfile
index 1da1b79eb6b..f06422b93cf 100644
--- a/databases/postgresql92-server/Portfile
+++ b/databases/postgresql92-server/Portfile
@@ -4,7 +4,7 @@ PortSystem 1.0
 PortGroup deprecated 1.0
 
 # Final release was on 2017-11-09
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name                postgresql92-server
 version             9.2.24
diff --git a/databases/postgresql92/Portfile b/databases/postgresql92/Portfile
index 548a222e5e9..4bc0562f0a7 100644
--- a/databases/postgresql92/Portfile
+++ b/databases/postgresql92/Portfile
@@ -6,7 +6,7 @@ PortGroup deprecated 1.0
 PortGroup openssl 1.0
 
 # Final release was on 2017-11-09
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 #remember to update the -doc and -server as well
 name            postgresql92
diff --git a/java/servlet23-api/Portfile b/java/servlet23-api/Portfile
index 3773983e108..f87650874b0 100644
--- a/java/servlet23-api/Portfile
+++ b/java/servlet23-api/Portfile
@@ -4,7 +4,7 @@ PortGroup deprecated 1.0
 
 # Servlet API 2.3 was developed as part of Tomcat 4.x, which is now end-of-life.
 # See https://tomcat.apache.org/whichversion.html
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name            servlet23-api
 epoch           20061005
diff --git a/java/servlet24-api/Portfile b/java/servlet24-api/Portfile
index dfac81052d7..a4520d68424 100644
--- a/java/servlet24-api/Portfile
+++ b/java/servlet24-api/Portfile
@@ -4,7 +4,7 @@ PortGroup deprecated 1.0
 
 # Servlet API 2.4 was developed as part of Tomcat 5.x, which is now end-of-life.
 # See https://tomcat.apache.org/whichversion.html
-deprecated.upstream_support no
+deprecated.eol_version yes
 
 name            servlet24-api
 version         5.5.28
diff --git a/python/py27-pyqt5/Portfile b/python/py27-pyqt5/Portfile
index df6a608c4df..db503305efe 100644
--- a/python/py27-pyqt5/Portfile
+++ b/python/py27-pyqt5/Portfile
@@ -4,7 +4,7 @@ PortSystem              1.0
 PortGroup               python 1.0
 PortGroup               deprecated 1.0
 
-deprecated.upstream_support no
+deprecated.eol_version  yes
 
 name                    py27-pyqt5
 python.rootname         PyQt5