- Upgrade to 4.61;

- Add an option to install tests.

PR:		78129
Submitted by:	Martin Matuska (maintainer)

3 files changed, 41 insertions, 122 deletions

diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index 8e15f45b1163..c53e00108a82 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	adodb
-PORTVERSION=	4.54
+PORTVERSION=	4.61
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	adodb
@@ -21,138 +21,48 @@ USE_PHP=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	YES
 
-ADODB_DIR=	share/adodb
+ADODB_DIR?=	share/adodb
 PLIST_SUB=	ADODB_DIR=${ADODB_DIR}
 
-.if defined(WITH_TESTS)
+ADODB_SUBDIRS=	contrib datadict drivers lang pear perf session xsl
+
+.if !defined (WITHOUT_ADODB_OPTIONS)
+OPTIONS=	TESTS "Install tests" off
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if defined (WITH_TESTS)
 PLIST_SUB+=	TESTS=
 .else
 PLIST_SUB+=	TESTS="@comment "
 .endif
 
-DOCS=	docs-adodb.htm docs-datadict.htm docs-perf.htm docs-session.htm \
-	old-changelog.htm readme.htm tips_portable_sql.htm \
-	tute.htm
-
-TXTDOCS=license.txt readme.txt
-
-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-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-firebird.inc.php \
-	datadict-generic.inc.php datadict-ibase.inc.php datadict-informix.inc.php \
-	datadict-mssql.inc.php datadict-mysql.inc.php datadict-oci8.inc.php \
-	datadict-postgres.inc.php datadict-sybase.inc.php
-
-DRIVERS=adodb-access.inc.php adodb-ado.inc.php adodb-ado_access.inc.php \
-	adodb-ado_mssql.inc.php adodb-borland_ibase.inc.php adodb-csv.inc.php \
-	adodb-db2.inc.php adodb-fbsql.inc.php adodb-firebird.inc.php \
-	adodb-ibase.inc.php adodb-informix.inc.php adodb-informix72.inc.php \
-	adodb-ldap.inc.php adodb-mssql.inc.php adodb-mssqlpo.inc.php \
-	adodb-mysql.inc.php adodb-mysqli.inc.php adodb-mysqlt.inc.php \
-	adodb-netezza.inc.php adodb-oci8.inc.php \
-	adodb-oci805.inc.php adodb-oci8po.inc.php adodb-odbc.inc.php \
-	adodb-odbc_mssql.inc.php \
-	adodb-odbc_oracle.inc.php adodb-oracle.inc.php \
-	adodb-odbtp.inc.php adodb-odbtp_unicode.inc.php adodb-pdo.inc.php \
-	adodb-postgres.inc.php adodb-postgres64.inc.php \
-	adodb-postgres7.inc.php \
-	adodb-proxy.inc.php adodb-sapdb.inc.php adodb-sqlanywhere.inc.php \
-	adodb-sqlite.inc.php adodb-sqlitepo.inc.php adodb-sybase.inc.php \
-	adodb-vfp.inc.php adodb-odbtp.inc.php
-
-LANG=	adodb-ar.inc.php adodb-bg.inc.php adodb-bgutf8.inc.php \
-	adodb-ca.inc.php adodb-cn.inc.php adodb-cz.inc.php \
-	adodb-de.inc.php adodb-en.inc.php adodb-es.inc.php \
-	adodb-fr.inc.php adodb-it.inc.php adodb-nl.inc.php \
-	adodb-pl.inc.php adodb-pt-br.inc.php adodb-ro.inc.php \
-	adodb-ru1251.inc.php adodb-sv.inc.php
-
-PEAR=	readme.Auth.txt Auth/Container/ADOdb.php
-
-PERF=	perf-db2.inc.php perf-informix.inc.php perf-mssql.inc.php \
-	perf-mysql.inc.php perf-oci8.inc.php perf-postgres.inc.php
-
-SESSION=adodb-compress-bzip2.php adodb-compress-gzip.php \
-	adodb-cryptsession.php adodb-encrypt-mcrypt.php adodb-encrypt-md5.php \
-	adodb-encrypt-secret.php adodb-sess.txt adodb-session-clob.php \
-	adodb-session.php adodb-sessions.mysql.sql crypt.inc.php \
-	adodb-sessions.oracle.clob.sql adodb-sessions.oracle.sql \
-	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 remove-0.2.xsl
-
-TESTS=	benchmark.php client.php pdo.php test-datadict.php test-perf.php \
-	test-pgblob.php test-php5.php test-xmlschema.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 \
-	testoci8cursor.php testpaging.php testpear.php testsessions.php \
-	time.php tmssql.php xmlschema.xml
-
 do-install:
