3 files changed, 30 insertions, 16 deletions

diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index a674fd509910..8b2f66db214d 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	adodb
-PORTVERSION=	1.20
-PORTREVISION=	2
+PORTVERSION=	1.50
 CATEGORIES=	databases www
 MASTER_SITES=	http://phplens.com/lens/dl/
-DISTNAME=	${PORTNAME}120
+DISTNAME=	${PORTNAME}150
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	abgoeree@wish.net
@@ -28,18 +27,22 @@ PLIST_SUB=	ADODB_DIR=${ADODB_DIR} \
 DOCS=	readme.htm tute.htm readme.txt
 LIBS=	adodb-access.inc.php adodb-ado.inc.php adodb-ado_access.inc.php \
 	adodb-ado_mssql.inc.php adodb-csv.inc.php adodb-db2.inc.php \
+	adodb-errorhandler.inc.php adodb-errorpear.inc.php \
 	adodb-fbsql.inc.php adodb-ibase.inc.php adodb-mssql.inc.php \
 	adodb-mysql.inc.php adodb-mysqlt.inc.php adodb-oci8.inc.php \
-	adodb-odbc.inc.php  adodb-odbc_mssql.inc.php adodb-oracle.inc.php \
-	adodb-postgres.inc.php adodb-postgres7.inc.php adodb-sybase.inc.php \
-	adodb.inc.php adodb-vfp.inc.php tohtml.inc.php
-SAMPLES=server.php adodb-session.php
-TESTS=	benchmark.php client.php test.php test2.php test3.php \
-	testcache.php testdatabases.inc.php
+	adodb-odbc.inc.php adodb-odbc_mssql.inc.php adodb-odbc_oracle.inc.php \
+	adodb-oracle.inc.php adodb-pear.inc.php adodb-postgres.inc.php \
+	adodb-postgres7.inc.php adodb-proxy.inc.php adodb-sybase.inc.php \
+	adodb.inc.php adodb-vfp.inc.php crypt.inc.php tohtml.inc.php
+SAMPLES=adodb-cryptsession.php adodb-session.php server.php
+TESTS=	benchmark.php client.php test.php test2.php test3.php test4.php \
+	test5.php testcache.php testdatabases.inc.php testoci8.php \
+	testpear.php testsessions.php
 
 post-patch:
 .for FILE in adodb-session.php benchmark.php client.php server.php test.php \
-	test2.php test3.php testcache.php
+	test2.php test3.php test4.php test5.php testcache.php testoci8.php \
+	testpear.php testsessions.php
 	${PERL} -pi -e "s#(\./)?(adodb(-session)?|tohtml)+(\.inc)?\.php#${PREFIX}/${ADODB_DIR}/\2\4\.php#" ${WRKSRC}/${FILE}
 .endfor
 
diff --git a/databases/adodb/distinfo b/databases/adodb/distinfo
index fa186f1acfc1..e1514873180f 100644
--- a/databases/adodb/distinfo
+++ b/databases/adodb/distinfo
@@ -1 +1 @@
-MD5 (adodb120.tgz) = 49d98f1b13203f93b3040d69592a8787
+MD5 (adodb150.tgz) = 31bdf9382eb0315fcc68ae78ff057586
diff --git a/databases/adodb/pkg-plist b/databases/adodb/pkg-plist
index 675caf7b5953..41b99ed2e108 100644
--- a/databases/adodb/pkg-plist
+++ b/databases/adodb/pkg-plist
@@ -2,8 +2,11 @@
 %%ADODB_DIR%%/adodb-ado.inc.php
 %%ADODB_DIR%%/adodb-ado_access.inc.php
 %%ADODB_DIR%%/adodb-ado_mssql.inc.php
+%%ADODB_DIR%%/adodb-cryptsession.php.sample
 %%ADODB_DIR%%/adodb-csv.inc.php
 %%ADODB_DIR%%/adodb-db2.inc.php
+%%ADODB_DIR%%/adodb-errorhandler.inc.php
+%%ADODB_DIR%%/adodb-errorpear.inc.php
 %%ADODB_DIR%%/adodb-fbsql.inc.php
 %%ADODB_DIR%%/adodb-ibase.inc.php
 %%ADODB_DIR%%/adodb-mssql.inc.php
@@ -12,13 +15,17 @@
 %%ADODB_DIR%%/adodb-oci8.inc.php
 %%ADODB_DIR%%/adodb-odbc.inc.php
 %%ADODB_DIR%%/adodb-odbc_mssql.inc.php
+%%ADODB_DIR%%/adodb-odbc_oracle.inc.php
 %%ADODB_DIR%%/adodb-oracle.inc.php
+%%ADODB_DIR%%/adodb-pear.inc.php
 %%ADODB_DIR%%/adodb-postgres.inc.php
 %%ADODB_DIR%%/adodb-postgres7.inc.php
+%%ADODB_DIR%%/adodb-proxy.inc.php
 %%ADODB_DIR%%/adodb-session.php.sample
 %%ADODB_DIR%%/adodb-sybase.inc.php
 %%ADODB_DIR%%/adodb-vfp.inc.php
 %%ADODB_DIR%%/adodb.inc.php
+%%ADODB_DIR%%/crypt.inc.php
 %%ADODB_DIR%%/server.php.sample
 %%ADODB_DIR%%/tohtml.inc.php
 %%ADODB_TEST%%/benchmark.php
@@ -26,12 +33,16 @@
 %%ADODB_TEST%%/test.php
 %%ADODB_TEST%%/test2.php
 %%ADODB_TEST%%/test3.php
+%%ADODB_TEST%%/test4.php
+%%ADODB_TEST%%/test5.php
 %%ADODB_TEST%%/testcache.php
 %%ADODB_TEST%%/testdatabases.inc.php
-share/doc/adodb/readme.htm
-share/doc/adodb/readme.txt
-share/doc/adodb/tute.htm
-@dirrm share/doc/adodb
+%%ADODB_TEST%%/testoci8.php
+%%ADODB_TEST%%/testpear.php
+%%ADODB_TEST%%/testsessions.php
+%%PORTDOCS%%share/doc/adodb/readme.htm
+%%PORTDOCS%%share/doc/adodb/readme.txt
+%%PORTDOCS%%share/doc/adodb/tute.htm
+%%PORTDOCS%%@dirrm share/doc/adodb
 @dirrm %%ADODB_DIR%%
-@dirrm share/doc/apache/php
 @dirrm %%ADODB_TEST%%