diff --git a/databases/adodb5/Makefile b/databases/adodb5/Makefile
index 6c0fe061a397..35e347c8c4e6 100644
--- a/databases/adodb5/Makefile
+++ b/databases/adodb5/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	adodb
-PORTVERSION=	5.20.20
+PORTVERSION=	5.21.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases www
 PKGNAMESUFFIX=	5${PHP_PKGNAMESUFFIX}
@@ -25,12 +25,13 @@ NO_BUILD=	yes
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
-ADODB_SUBDIRS=	contrib datadict drivers lang pear perf session xsl
+ADODB_SUBDIRS=	datadict drivers lang pear perf session xsl
 
-OPTIONS_DEFINE=	TESTS DOCS
+OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
-TESTS_DESC=	Install tests
+# 5.21.0 have not contains test suite
+#TESTS_DESC=	Install tests
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
@@ -41,18 +42,16 @@ do-install:
 	cd ${WRKSRC} && ${FIND} ${ADODB_SUBDIRS} -type f \
 		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \;
 
-do-install-TESTS-on:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/tests
-	cd ${WRKSRC} && ${FIND} tests -type f \
-		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \;
+#do-install-TESTS-on:
+#	@${MKDIR} ${STAGEDIR}${DATADIR}/tests
+#	cd ${WRKSRC} && ${FIND} tests -type f \
+#		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \;
 
 do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/cute_icons_for_site
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${FIND} . ! -path './*/*' -type f -name '*.txt' \
-		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \;
-	cd ${WRKSRC}/docs && ${FIND} . -type f \
-		-exec ${INSTALL_DATA} ${WRKSRC}/docs/{} ${STAGEDIR}${DOCSDIR}/{} \;
-	cd ${WRKSRC} && ${FIND} cute_icons_for_site -type f \
-		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \;
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR} \;
+	cd ${WRKSRC} && ${FIND} docs -type f \
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR} \;
 
 .include <bsd.port.mk>
diff --git a/databases/adodb5/distinfo b/databases/adodb5/distinfo
index a894e2865664..a930d1f40bdc 100644
--- a/databases/adodb5/distinfo
+++ b/databases/adodb5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612320271
-SHA256 (adodb-ADOdb-v5.20.20_GH0.tar.gz) = 65a146028f24a1d891c9ffc333d117e8a6df8a5b7c585049a58899aba37d9c13
-SIZE (adodb-ADOdb-v5.20.20_GH0.tar.gz) = 469337
+TIMESTAMP = 1614556316
+SHA256 (adodb-ADOdb-v5.21.0_GH0.tar.gz) = 268a08bd3dcedeed6d0316b030b4fe2b460073c738a000299ba777444863f44c
+SIZE (adodb-ADOdb-v5.21.0_GH0.tar.gz) = 437724
diff --git a/databases/adodb5/pkg-plist b/databases/adodb5/pkg-plist
index 6a48d6b6c30b..8e600f5bc127 100644
--- a/databases/adodb5/pkg-plist
+++ b/databases/adodb5/pkg-plist
@@ -1,3 +1,4 @@
+%%DATADIR%%/adodb.inc.php
 %%DATADIR%%/adodb-active-record.inc.php
 %%DATADIR%%/adodb-active-recordx.inc.php
 %%DATADIR%%/adodb-csvlib.inc.php
@@ -8,6 +9,7 @@
 %%DATADIR%%/adodb-exceptions.inc.php
 %%DATADIR%%/adodb-iterator.inc.php
 %%DATADIR%%/adodb-lib.inc.php
+%%DATADIR%%/adodb-loadbalancer.inc.php
 %%DATADIR%%/adodb-memcache.lib.inc.php
 %%DATADIR%%/adodb-pager.inc.php
 %%DATADIR%%/adodb-pear.inc.php
@@ -16,8 +18,6 @@
 %%DATADIR%%/adodb-time.inc.php
 %%DATADIR%%/adodb-xmlschema.inc.php
 %%DATADIR%%/adodb-xmlschema03.inc.php
-%%DATADIR%%/adodb.inc.php
-%%DATADIR%%/contrib/toxmlrpc.inc.php
 %%DATADIR%%/datadict/datadict-access.inc.php
 %%DATADIR%%/datadict/datadict-db2.inc.php
 %%DATADIR%%/datadict/datadict-firebird.inc.php