-	@${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 \
-		${PREFIX}/${ADODB_DIR}/pear/Auth/Container
-.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
-.for FILE in ${DRIVERS}
-	${INSTALL_DATA} ${WRKSRC}/drivers/${FILE} ${PREFIX}/${ADODB_DIR}/drivers/${FILE}
-.endfor
-.for FILE in ${LANG}
-	${INSTALL_DATA} ${WRKSRC}/lang/${FILE} ${PREFIX}/${ADODB_DIR}/lang/${FILE}
-.endfor
-.for FILE in ${PEAR}
-	${INSTALL_DATA} ${WRKSRC}/pear/${FILE} ${PREFIX}/${ADODB_DIR}/pear/${FILE}
-.endfor
-.for FILE in ${PERF}
-	${INSTALL_DATA} ${WRKSRC}/perf/${FILE} ${PREFIX}/${ADODB_DIR}/perf/${FILE}
-.endfor
-.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}
+	@cd ${WRKSRC}; ${FIND} ${ADODB_SUBDIRS} -type d \
+		-exec ${MKDIR} ${PREFIX}/${ADODB_DIR}/{} \;
+	@cd ${WRKSRC}; ${FIND} . -depth 1 -type f \( -name '*.php' -or -name '*.dtd' -or -name '*.zip' \) \
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${PREFIX}/${ADODB_DIR}/{} \;
+	@cd ${WRKSRC}; ${FIND} ${ADODB_SUBDIRS} -type f \
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${PREFIX}/${ADODB_DIR}/{} \;
+
+.if defined (WITH_TESTS)
 	@${MKDIR} ${PREFIX}/${ADODB_DIR}/tests
-.for FILE in ${TESTS}
-	${INSTALL_DATA} ${WRKSRC}/tests/${FILE} ${PREFIX}/${ADODB_DIR}/tests
-.endfor
+	@cd ${WRKSRC}; ${FIND} tests -type f \
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${PREFIX}/${ADODB_DIR}/{} \;
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if !defined (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR} ${DOCSDIR}/cute_icons_for_site
-.for FILE in ${DOCS}
-	${INSTALL_MAN} ${WRKSRC}/docs/${FILE} ${DOCSDIR}/${FILE}
-.endfor
-.for FILE in ${TXTDOCS}
-	${INSTALL_MAN} ${WRKSRC}/${FILE} ${DOCSDIR}/${FILE}
-.endfor
-.for FILE in ${ICONS}
-	${INSTALL_MAN} ${WRKSRC}/cute_icons_for_site/${FILE} ${DOCSDIR}/cute_icons_for_site/${FILE}
-.endfor
+	@cd ${WRKSRC}; ${FIND} . -depth 1 -type f -name '*.txt' \
+		-exec ${INSTALL_MAN} ${WRKSRC}/{} ${DOCSDIR}/{} \;
+	@cd ${WRKSRC}/docs; ${FIND} . -type f \
+		-exec ${INSTALL_MAN} ${WRKSRC}/docs/{} ${DOCSDIR}/{} \;
+	@cd ${WRKSRC}; ${FIND} cute_icons_for_site -type f \
+		-exec ${INSTALL_MAN} ${WRKSRC}/{} ${DOCSDIR}/{} \;
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/adodb/distinfo b/databases/adodb/distinfo
index 3c618c067a7c..044bbcc5109a 100644
--- a/databases/adodb/distinfo
+++ b/databases/adodb/distinfo
@@ -1,2 +1,2 @@
-MD5 (adodb454.tgz) = 3ba7c4385a6db2353659e17b565d2d8a
-SIZE (adodb454.tgz) = 398608
+MD5 (adodb461.tgz) = 8c5f4adf6d7cb2f96d84a99eabcd061f
+SIZE (adodb461.tgz) = 409602
diff --git a/databases/adodb/pkg-plist b/databases/adodb/pkg-plist
index 1231e4943cf1..ca5199fec93f 100644
--- a/databases/adodb/pkg-plist
+++ b/databases/adodb/pkg-plist
@@ -31,9 +31,11 @@
 %%ADODB_DIR%%/datadict/datadict-mysql.inc.php
 %%ADODB_DIR%%/datadict/datadict-oci8.inc.php
 %%ADODB_DIR%%/datadict/datadict-postgres.inc.php
