Index: head/databases/adodb5/Makefile
===================================================================
--- head/databases/adodb5/Makefile	(revision 561861)
+++ head/databases/adodb5/Makefile	(revision 561862)
@@ -1,56 +1,58 @@
 # Created by: mm@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	adodb
-DISTVERSION=	5.20.17
+PORTVERSION=	5.20.18
+DISTVERSIONPREFIX=	v
 CATEGORIES=	databases www
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-php5-only/${PORTNAME}-520-for-php5
 PKGNAMESUFFIX=	5${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Database library for PHP
 
 LICENSE=	BSD3CLAUSE LGPL21+
 LICENSE_COMB=	dual
 
-CONFLICTS=	adodb-4.*
-
 USES=		php:flavors
 USE_PHP=	pcre
 
-WRKSRC=		${WRKDIR}/${PORTNAME}5
+USE_GITHUB=	yes
+GH_PROJECT=	ADOdb
+
+CONFLICTS=	adodb-4.*
+
 NO_BUILD=	yes
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 ADODB_SUBDIRS=	contrib datadict drivers lang pear perf session xsl
 
 OPTIONS_DEFINE=	TESTS DOCS
 OPTIONS_SUB=	yes
 
 TESTS_DESC=	Install tests
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${FIND} ${ADODB_SUBDIRS} -type d \
 		-exec ${MKDIR} ${STAGEDIR}${DATADIR}/{} \;
 	cd ${WRKSRC} && ${FIND} . ! -path './*/*' -type f \( -name '*.php' -or -name '*.dtd' -or -name '*.zip' \) \
 		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \;
 	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-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/cute_icons_for_site
 	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}/{} \;
 
 .include <bsd.port.mk>
Index: head/databases/adodb5/distinfo
===================================================================
--- head/databases/adodb5/distinfo	(revision 561861)
+++ head/databases/adodb5/distinfo	(revision 561862)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588063979
-SHA256 (adodb-5.20.17.tar.gz) = d5266dbbea9c2dc20c7ee3e91869d2c2bf7bab9bacf50416ce0f9fe419d426df
-SIZE (adodb-5.20.17.tar.gz) = 428563
+TIMESTAMP = 1605224733
+SHA256 (adodb-ADOdb-v5.20.18_GH0.tar.gz) = 9295dce43db09d80f5f41e0961c0f53ae333dac1e3cf82d4087b9b2298d65091
+SIZE (adodb-ADOdb-v5.20.18_GH0.tar.gz) = 467003
Index: head/databases/adodb5/files/pkg-message.in
===================================================================
--- head/databases/adodb5/files/pkg-message.in	(revision 561861)
+++ head/databases/adodb5/files/pkg-message.in	(revision 561862)
@@ -1,10 +1,10 @@
 [
 { type: install
   message: <<EOM
-This version supports only PHP version 5 and higher.
+This version supports only PHP version 5.3 and higher.
 
 You can add the ADOdb path (%%DATADIR%%)
 into the "include_path=" directive in your php.ini
 EOM
 }
 ]
Index: head/databases/adodb5/pkg-plist
===================================================================
--- head/databases/adodb5/pkg-plist	(revision 561861)
+++ head/databases/adodb5/pkg-plist	(revision 561862)
@@ -1,201 +1,202 @@
 %%DATADIR%%/adodb-active-record.inc.php
 %%DATADIR%%/adodb-active-recordx.inc.php
 %%DATADIR%%/adodb-csvlib.inc.php
 %%DATADIR%%/adodb-datadict.inc.php
 %%DATADIR%%/adodb-error.inc.php
 %%DATADIR%%/adodb-errorhandler.inc.php
 %%DATADIR%%/adodb-errorpear.inc.php
 %%DATADIR%%/adodb-exceptions.inc.php
 %%DATADIR%%/adodb-iterator.inc.php
 %%DATADIR%%/adodb-lib.inc.php
 %%DATADIR%%/adodb-memcache.lib.inc.php
 %%DATADIR%%/adodb-pager.inc.php
 %%DATADIR%%/adodb-pear.inc.php
 %%DATADIR%%/adodb-perf.inc.php
 %%DATADIR%%/adodb-php4.inc.php
 %%DATADIR%%/adodb-time.inc.php
 %%DATADIR%%/adodb-xmlschema.inc.php
 %%DATADIR%%/adodb-xmlschema03.inc.php
 %%DATADIR%%/adodb.inc.php
