- Update to 4.96a

- Update pkg-descr
- Add CONFLICTS for future databases/adodb5

PR:	ports/117964

4 files changed, 17 insertions, 18 deletions

diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index 130c9781dfb6..a53a5b2fdd66 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	adodb
-PORTVERSION=	4.93a
+PORTVERSION=	4.96a
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	adodb
@@ -18,6 +18,8 @@ COMMENT=	Database library for PHP
 
 USE_PHP=	pcre
 
+CONFLICTS=	adodb-5.*
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	YES
 
@@ -26,9 +28,7 @@ PLIST_SUB=	ADODB_DIR=${ADODB_DIR}
 
 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>
 
diff --git a/databases/adodb/distinfo b/databases/adodb/distinfo
index 8927bbc4a57c..5253dbdee193 100644
--- a/databases/adodb/distinfo
+++ b/databases/adodb/distinfo
@@ -1,3 +1,3 @@
-MD5 (adodb493a.tgz) = 8b509a7696c2b4d9df282e8be23a1e3b
-SHA256 (adodb493a.tgz) = dd3424601e74ccd355c835d710effdf0c92d6c64f2c2b03ced986e6ebdb91300
-SIZE (adodb493a.tgz) = 469285
+MD5 (adodb496a.tgz) = 9aebb0e04d8e67493c0e70fc75c9fc43
+SHA256 (adodb496a.tgz) = 73f793d55d80c3f0fdc32df88eb88c69a3449994b2e3946a9a1226b56d7d0368
+SIZE (adodb496a.tgz) = 476835
diff --git a/databases/adodb/pkg-descr b/databases/adodb/pkg-descr
index 3ce6e2a30523..4e7e12499a71 100644
--- a/databases/adodb/pkg-descr
+++ b/databases/adodb/pkg-descr
@@ -1,16 +1,14 @@
-From the Introduction:
+ADOdb stands for Active Data Objects Data Base.
 
-PHP is a wonderful language for building dynamic web pages.
-Unfortunately, PHP's database access functions are not standardised.
-Every database extension uses a different and incompatibile API.
-This creates a need for a database class library to hide the differences
-between the different databases (encapsulate the differences) so we can
-easily switch databases. 
+ADOdb is a database abstraction library for PHP.
 
-ADODB stands for Active Data Objects Data Base.
+The PHP version currently supports an amazing number of databases,
+thanks to the wonderful ADOdb community: 
+MySQL, PostgreSQL, Interbase, Firebird, Informix, Oracle, MS SQL, Foxpro, 
+Access, ADO, Sybase, FrontBase, DB2, SAP DB, SQLite, Netezza, LDAP, and generic 
+ODBC, ODBTP. 
 
-ADODB currently supports:
-	MySQL, PostgreSQL, Interbase, Oracle, MS SQL 7
-	Foxpro, Access, ADO, Sybase, DB2 and generic ODBC.
+The Sybase, Informix, FrontBase and PostgreSQL, Netezza, LDAP, ODBTP drivers 
+are community contributions.
 
 WWW: http://adodb.sourceforge.net
diff --git a/databases/adodb/pkg-plist b/databases/adodb/pkg-plist
index fa06cd407c2d..95c9416ea152 100644
--- a/databases/adodb/pkg-plist
+++ b/databases/adodb/pkg-plist
@@ -51,6 +51,7 @@
 %%ADODB_DIR%%/drivers/adodb-informix72.inc.php
 %%ADODB_DIR%%/drivers/adodb-ldap.inc.php
 %%ADODB_DIR%%/drivers/adodb-mssql.inc.php
+%%ADODB_DIR%%/drivers/adodb-mssql_n.inc.php
 %%ADODB_DIR%%/drivers/adodb-mssqlpo.inc.php
 %%ADODB_DIR%%/drivers/adodb-mysql.inc.php
 %%ADODB_DIR%%/drivers/adodb-mysqli.inc.php
@@ -103,6 +104,7 @@
 %%ADODB_DIR%%/lang/adodb-ro.inc.php
 %%ADODB_DIR%%/lang/adodb-ru1251.inc.php
 %%ADODB_DIR%%/lang/adodb-sv.inc.php
+%%ADODB_DIR%%/lang/adodb_th.inc.php
 %%ADODB_DIR%%/lang/adodb-uk1251.inc.php
 %%ADODB_DIR%%/pear/readme.Auth.txt
 %%ADODB_DIR%%/pear/Auth/Container/ADOdb.php
@@ -144,7 +146,6 @@
 %%TESTS%%%%ADODB_DIR%%/tests/benchmark.php
 %%TESTS%%%%ADODB_DIR%%/tests/client.php
 %%TESTS%%%%ADODB_DIR%%/tests/pdo.php
-%%TESTS%%%%ADODB_DIR%%/tests/rr.htm
 %%TESTS%%%%ADODB_DIR%%/tests/test-active-record.php
 %%TESTS%%%%ADODB_DIR%%/tests/test-active-recs2.php
 %%TESTS%%%%ADODB_DIR%%/tests/test-datadict.php