+%%ADODB_DIR%%/datadict/datadict-sapdb.inc.php
 %%ADODB_DIR%%/datadict/datadict-sybase.inc.php
 %%ADODB_DIR%%/drivers/adodb-access.inc.php
 %%ADODB_DIR%%/drivers/adodb-ado.inc.php
+%%ADODB_DIR%%/drivers/adodb-ado5.inc.php
 %%ADODB_DIR%%/drivers/adodb-ado_access.inc.php
 %%ADODB_DIR%%/drivers/adodb-ado_mssql.inc.php
 %%ADODB_DIR%%/drivers/adodb-borland_ibase.inc.php
@@ -64,12 +66,15 @@
 %%ADODB_DIR%%/drivers/adodb-postgres.inc.php
 %%ADODB_DIR%%/drivers/adodb-postgres64.inc.php
 %%ADODB_DIR%%/drivers/adodb-postgres7.inc.php
+%%ADODB_DIR%%/drivers/adodb-postgres8.inc.php
 %%ADODB_DIR%%/drivers/adodb-proxy.inc.php
 %%ADODB_DIR%%/drivers/adodb-sapdb.inc.php
 %%ADODB_DIR%%/drivers/adodb-sqlanywhere.inc.php
 %%ADODB_DIR%%/drivers/adodb-sqlite.inc.php
+%%ADODB_DIR%%/drivers/adodb-sqlite.inc.php.bak
 %%ADODB_DIR%%/drivers/adodb-sqlitepo.inc.php
 %%ADODB_DIR%%/drivers/adodb-sybase.inc.php
+%%ADODB_DIR%%/drivers/adodb-sybase_ase.inc.php
 %%ADODB_DIR%%/drivers/adodb-vfp.inc.php
 %%ADODB_DIR%%/lang/adodb-ar.inc.php
 %%ADODB_DIR%%/lang/adodb-bg.inc.php
@@ -77,10 +82,13 @@
 %%ADODB_DIR%%/lang/adodb-ca.inc.php
 %%ADODB_DIR%%/lang/adodb-cn.inc.php
 %%ADODB_DIR%%/lang/adodb-cz.inc.php
+%%ADODB_DIR%%/lang/adodb-da.inc.php
 %%ADODB_DIR%%/lang/adodb-de.inc.php
 %%ADODB_DIR%%/lang/adodb-en.inc.php
 %%ADODB_DIR%%/lang/adodb-es.inc.php
+%%ADODB_DIR%%/lang/adodb-esperanto.inc.php
 %%ADODB_DIR%%/lang/adodb-fr.inc.php
+%%ADODB_DIR%%/lang/adodb-hu.inc.php
 %%ADODB_DIR%%/lang/adodb-it.inc.php
 %%ADODB_DIR%%/lang/adodb-nl.inc.php
 %%ADODB_DIR%%/lang/adodb-pl.inc.php
@@ -144,6 +152,7 @@
 %%TESTS%%%%ADODB_DIR%%/tests/xmlschema.xml
 %%PORTDOCS%%%%DOCSDIR%%/docs-adodb.htm
 %%PORTDOCS%%%%DOCSDIR%%/docs-datadict.htm
+%%PORTDOCS%%%%DOCSDIR%%/docs-oracle.htm
 %%PORTDOCS%%%%DOCSDIR%%/docs-perf.htm
 %%PORTDOCS%%%%DOCSDIR%%/docs-session.htm
 %%PORTDOCS%%%%DOCSDIR%%/license.txt