Update to 4.20 release.

PR:		ports/63523
Submitted by:	Martin Matuska <martin@tradex.sk> (maintainer)

3 files changed, 28 insertions, 11 deletions

diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index 50efb3ef3482..7e68effceab6 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	adodb
-PORTVERSION=	4.11
+PORTVERSION=	4.20
 CATEGORIES=	databases www
 MASTER_SITES=	http://phplens.com/lens/dl/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
@@ -33,14 +33,17 @@ DOCS=	docs-adodb.htm docs-datadict.htm docs-perf.htm docs-session.htm \
 	license.txt old-changelog.htm readme.htm readme.txt tips_portable_sql.htm \
 	tute.htm
 
-ICONS=	adodb.gif adodb.png adodb2.gif adodb2.png
+ICONS=	adodb.gif adodb2.gif
 
 BASE=	adodb-csvlib.inc.php adodb-datadict.inc.php adodb-error.inc.php \
 	adodb-errorhandler.inc.php adodb-errorpear.inc.php adodb-exceptions.inc.php \
 	adodb-iterator.inc.php adodb-lib.inc.php adodb-pager.inc.php \
 	adodb-pear.inc.php adodb-perf.inc.php adodb-php4.inc.php adodb-time.inc.php \
-	adodb-xmlschema.inc.php adodb-xmlschema.zip adodb.inc.php \
-	pivottable.inc.php rsfilter.inc.php server.php toexport.inc.php tohtml.inc.php
+	adodb-time.zip adodb-xmlschema.inc.php adodb.inc.php \
+	pivottable.inc.php rsfilter.inc.php server.php toexport.inc.php tohtml.inc.php \
+	xmlschema.dtd
+
+CONTRIB=toxmlrpc.inc.php
 
 DATADICT=datadict-access.inc.php datadict-db2.inc.php datadict-generic.inc.php \
 	datadict-ibase.inc.php datadict-informix.inc.php datadict-mssql.inc.php \
@@ -75,6 +78,8 @@ SESSION=adodb-compress-bzip2.php adodb-compress-gzip.php \
 	old/adodb-cryptsession.php old/adodb-session-clob.php \
 	old/adodb-session.php old/crypt.inc.php
 
+XSL=	convert-0.1-0.2.xsl convert-0.2-0.1.xsl
+
 TESTS=	benchmark.php client.php test-datadict.php test.php test2.php \
 	test3.php test4.php test5.php test_rs_array.php testcache.php \
 	testdatabases.inc.php testgenid.php testmssql.php testoci8.php \
@@ -82,12 +87,16 @@ TESTS=	benchmark.php client.php test-datadict.php test.php test2.php \
 	time.php tmssql.php xmlschema.xml
 
 do-install:
-	@${MKDIR} ${PREFIX}/${ADODB_DIR} ${PREFIX}/${ADODB_DIR}/datadict \
-		${PREFIX}/${ADODB_DIR}/drivers ${PREFIX}/${ADODB_DIR}/lang \
-		${PREFIX}/${ADODB_DIR}/perf ${PREFIX}/${ADODB_DIR}/session/old
+	@${MKDIR} ${PREFIX}/${ADODB_DIR} ${PREFIX}/${ADODB_DIR}/contrib \
+		${PREFIX}/${ADODB_DIR}/datadict ${PREFIX}/${ADODB_DIR}/drivers \
+		${PREFIX}/${ADODB_DIR}/lang ${PREFIX}/${ADODB_DIR}/perf \
+		${PREFIX}/${ADODB_DIR}/session/old ${PREFIX}/${ADODB_DIR}/xsl
 .for FILE in ${BASE}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_DIR}/${FILE}
 .endfor
+.for FILE in ${CONTRIB}
+	${INSTALL_DATA} ${WRKSRC}/contrib/${FILE} ${PREFIX}/${ADODB_DIR}/contrib/${FILE}
+.endfor
 .for FILE in ${DATADICT}
 	${INSTALL_DATA} ${WRKSRC}/datadict/${FILE} ${PREFIX}/${ADODB_DIR}/datadict/${FILE}
 .endfor
