Submitted by: Peter Johnson <freebsd@bilogic.org>

Complete files listed in the adodb's cvs repo.
Add a prompt message for php adjustment after install.

2 files changed, 98 insertions, 3 deletions

diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index ff585c37d72e..e0c56cafc3d7 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	adodb
 PORTVERSION=	3.60
+PORTREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	http://phplens.com/lens/dl/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
@@ -24,14 +25,35 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	YES
 
 ADODB_DIR=	www/data.default/php/adodb
+ADODB_DATADICT=	${ADODB_DIR}/datadict
 ADODB_DRIVERS=	${ADODB_DIR}/drivers
+ADODB_LANG=	${ADODB_DIR}/lang
 ADODB_TESTS=	${ADODB_DIR}/tests
 PLIST_SUB=	ADODB_DIR=${ADODB_DIR} \
+		ADODB_DATADICT=${ADODB_DATADICT} \
 		ADODB_DRIVERS=${ADODB_DRIVERS} \
+		ADODB_LANG=${ADODB_LANG} \
 		ADODB_TESTS=${ADODB_TESTS} \
 		DOCSDIR=share/doc/adodb
 
-DOCS=		readme.htm tute.htm readme.txt
+DATADICT=	datadict/datadict-access.inc.php \
+		datadict/datadict-db2.inc.php \
+		datadict/datadict-generic.inc.php \
+		datadict/datadict-ibase.inc.php \
+		datadict/datadict-informix.inc.php \
+		datadict/datadict-mssql.inc.php \
+		datadict/datadict-mysql.inc.php \
+		datadict/datadict-oci8.inc.php \
+		datadict/datadict-postgres.inc.php
+
+DOCS=		adodb-xmlschema.zip \
+		docs-adodb.htm \
+		docs-datadict.htm \
+		docs-session.htm \
+		readme.htm \
+		readme.txt \
+		tips_portable_sql.htm \
+		tute.htm
 
 DRIVERS= 	drivers/adodb-access.inc.php \
 		drivers/adodb-ado.inc.php \
@@ -44,16 +66,20 @@ DRIVERS= 	drivers/adodb-access.inc.php \
 		drivers/adodb-firebird.inc.php \
 		drivers/adodb-ibase.inc.php \
 		drivers/adodb-informix.inc.php \
+		drivers/adodb-informix72.inc.php \
 		drivers/adodb-mssql.inc.php \
+		drivers/adodb-mssqlpo.inc.php \
 		drivers/adodb-mysql.inc.php \
 		drivers/adodb-mysqlt.inc.php \
 		drivers/adodb-oci8.inc.php \
+		drivers/adodb-oci805.inc.php \
 		drivers/adodb-oci8po.inc.php \
 		drivers/adodb-odbc.inc.php \
 		drivers/adodb-odbc_mssql.inc.php \
 		drivers/adodb-odbc_oracle.inc.php \
 		drivers/adodb-oracle.inc.php \
 		drivers/adodb-postgres.inc.php \
+		drivers/adodb-postgres64.inc.php \
 		drivers/adodb-postgres7.inc.php \
 		drivers/adodb-proxy.inc.php \
 		drivers/adodb-sqlanywhere.inc.php \
@@ -61,26 +87,38 @@ DRIVERS= 	drivers/adodb-access.inc.php \
 		drivers/adodb-vfp.inc.php \
 
 INCLUDES=	adodb-csvlib.inc.php \
+		adodb-datadict.inc.php \
+		adodb-error.inc.php \
 		adodb-errorhandler.inc.php \
 		adodb-errorpear.inc.php \
-		adodb.inc.php \
 		adodb-lib.inc.php \
+		adodb-pager.inc.php \
 		adodb-pear.inc.php \
 		adodb-time.inc.php \
+		adodb-xmlschema.inc.php \
+		adodb.inc.php \
 		crypt.inc.php \
+		pivottable.inc.php \
+		rsfilter.inc.php \
+		toexport.inc.php \
 		tohtml.inc.php
 
+LANG=		lang/adodb-en.inc.php \
+		lang/adodb-fr.inc.php
+
 PICS=		cute_icons_for_site/adodb.gif \
 		cute_icons_for_site/adodb.png \
 		cute_icons_for_site/adodb2.gif \
 		cute_icons_for_site/adodb2.png
 
 SAMPLES=	adodb-cryptsession.php \