-%%DATADIR%%/pivottable.inc.php
-%%DATADIR%%/rsfilter.inc.php
-%%DATADIR%%/server.php
-%%DATADIR%%/toexport.inc.php
-%%DATADIR%%/tohtml.inc.php
-%%DATADIR%%/xmlschema.dtd
-%%DATADIR%%/xmlschema03.dtd
 %%DATADIR%%/contrib/toxmlrpc.inc.php
 %%DATADIR%%/datadict/datadict-access.inc.php
 %%DATADIR%%/datadict/datadict-db2.inc.php
 %%DATADIR%%/datadict/datadict-firebird.inc.php
 %%DATADIR%%/datadict/datadict-generic.inc.php
 %%DATADIR%%/datadict/datadict-ibase.inc.php
 %%DATADIR%%/datadict/datadict-informix.inc.php
 %%DATADIR%%/datadict/datadict-mssql.inc.php
 %%DATADIR%%/datadict/datadict-mssqlnative.inc.php
 %%DATADIR%%/datadict/datadict-mysql.inc.php
 %%DATADIR%%/datadict/datadict-oci8.inc.php
 %%DATADIR%%/datadict/datadict-postgres.inc.php
 %%DATADIR%%/datadict/datadict-sapdb.inc.php
 %%DATADIR%%/datadict/datadict-sqlite.inc.php
 %%DATADIR%%/datadict/datadict-sybase.inc.php
 %%DATADIR%%/drivers/adodb-access.inc.php
 %%DATADIR%%/drivers/adodb-ado.inc.php
 %%DATADIR%%/drivers/adodb-ado5.inc.php
 %%DATADIR%%/drivers/adodb-ado_access.inc.php
 %%DATADIR%%/drivers/adodb-ado_mssql.inc.php
 %%DATADIR%%/drivers/adodb-ads.inc.php
 %%DATADIR%%/drivers/adodb-borland_ibase.inc.php
 %%DATADIR%%/drivers/adodb-csv.inc.php
 %%DATADIR%%/drivers/adodb-db2.inc.php
 %%DATADIR%%/drivers/adodb-db2oci.inc.php
 %%DATADIR%%/drivers/adodb-db2ora.inc.php
 %%DATADIR%%/drivers/adodb-fbsql.inc.php
 %%DATADIR%%/drivers/adodb-firebird.inc.php
 %%DATADIR%%/drivers/adodb-ibase.inc.php
 %%DATADIR%%/drivers/adodb-informix.inc.php
-%%DATADIR%%/drivers/adodb-oci8quercus.inc.php
-%%DATADIR%%/drivers/adodb-pdo_sqlsrv.inc.php
 %%DATADIR%%/drivers/adodb-informix72.inc.php
 %%DATADIR%%/drivers/adodb-ldap.inc.php
 %%DATADIR%%/drivers/adodb-mssql.inc.php
-%%DATADIR%%/drivers/adodb-mssqlnative.inc.php
 %%DATADIR%%/drivers/adodb-mssql_n.inc.php
+%%DATADIR%%/drivers/adodb-mssqlnative.inc.php
 %%DATADIR%%/drivers/adodb-mssqlpo.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-odbc.inc.php
 %%DATADIR%%/drivers/adodb-odbc_db2.inc.php
 %%DATADIR%%/drivers/adodb-odbc_mssql.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_mssql.inc.php
 %%DATADIR%%/drivers/adodb-pdo_mysql.inc.php
 %%DATADIR%%/drivers/adodb-pdo_oci.inc.php
 %%DATADIR%%/drivers/adodb-pdo_pgsql.inc.php
 %%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-proxy.inc.php
 %%DATADIR%%/drivers/adodb-sapdb.inc.php
 %%DATADIR%%/drivers/adodb-sqlanywhere.inc.php
 %%DATADIR%%/drivers/adodb-sqlite.inc.php
 %%DATADIR%%/drivers/adodb-sqlite3.inc.php
 %%DATADIR%%/drivers/adodb-sqlitepo.inc.php
 %%DATADIR%%/drivers/adodb-sybase.inc.php
 %%DATADIR%%/drivers/adodb-sybase_ase.inc.php
