Update to 4.96a

Works with both php4 and php5.
Postgresql driver's ServerInfo() function now works properly.
Added a new session handler, in adodb-session2.php.
ADODB_ACTIVE_RECORD, added find() method, and new constructor method
ODBC_DB2 driver now works properly
New BindDate() and BindTimeStamp() functions in connection object
New SetTransactionMode()

3 files changed, 46 insertions, 25 deletions

diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index cbd4ac0055f..9cb04a5e36a 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2007/06/10 08:44:24 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/11/25 17:53:23 adrianp Exp $
 #
 
-DISTNAME=	adodb481
-PKGNAME=	adodb-4.81
-PKGREVISION=	1
+DISTNAME=	adodb496a
+PKGNAME=	adodb-4.96a
 CATEGORIES=	databases www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=adodb/}
 EXTRACT_SUFX=	.tgz
@@ -12,11 +11,19 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://adodb.sourceforge.net/
 COMMENT=	Active Data Objects Data Base for php4
 
-DEPENDS+=	php>=4.1.0<5:../../www/php4
+WRKSRC=			${WRKDIR}/adodb
+NO_CONFIGURE=		YES
+NO_BUILD=		YES
 
-WRKSRC=		${WRKDIR}/adodb
-NO_CONFIGURE=	YES
-NO_BUILD=	YES
+.include "../../lang/php/phpversion.mk"
+
+.if ${PHP_PKG_PREFIX} == "php4"
+.include "../../www/php4/buildlink3.mk"
+.endif
+
+.if ${PHP_PKG_PREFIX} == "php5"
+.include "../../lang/php5/buildlink3.mk"
+.endif
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/adodb
@@ -29,22 +36,27 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/xsl
 	${INSTALL_DATA_DIR} ${PREFIX}/share/adodb/session
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/adodb
-	${INSTALL_SCRIPT} ${WRKSRC}/*.php ${PREFIX}/share/adodb
-	${INSTALL_SCRIPT} ${WRKSRC}/*.dtd ${PREFIX}/share/adodb
+
+	${INSTALL_DATA} ${WRKSRC}/*.php ${PREFIX}/share/adodb
+	${INSTALL_DATA} ${WRKSRC}/*.dtd ${PREFIX}/share/adodb
 	${INSTALL_DATA} ${WRKSRC}/cute_icons_for_site/*.gif \
 		${PREFIX}/share/adodb/cute_icons_for_site
-	${INSTALL_SCRIPT} ${WRKSRC}/datadict/*.php \
+	${INSTALL_DATA} ${WRKSRC}/datadict/*.php \
 		${PREFIX}/share/adodb/datadict
-	${INSTALL_SCRIPT} ${WRKSRC}/drivers/*.php ${PREFIX}/share/adodb/drivers
-	${INSTALL_SCRIPT} ${WRKSRC}/lang/*.php ${PREFIX}/share/adodb/lang
-	${INSTALL_SCRIPT} ${WRKSRC}/perf/*.php ${PREFIX}/share/adodb/perf
-	${INSTALL_SCRIPT} ${WRKSRC}/tests/*.php ${PREFIX}/share/adodb/tests
-	${INSTALL_SCRIPT} ${WRKSRC}/tests/*.xml ${PREFIX}/share/adodb/tests
-	${INSTALL_SCRIPT} ${WRKSRC}/session/*.php ${PREFIX}/share/adodb/session
-	${INSTALL_SCRIPT} ${WRKSRC}/session/*.txt ${PREFIX}/share/adodb/session
-	${INSTALL_SCRIPT} ${WRKSRC}/session/*.sql ${PREFIX}/share/adodb/session
-	${INSTALL_SCRIPT} ${WRKSRC}/xsl/*.xsl ${PREFIX}/share/adodb/xsl
+	${INSTALL_DATA} ${WRKSRC}/drivers/*.php ${PREFIX}/share/adodb/drivers
+	${INSTALL_DATA} ${WRKSRC}/lang/*.php ${PREFIX}/share/adodb/lang
+	${INSTALL_DATA} ${WRKSRC}/perf/*.php ${PREFIX}/share/adodb/perf
+	${INSTALL_DATA} ${WRKSRC}/tests/*.php ${PREFIX}/share/adodb/tests
+	${INSTALL_DATA} ${WRKSRC}/tests/*.xml ${PREFIX}/share/adodb/tests
+	${INSTALL_DATA} ${WRKSRC}/session/*.php ${PREFIX}/share/adodb/session
+	${INSTALL_DATA} ${WRKSRC}/session/*.txt ${PREFIX}/share/adodb/session
+	${INSTALL_DATA} ${WRKSRC}/session/*.sql ${PREFIX}/share/adodb/session
+	${INSTALL_DATA} ${WRKSRC}/session/*.xml ${PREFIX}/share/adodb/session
+	${INSTALL_DATA} ${WRKSRC}/xsl/*.xsl ${PREFIX}/share/adodb/xsl
 	${INSTALL_DATA} ${WRKSRC}/docs/*.htm ${PREFIX}/share/doc/adodb
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/adodb
 
+	${FIND} ${PREFIX}/share/adodb -name \*.\* -type f -print | \
+		${XARGS} ${CHMOD} ${SHAREMODE}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/adodb/PLIST b/databases/adodb/PLIST
index 565c6d684c6..067448a17a5 100644
--- a/databases/adodb/PLIST
+++ b/databases/adodb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/03/13 12:18:23 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/11/25 17:53:23 adrianp Exp $
 share/adodb/adodb-active-record.inc.php
 share/adodb/adodb-csvlib.inc.php
 share/adodb/adodb-datadict.inc.php
@@ -8,6 +8,7 @@ share/adodb/adodb-errorpear.inc.php
 share/adodb/adodb-exceptions.inc.php
 share/adodb/adodb-iterator.inc.php
 share/adodb/adodb-lib.inc.php
+share/adodb/adodb-memcache.lib.inc.php
 share/adodb/adodb-pager.inc.php
 share/adodb/adodb-pear.inc.php
 share/adodb/adodb-perf.inc.php
@@ -45,6 +46,7 @@ share/adodb/drivers/adodb-informix.inc.php
 share/adodb/drivers/adodb-informix72.inc.php
 share/adodb/drivers/adodb-ldap.inc.php
 share/adodb/drivers/adodb-mssql.inc.php
+share/adodb/drivers/adodb-mssql_n.inc.php
 share/adodb/drivers/adodb-mssqlpo.inc.php
 share/adodb/drivers/adodb-mysql.inc.php
 share/adodb/drivers/adodb-mysqli.inc.php
@@ -97,6 +99,7 @@ share/adodb/lang/adodb-pt-br.inc.php
 share/adodb/lang/adodb-ro.inc.php
 share/adodb/lang/adodb-ru1251.inc.php
 share/adodb/lang/adodb-sv.inc.php
+share/adodb/lang/adodb_th.inc.php
 share/adodb/lang/adodb-uk1251.inc.php
 share/adodb/perf/perf-db2.inc.php
 share/adodb/perf/perf-informix.inc.php
@@ -110,16 +113,21 @@ share/adodb/server.php
 share/adodb/session/adodb-compress-bzip2.php
 share/adodb/session/adodb-compress-gzip.php
 share/adodb/session/adodb-cryptsession.php
+share/adodb/session/adodb-cryptsession2.php
 share/adodb/session/adodb-encrypt-mcrypt.php
 share/adodb/session/adodb-encrypt-md5.php
 share/adodb/session/adodb-encrypt-secret.php
 share/adodb/session/adodb-encrypt-sha1.php
 share/adodb/session/adodb-sess.txt
 share/adodb/session/adodb-session-clob.php
+share/adodb/session/adodb-session-clob2.php
 share/adodb/session/adodb-session.php
+share/adodb/session/adodb-session2.php
 share/adodb/session/adodb-sessions.mysql.sql
 share/adodb/session/adodb-sessions.oracle.clob.sql
 share/adodb/session/adodb-sessions.oracle.sql
+share/adodb/session/session_schema.xml
+share/adodb/session/session_schema2.xml
 share/adodb/session/crypt.inc.php
 share/adodb/tests/benchmark.php
 share/adodb/tests/client.php
@@ -166,6 +174,7 @@ share/doc/adodb/docs-datadict.htm
 share/doc/adodb/docs-oracle.htm
 share/doc/adodb/docs-perf.htm
 share/doc/adodb/docs-session.htm
+share/doc/adodb/docs-session.old.htm
 share/doc/adodb/license.txt
 share/doc/adodb/old-changelog.htm
 share/doc/adodb/readme.htm
diff --git a/databases/adodb/distinfo b/databases/adodb/distinfo
index aea3f327639..0b30fde366a 100644
--- a/databases/adodb/distinfo
+++ b/databases/adodb/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2006/06/11 14:21:31 adrianp Exp $
+$NetBSD: distinfo,v 1.8 2007/11/25 17:53:23 adrianp Exp $
 
-SHA1 (adodb481.tgz) = 2805980a7455cf6cf2c7b07d6ac6858995068247
-RMD160 (adodb481.tgz) = 0eaf8433908bfd56a8e78535b889254d012b6435
-Size (adodb481.tgz) = 453988 bytes
+SHA1 (adodb496a.tgz) = fadfd6d93ae827c6c9f66716f99cf68c41b5f9d2
+RMD160 (adodb496a.tgz) = 742394fdde1830e267cce17481f8a5a97f27993d
+Size (adodb496a.tgz) = 476835 bytes