+		adodb-session-clob.php \
 		adodb-session.php \
 		server.php
 
 TESTS=		tests/benchmark.php \
 		tests/client.php \
+		tests/test-datadict.php \
 		tests/test.php \
 		tests/test2.php \
 		tests/test3.php \
@@ -88,20 +126,33 @@ TESTS=		tests/benchmark.php \
 		tests/test5.php \
 		tests/testcache.php \
 		tests/testdatabases.inc.php \
+		tests/testgenid.php \
+		tests/testmssql.php \
 		tests/testoci8.php \
+		tests/testoci8cursor.php \
 		tests/testpaging.php \
 		tests/testpear.php \
-		tests/testsessions.php
+		tests/testsessions.php \
+		tests/time.php \
+		tests/tmssql.php
 
 do-install:
+	@${MKDIR} ${PREFIX}/${ADODB_DATADICT}
 	@${MKDIR} ${PREFIX}/${ADODB_DRIVERS}
+	@${MKDIR} ${PREFIX}/${ADODB_LANG}
 	@${MKDIR} ${PREFIX}/${ADODB_TESTS}
+.for FILE in ${DATADICT}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_DATADICT}
+.endfor
 .for FILE in ${DRIVERS}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_DRIVERS}
 .endfor
 .for FILE in ${INCLUDES}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_DIR}/${FILE}
 .endfor
+.for FILE in ${LANG}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_LANG}
+.endfor
 .for FILE in ${PICS}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_DIR}
 .endfor
@@ -129,5 +180,6 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/databases/adodb/pkg-plist b/databases/adodb/pkg-plist
index dd4f9463cc16..5bf8c6a08cc4 100644
--- a/databases/adodb/pkg-plist
+++ b/databases/adodb/pkg-plist
@@ -1,8 +1,10 @@
 @unexec if cmp -s %D/%%ADODB_DIR%%/adodb-cryptsession.php %D/%%ADODB_DIR%%/adodb-cryptsession.php.sample; then rm -f %D/%%ADODB_DIR%%/adodb-cryptsession.php; fi
+@unexec if cmp -s %D/%%ADODB_DIR%%/adodb-session-clob.php %D/%%ADODB_DIR%%/adodb-session-clob.php.sample; then rm -f %D/%%ADODB_DIR%%/adodb-session-clob.php; fi
 @unexec if cmp -s %D/%%ADODB_DIR%%/adodb-session.php %D/%%ADODB_DIR%%/adodb-session.php.sample; then rm -f %D/%%ADODB_DIR%%/adodb-session.php; fi
 @unexec if cmp -s %D/%%ADODB_DIR%%/server.php %D/%%ADODB_DIR%%/server.php.sample; then rm -f %D/%%ADODB_DIR%%/server.php; fi
 @unexec if cmp -s %D/%%ADODB_TESTS%%/benchmark.php %D/%%ADODB_TESTS%%/benchmark.php.sample; then rm -f %D/%%ADODB_TESTS%%/benchmark.php; fi
 @unexec if cmp -s %D/%%ADODB_TESTS%%/client.php %D/%%ADODB_TESTS%%/client.php.sample; then rm -f %D/%%ADODB_TESTS%%/client.php; fi
+@unexec if cmp -s %D/%%ADODB_TESTS%%/test-datadict.php %D/%%ADODB_TESTS%%/test-datadict.php.sample; then rm -f %D/%%ADODB_TESTS%%/test-datadict.php; fi
 @unexec if cmp -s %D/%%ADODB_TESTS%%/test.php %D/%%ADODB_TESTS%%/test.php.sample; then rm -f %D/%%ADODB_TESTS%%/test.php; fi
 @unexec if cmp -s %D/%%ADODB_TESTS%%/test2.php %D/%%ADODB_TESTS%%/test2.php.sample; then rm -f %D/%%ADODB_TESTS%%/test2.php; fi
 @unexec if cmp -s %D/%%ADODB_TESTS%%/test3.php %D/%%ADODB_TESTS%%/test3.php.sample; then rm -f %D/%%ADODB_TESTS%%/test3.php; fi