+%%DATADIR%%/drivers/adodb-text.inc.php
 %%DATADIR%%/drivers/adodb-vfp.inc.php
 %%DATADIR%%/lang/adodb-ar.inc.php
 %%DATADIR%%/lang/adodb-bg.inc.php
 %%DATADIR%%/lang/adodb-ca.inc.php
 %%DATADIR%%/lang/adodb-cn.inc.php
 %%DATADIR%%/lang/adodb-cz.inc.php
 %%DATADIR%%/lang/adodb-da.inc.php
 %%DATADIR%%/lang/adodb-de.inc.php
 %%DATADIR%%/lang/adodb-en.inc.php
+%%DATADIR%%/lang/adodb-eo.inc.php
 %%DATADIR%%/lang/adodb-es.inc.php
 %%DATADIR%%/lang/adodb-fa.inc.php
 %%DATADIR%%/lang/adodb-fr.inc.php
 %%DATADIR%%/lang/adodb-hu.inc.php
 %%DATADIR%%/lang/adodb-it.inc.php
 %%DATADIR%%/lang/adodb-nl.inc.php
 %%DATADIR%%/lang/adodb-pl.inc.php
-%%DATADIR%%/lang/adodb-eo.inc.php
-%%DATADIR%%/lang/adodb-ru.inc.php
-%%DATADIR%%/lang/adodb-th.inc.php
-%%DATADIR%%/lang/adodb-uk.inc.php
 %%DATADIR%%/lang/adodb-pt-br.inc.php
 %%DATADIR%%/lang/adodb-ro.inc.php
+%%DATADIR%%/lang/adodb-ru.inc.php
 %%DATADIR%%/lang/adodb-sv.inc.php
-%%DATADIR%%/pear/readme.Auth.txt
+%%DATADIR%%/lang/adodb-th.inc.php
+%%DATADIR%%/lang/adodb-uk.inc.php
 %%DATADIR%%/pear/Auth/Container/ADOdb.php
 %%DATADIR%%/pear/auth_adodb_example.php
+%%DATADIR%%/pear/readme.Auth.txt
 %%DATADIR%%/perf/perf-db2.inc.php
 %%DATADIR%%/perf/perf-informix.inc.php
 %%DATADIR%%/perf/perf-mssql.inc.php
 %%DATADIR%%/perf/perf-mssqlnative.inc.php
 %%DATADIR%%/perf/perf-mysql.inc.php
 %%DATADIR%%/perf/perf-oci8.inc.php
 %%DATADIR%%/perf/perf-postgres.inc.php
+%%DATADIR%%/pivottable.inc.php
+%%DATADIR%%/rsfilter.inc.php
+%%DATADIR%%/server.php
 %%DATADIR%%/session/adodb-compress-bzip2.php
 %%DATADIR%%/session/adodb-compress-gzip.php
 %%DATADIR%%/session/adodb-cryptsession.php
 %%DATADIR%%/session/adodb-cryptsession2.php
 %%DATADIR%%/session/adodb-encrypt-mcrypt.php
 %%DATADIR%%/session/adodb-encrypt-md5.php
 %%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/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/crypt.inc.php
 %%DATADIR%%/session/session_schema.xml
 %%DATADIR%%/session/session_schema2.xml
+%%DATADIR%%/toexport.inc.php
+%%DATADIR%%/tohtml.inc.php
+%%DATADIR%%/xmlschema.dtd
+%%DATADIR%%/xmlschema03.dtd
 %%DATADIR%%/xsl/convert-0.1-0.2.xsl
 %%DATADIR%%/xsl/convert-0.1-0.3.xsl
 %%DATADIR%%/xsl/convert-0.2-0.1.xsl
 %%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.xml
 %%TESTS%%%%DATADIR%%/tests/xmlschema-mssql.xml
-%%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb.gif
-%%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb2.gif
+%%TESTS%%%%DATADIR%%/tests/xmlschema.xml
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/adodb.gif
 %%PORTDOCS%%%%DOCSDIR%%/adodb2.gif
 %%PORTDOCS%%%%DOCSDIR%%/changelog.md
 %%PORTDOCS%%%%DOCSDIR%%/changelog_v2.x.md
 %%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