@@ -50,26 +50,29 @@
 %%DATADIR%%/drivers/adodb-informix72.inc.php
 %%DATADIR%%/drivers/adodb-ldap.inc.php
 %%DATADIR%%/drivers/adodb-mssql.inc.php
-%%DATADIR%%/drivers/adodb-mssql_n.inc.php
 %%DATADIR%%/drivers/adodb-mssqlnative.inc.php
 %%DATADIR%%/drivers/adodb-mssqlpo.inc.php
+%%DATADIR%%/drivers/adodb-mssql_n.inc.php
 %%DATADIR%%/drivers/adodb-mysql.inc.php
 %%DATADIR%%/drivers/adodb-mysqli.inc.php
 %%DATADIR%%/drivers/adodb-mysqlpo.inc.php
 %%DATADIR%%/drivers/adodb-mysqlt.inc.php
 %%DATADIR%%/drivers/adodb-netezza.inc.php
 %%DATADIR%%/drivers/adodb-oci8.inc.php
-%%DATADIR%%/drivers/adodb-oci805.inc.php
 %%DATADIR%%/drivers/adodb-oci8po.inc.php
 %%DATADIR%%/drivers/adodb-oci8quercus.inc.php
+%%DATADIR%%/drivers/adodb-oci805.inc.php
 %%DATADIR%%/drivers/adodb-odbc.inc.php
 %%DATADIR%%/drivers/adodb-odbc_db2.inc.php
 %%DATADIR%%/drivers/adodb-odbc_mssql.inc.php
+%%DATADIR%%/drivers/adodb-odbc_mssql2012.inc.php
 %%DATADIR%%/drivers/adodb-odbc_oracle.inc.php
 %%DATADIR%%/drivers/adodb-odbtp.inc.php
 %%DATADIR%%/drivers/adodb-odbtp_unicode.inc.php
 %%DATADIR%%/drivers/adodb-oracle.inc.php
 %%DATADIR%%/drivers/adodb-pdo.inc.php
+%%DATADIR%%/drivers/adodb-pdo_dblib.inc.php
+%%DATADIR%%/drivers/adodb-pdo_firebird.inc.php
 %%DATADIR%%/drivers/adodb-pdo_mssql.inc.php
 %%DATADIR%%/drivers/adodb-pdo_mysql.inc.php
 %%DATADIR%%/drivers/adodb-pdo_oci.inc.php
@@ -77,10 +80,10 @@
 %%DATADIR%%/drivers/adodb-pdo_sqlite.inc.php
 %%DATADIR%%/drivers/adodb-pdo_sqlsrv.inc.php
 %%DATADIR%%/drivers/adodb-postgres.inc.php
-%%DATADIR%%/drivers/adodb-postgres64.inc.php
 %%DATADIR%%/drivers/adodb-postgres7.inc.php
 %%DATADIR%%/drivers/adodb-postgres8.inc.php
 %%DATADIR%%/drivers/adodb-postgres9.inc.php
+%%DATADIR%%/drivers/adodb-postgres64.inc.php
 %%DATADIR%%/drivers/adodb-proxy.inc.php
 %%DATADIR%%/drivers/adodb-sapdb.inc.php
 %%DATADIR%%/drivers/adodb-sqlanywhere.inc.php
@@ -104,8 +107,10 @@
 %%DATADIR%%/lang/adodb-fa.inc.php
 %%DATADIR%%/lang/adodb-fr.inc.php
 %%DATADIR%%/lang/adodb-hu.inc.php
+%%DATADIR%%/lang/adodb-id.inc.php
 %%DATADIR%%/lang/adodb-it.inc.php
 %%DATADIR%%/lang/adodb-nl.inc.php
+%%DATADIR%%/lang/adodb-oc.inc.php
 %%DATADIR%%/lang/adodb-pl.inc.php
 %%DATADIR%%/lang/adodb-pt-br.inc.php
 %%DATADIR%%/lang/adodb-ro.inc.php