@@ -10,26 +12,48 @@
 @unexec if cmp -s %D/%%ADODB_TESTS%%/test5.php %D/%%ADODB_TESTS%%/test5.php.sample; then rm -f %D/%%ADODB_TESTS%%/test5.php; fi
 @unexec if cmp -s %D/%%ADODB_TESTS%%/testcache.php %D/%%ADODB_TESTS%%/testcache.php.sample; then rm -f %D/%%ADODB_TESTS%%/testcache.php; fi
 @unexec if cmp -s %D/%%ADODB_TESTS%%/testdatabases.inc.php %D/%%ADODB_TESTS%%/testdatabases.inc.php.sample; then rm -f %D/%%ADODB_TESTS%%/testdatabases.inc.php; fi
+@unexec if cmp -s %D/%%ADODB_TESTS%%/testgenid.php %D/%%ADODB_TESTS%%/testgenid.php.sample; then rm -f %D/%%ADODB_TESTS%%/testgenid.php; fi
+@unexec if cmp -s %D/%%ADODB_TESTS%%/testmssql.php %D/%%ADODB_TESTS%%/testmssql.php.sample; then rm -f %D/%%ADODB_TESTS%%/testmssql.php; fi
 @unexec if cmp -s %D/%%ADODB_TESTS%%/testoci8.php %D/%%ADODB_TESTS%%/testoci8.php.sample; then rm -f %D/%%ADODB_TESTS%%/testoci8.php; fi
+@unexec if cmp -s %D/%%ADODB_TESTS%%/testoci8cursor.php %D/%%ADODB_TESTS%%/testoci8cursor.php.sample; then rm -f %D/%%ADODB_TESTS%%/testoci8cursor.php; fi
 @unexec if cmp -s %D/%%ADODB_TESTS%%/testpaging.php %D/%%ADODB_TESTS%%/testpaging.php.sample; then rm -f %D/%%ADODB_TESTS%%/testpaging.php; fi
 @unexec if cmp -s %D/%%ADODB_TESTS%%/testpear.php %D/%%ADODB_TESTS%%/testpear.php.sample; then rm -f %D/%%ADODB_TESTS%%/testpear.php; fi
 @unexec if cmp -s %D/%%ADODB_TESTS%%/testsessions.php %D/%%ADODB_TESTS%%/testsessions.php.sample; then rm -f %D/%%ADODB_TESTS%%/testsessions.php; fi
+@unexec if cmp -s %D/%%ADODB_TESTS%%/time.php %D/%%ADODB_TESTS%%/time.php.sample; then rm -f %D/%%ADODB_TESTS%%/time.php; fi
+@unexec if cmp -s %D/%%ADODB_TESTS%%/tmssql.php %D/%%ADODB_TESTS%%/tmssql.php.sample; then rm -f %D/%%ADODB_TESTS%%/tmssql.php; fi
 %%ADODB_DIR%%/adodb-cryptsession.php.sample
 %%ADODB_DIR%%/adodb-csvlib.inc.php
+%%ADODB_DIR%%/adodb-datadict.inc.php
+%%ADODB_DIR%%/adodb-error.inc.php
 %%ADODB_DIR%%/adodb-errorhandler.inc.php
 %%ADODB_DIR%%/adodb-errorpear.inc.php
 %%ADODB_DIR%%/adodb-lib.inc.php
+%%ADODB_DIR%%/adodb-pager.inc.php
 %%ADODB_DIR%%/adodb-pear.inc.php
+%%ADODB_DIR%%/adodb-session-clob.php.sample
 %%ADODB_DIR%%/adodb-session.php.sample
 %%ADODB_DIR%%/adodb-time.inc.php
+%%ADODB_DIR%%/adodb-xmlschema.inc.php
 %%ADODB_DIR%%/adodb.gif
 %%ADODB_DIR%%/adodb.inc.php
 %%ADODB_DIR%%/adodb.png
 %%ADODB_DIR%%/adodb2.gif
 %%ADODB_DIR%%/adodb2.png
 %%ADODB_DIR%%/crypt.inc.php
+%%ADODB_DIR%%/pivottable.inc.php
+%%ADODB_DIR%%/rsfilter.inc.php
 %%ADODB_DIR%%/server.php.sample
+%%ADODB_DIR%%/toexport.inc.php
 %%ADODB_DIR%%/tohtml.inc.php