@@ -103,6 +112,9 @@ do-install:
 .for FILE in ${SESSION}
 	${INSTALL_DATA} ${WRKSRC}/session/${FILE} ${PREFIX}/${ADODB_DIR}/session/${FILE}
 .endfor
+.for FILE in ${XSL}
+	${INSTALL_DATA} ${WRKSRC}/xsl/${FILE} ${PREFIX}/${ADODB_DIR}/xsl/${FILE}
+.endfor
 
 .if defined(WITH_TESTS)
 	@${MKDIR} ${PREFIX}/${ADODB_DIR}/tests
diff --git a/databases/adodb/distinfo b/databases/adodb/distinfo
index be120fd24096..1c465b806661 100644
--- a/databases/adodb/distinfo
+++ b/databases/adodb/distinfo
@@ -1 +1,2 @@
-MD5 (adodb411.tgz) = e6e632b06f72b1c43f41951cf19b2384
+MD5 (adodb420.tgz) = 716c9f90938190f2ba98b0a836be4ea3
+SIZE (adodb420.tgz) = 336255
diff --git a/databases/adodb/pkg-plist b/databases/adodb/pkg-plist
index 30b319b32443..4ce2ef827c0d 100644
--- a/databases/adodb/pkg-plist
+++ b/databases/adodb/pkg-plist
@@ -11,14 +11,16 @@
 %%ADODB_DIR%%/adodb-perf.inc.php
 %%ADODB_DIR%%/adodb-php4.inc.php
 %%ADODB_DIR%%/adodb-time.inc.php
+%%ADODB_DIR%%/adodb-time.zip
 %%ADODB_DIR%%/adodb-xmlschema.inc.php
-%%ADODB_DIR%%/adodb-xmlschema.zip
 %%ADODB_DIR%%/adodb.inc.php
 %%ADODB_DIR%%/pivottable.inc.php
 %%ADODB_DIR%%/rsfilter.inc.php
 %%ADODB_DIR%%/server.php
 %%ADODB_DIR%%/toexport.inc.php
 %%ADODB_DIR%%/tohtml.inc.php
+%%ADODB_DIR%%/xmlschema.dtd
+%%ADODB_DIR%%/contrib/toxmlrpc.inc.php
 %%ADODB_DIR%%/datadict/datadict-access.inc.php
 %%ADODB_DIR%%/datadict/datadict-db2.inc.php
 %%ADODB_DIR%%/datadict/datadict-generic.inc.php
@@ -96,6 +98,8 @@
 %%ADODB_DIR%%/session/old/adodb-session-clob.php
 %%ADODB_DIR%%/session/old/adodb-session.php
 %%ADODB_DIR%%/session/old/crypt.inc.php
+%%ADODB_DIR%%/xsl/convert-0.1-0.2.xsl
+%%ADODB_DIR%%/xsl/convert-0.2-0.1.xsl
 %%TESTS%%%%ADODB_DIR%%/tests/benchmark.php
 %%TESTS%%%%ADODB_DIR%%/tests/client.php
 %%TESTS%%%%ADODB_DIR%%/tests/test-datadict.php
@@ -128,16 +132,16 @@
 %%PORTDOCS%%%%DOCSDIR%%/tips_portable_sql.htm
 %%PORTDOCS%%%%DOCSDIR%%/tute.htm
 %%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb.gif
-%%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb.png
 %%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb2.gif
-%%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb2.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/cute_icons_for_site
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%ADODB_DIR%%/contrib
 @dirrm %%ADODB_DIR%%/datadict
 @dirrm %%ADODB_DIR%%/drivers
 @dirrm %%ADODB_DIR%%/lang
 @dirrm %%ADODB_DIR%%/perf
 @dirrm %%ADODB_DIR%%/session/old
 @dirrm %%ADODB_DIR%%/session
+@dirrm %%ADODB_DIR%%/xsl
 %%TESTS%%@dirrm %%ADODB_DIR%%/tests
 @dirrm %%ADODB_DIR%%