@@ -135,17 +140,17 @@
 %%DATADIR%%/session/adodb-encrypt-secret.php
 %%DATADIR%%/session/adodb-encrypt-sha1.php
 %%DATADIR%%/session/adodb-sess.txt
-%%DATADIR%%/session/adodb-session-clob.php
-%%DATADIR%%/session/adodb-session-clob2.php
 %%DATADIR%%/session/adodb-session.php
 %%DATADIR%%/session/adodb-session2.php
 %%DATADIR%%/session/adodb-sessions.mysql.sql
 %%DATADIR%%/session/adodb-sessions.oracle.clob.sql
 %%DATADIR%%/session/adodb-sessions.oracle.sql
+%%DATADIR%%/session/adodb-session-clob.php
+%%DATADIR%%/session/adodb-session-clob2.php
 %%DATADIR%%/session/crypt.inc.php
 %%DATADIR%%/session/old/adodb-cryptsession.php
-%%DATADIR%%/session/old/adodb-session-clob.php
 %%DATADIR%%/session/old/adodb-session.php
+%%DATADIR%%/session/old/adodb-session-clob.php
 %%DATADIR%%/session/old/crypt.inc.php
 %%DATADIR%%/session/session_schema.xml
 %%DATADIR%%/session/session_schema2.xml
@@ -159,37 +164,6 @@
 %%DATADIR%%/xsl/convert-0.2-0.3.xsl
 %%DATADIR%%/xsl/remove-0.2.xsl
 %%DATADIR%%/xsl/remove-0.3.xsl
-%%TESTS%%%%DATADIR%%/tests/benchmark.php
-%%TESTS%%%%DATADIR%%/tests/client.php
-%%TESTS%%%%DATADIR%%/tests/pdo.php
-%%TESTS%%%%DATADIR%%/tests/test-active-record.php
-%%TESTS%%%%DATADIR%%/tests/test-active-recs2.php
-%%TESTS%%%%DATADIR%%/tests/test-active-relations.php
-%%TESTS%%%%DATADIR%%/tests/test-active-relationsx.php
-%%TESTS%%%%DATADIR%%/tests/test-datadict.php
-%%TESTS%%%%DATADIR%%/tests/test-perf.php
-%%TESTS%%%%DATADIR%%/tests/test-pgblob.php
-%%TESTS%%%%DATADIR%%/tests/test-php5.php
-%%TESTS%%%%DATADIR%%/tests/test-xmlschema.php
-%%TESTS%%%%DATADIR%%/tests/test.php
-%%TESTS%%%%DATADIR%%/tests/test2.php
-%%TESTS%%%%DATADIR%%/tests/test3.php
-%%TESTS%%%%DATADIR%%/tests/test4.php
-%%TESTS%%%%DATADIR%%/tests/test5.php
-%%TESTS%%%%DATADIR%%/tests/test_rs_array.php
-%%TESTS%%%%DATADIR%%/tests/testcache.php
-%%TESTS%%%%DATADIR%%/tests/testdatabases.inc.php
-%%TESTS%%%%DATADIR%%/tests/testgenid.php
-%%TESTS%%%%DATADIR%%/tests/testmssql.php
-%%TESTS%%%%DATADIR%%/tests/testoci8.php
-%%TESTS%%%%DATADIR%%/tests/testoci8cursor.php
-%%TESTS%%%%DATADIR%%/tests/testpaging.php
-%%TESTS%%%%DATADIR%%/tests/testpear.php
-%%TESTS%%%%DATADIR%%/tests/testsessions.php
-%%TESTS%%%%DATADIR%%/tests/time.php
-%%TESTS%%%%DATADIR%%/tests/tmssql.php
-%%TESTS%%%%DATADIR%%/tests/xmlschema-mssql.xml
-%%TESTS%%%%DATADIR%%/tests/xmlschema.xml
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/adodb.gif
 %%PORTDOCS%%%%DOCSDIR%%/adodb2.gif
@@ -198,5 +172,3 @@
 %%PORTDOCS%%%%DOCSDIR%%/changelog_v3.x.md
 %%PORTDOCS%%%%DOCSDIR%%/changelog_v4+5.md
 %%PORTDOCS%%%%DOCSDIR%%/changelog_v4.x.md
-%%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb.gif
-%%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb2.gif