+%%ADODB_DATADICT%%/datadict-access.inc.php
+%%ADODB_DATADICT%%/datadict-db2.inc.php
+%%ADODB_DATADICT%%/datadict-generic.inc.php
+%%ADODB_DATADICT%%/datadict-ibase.inc.php
+%%ADODB_DATADICT%%/datadict-informix.inc.php
+%%ADODB_DATADICT%%/datadict-mssql.inc.php
+%%ADODB_DATADICT%%/datadict-mysql.inc.php
+%%ADODB_DATADICT%%/datadict-oci8.inc.php
+%%ADODB_DATADICT%%/datadict-postgres.inc.php
 %%ADODB_DRIVERS%%/adodb-access.inc.php
 %%ADODB_DRIVERS%%/adodb-ado.inc.php
 %%ADODB_DRIVERS%%/adodb-ado_access.inc.php
@@ -41,23 +65,30 @@
 %%ADODB_DRIVERS%%/adodb-firebird.inc.php
 %%ADODB_DRIVERS%%/adodb-ibase.inc.php
 %%ADODB_DRIVERS%%/adodb-informix.inc.php
+%%ADODB_DRIVERS%%/adodb-informix72.inc.php
 %%ADODB_DRIVERS%%/adodb-mssql.inc.php
+%%ADODB_DRIVERS%%/adodb-mssqlpo.inc.php
 %%ADODB_DRIVERS%%/adodb-mysql.inc.php
 %%ADODB_DRIVERS%%/adodb-mysqlt.inc.php
 %%ADODB_DRIVERS%%/adodb-oci8.inc.php
+%%ADODB_DRIVERS%%/adodb-oci805.inc.php
 %%ADODB_DRIVERS%%/adodb-oci8po.inc.php
 %%ADODB_DRIVERS%%/adodb-odbc.inc.php
 %%ADODB_DRIVERS%%/adodb-odbc_mssql.inc.php
 %%ADODB_DRIVERS%%/adodb-odbc_oracle.inc.php
 %%ADODB_DRIVERS%%/adodb-oracle.inc.php
 %%ADODB_DRIVERS%%/adodb-postgres.inc.php
+%%ADODB_DRIVERS%%/adodb-postgres64.inc.php
 %%ADODB_DRIVERS%%/adodb-postgres7.inc.php
 %%ADODB_DRIVERS%%/adodb-proxy.inc.php
 %%ADODB_DRIVERS%%/adodb-sqlanywhere.inc.php
 %%ADODB_DRIVERS%%/adodb-sybase.inc.php
 %%ADODB_DRIVERS%%/adodb-vfp.inc.php
+%%ADODB_LANG%%/adodb-en.inc.php
+%%ADODB_LANG%%/adodb-fr.inc.php
 %%ADODB_TESTS%%/benchmark.php.sample
 %%ADODB_TESTS%%/client.php.sample
+%%ADODB_TESTS%%/test-datadict.php.sample
 %%ADODB_TESTS%%/test.php.sample
 %%ADODB_TESTS%%/test2.php.sample
 %%ADODB_TESTS%%/test3.php.sample
@@ -65,15 +96,27 @@
 %%ADODB_TESTS%%/test5.php.sample
 %%ADODB_TESTS%%/testcache.php.sample
 %%ADODB_TESTS%%/testdatabases.inc.php.sample
+%%ADODB_TESTS%%/testgenid.php.sample
+%%ADODB_TESTS%%/testmssql.php.sample
 %%ADODB_TESTS%%/testoci8.php.sample
+%%ADODB_TESTS%%/testoci8cursor.php.sample
 %%ADODB_TESTS%%/testpaging.php.sample
 %%ADODB_TESTS%%/testpear.php.sample
 %%ADODB_TESTS%%/testsessions.php.sample
+%%ADODB_TESTS%%/time.php.sample
+%%ADODB_TESTS%%/tmssql.php.sample
+%%PORTDOCS%%%%DOCSDIR%%/adodb-xmlschema.zip
+%%PORTDOCS%%%%DOCSDIR%%/docs-adodb.htm
+%%PORTDOCS%%%%DOCSDIR%%/docs-datadict.htm
+%%PORTDOCS%%%%DOCSDIR%%/docs-session.htm
 %%PORTDOCS%%%%DOCSDIR%%/readme.htm
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/tips_portable_sql.htm
 %%PORTDOCS%%%%DOCSDIR%%/tute.htm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%ADODB_DATADICT%%
 @dirrm %%ADODB_DRIVERS%%
+@dirrm %%ADODB_LANG%%
 @dirrm %%ADODB_TESTS%%
 @dirrm %%ADODB_DIR%%
 @dirrm www/data.default/php