4 files changed, 210 insertions, 245 deletions

diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index e0c56cafc3d7..d52fa0a668e2 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -6,178 +6,123 @@
 #
 
 PORTNAME=	adodb
-PORTVERSION=	3.60
-PORTREVISION=	1
+PORTVERSION=	4.11
 CATEGORIES=	databases www
 MASTER_SITES=	http://phplens.com/lens/dl/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	abgoeree@wish.net
-COMMENT=	A database library for PHP4
+MAINTAINER=	martin@tradex.sk
+COMMENT=	Database library for PHP4
 
 .if defined(WITH_APACHE2)
 RUN_DEPENDS=	${LOCALBASE}/libexec/apache2/libphp4.so:${PORTSDIR}/www/mod_php4
 .else
 RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 .endif
+
 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
-
-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 \
-		drivers/adodb-ado_access.inc.php \
-		drivers/adodb-ado_mssql.inc.php \
-		drivers/adodb-borland_ibase.inc.php \
-		drivers/adodb-csv.inc.php \
-		drivers/adodb-db2.inc.php \
-		drivers/adodb-fbsql.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 \
-		drivers/adodb-sybase.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-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 \
-		tests/test4.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/time.php \
-		tests/tmssql.php
+ADODB_DIR=	share/adodb
+PLIST_SUB=	ADODB_DIR=${ADODB_DIR}
+
+.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 \
+	license.txt old-changelog.htm readme.htm readme.txt tips_portable_sql.htm \
+	tute.htm
+
+ICONS=	adodb.gif adodb.png adodb2.gif adodb2.png
+
+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-xmlschema.inc.php adodb-xmlschema.zip adodb.inc.php \
+	pivottable.inc.php rsfilter.inc.php server.php toexport.inc.php tohtml.inc.php
+
+DATADICT=datadict-access.inc.php datadict-db2.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-mssql.inc.php adodb-mssqlpo.inc.php adodb-mysql.inc.php \
+	adodb-mysqli.inc.php adodb-mysqlt.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-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-sybase.inc.php adodb-vfp.inc.php
+
+LANG=	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-pt-br.inc.php \
+	adodb-ru1251.inc.php adodb-sv.inc.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
+
+TESTS=	benchmark.php client.php test-datadict.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_DATADICT}
-	@${MKDIR} ${PREFIX}/${ADODB_DRIVERS}
-	@${MKDIR} ${PREFIX}/${ADODB_LANG}
-	@${MKDIR} ${PREFIX}/${ADODB_TESTS}
+	@${MKDIR} ${PREFIX}/${ADODB_DIR} ${PREFIX}/${ADODB_DIR}/datadict \
+		${PREFIX}/${ADODB_DIR}/drivers ${PREFIX}/${ADODB_DIR}/lang \
+		${PREFIX}/${ADODB_DIR}/perf ${PREFIX}/${ADODB_DIR}/session/old
+.for FILE in ${BASE}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_DIR}/${FILE}
+.endfor
 .for FILE in ${DATADICT}
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_DATADICT}
+	${INSTALL_DATA} ${WRKSRC}/datadict/${FILE} ${PREFIX}/${ADODB_DIR}/datadict/${FILE}
 .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}
+	${INSTALL_DATA} ${WRKSRC}/drivers/${FILE} ${PREFIX}/${ADODB_DIR}/drivers/${FILE}
 .endfor
 .for FILE in ${LANG}
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_LANG}
+	${INSTALL_DATA} ${WRKSRC}/lang/${FILE} ${PREFIX}/${ADODB_DIR}/lang/${FILE}
 .endfor
-.for FILE in ${PICS}
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_DIR}
+.for FILE in ${PERF}
+	${INSTALL_DATA} ${WRKSRC}/perf/${FILE} ${PREFIX}/${ADODB_DIR}/perf/${FILE}
 .endfor
-.for FILE in ${SAMPLES}
-	if [ ! -f ${PREFIX}/${ADODB_DIR}/${FILE} ]; then \
-		${INSTALL_DATA} ${WRKSRC}/${FILE} \
-		${PREFIX}/${ADODB_DIR}/${FILE};\
-	fi
-	${INSTALL_DATA} ${WRKSRC}/${FILE} \
-		${PREFIX}/${ADODB_DIR}/${FILE}.sample
+.for FILE in ${SESSION}
+	${INSTALL_DATA} ${WRKSRC}/session/${FILE} ${PREFIX}/${ADODB_DIR}/session/${FILE}
 .endfor
+
+.if defined(WITH_TESTS)
+	@${MKDIR} ${PREFIX}/${ADODB_DIR}/tests
 .for FILE in ${TESTS}
-	if [ ! -f ${PREFIX}/${ADODB_DIR}/${FILE} ]; then \
-		${INSTALL_DATA} ${WRKSRC}/${FILE} \
-		${PREFIX}/${ADODB_DIR}/${FILE};\
-	fi
-	${INSTALL_DATA} ${WRKSRC}/${FILE} \
-	${PREFIX}/${ADODB_DIR}/${FILE}.sample
+	${INSTALL_DATA} ${WRKSRC}/tests/${FILE} ${PREFIX}/${ADODB_DIR}/tests
 .endfor
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR} ${DOCSDIR}/cute_icons_for_site
 .for FILE in ${DOCS}
-	${INSTALL_MAN} ${WRKSRC}/${FILE} ${DOCSDIR}
+	${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
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/databases/adodb/distinfo b/databases/adodb/distinfo
index 77e7d580b1ab..be120fd24096 100644
--- a/databases/adodb/distinfo
+++ b/databases/adodb/distinfo
@@ -1 +1 @@
-MD5 (adodb360.tgz) = de0a307347b4fa90b56d58b871038948
+MD5 (adodb411.tgz) = e6e632b06f72b1c43f41951cf19b2384
diff --git a/databases/adodb/pkg-message b/databases/adodb/pkg-message
index c144c1b37046..4ba5de8ec16b 100644
--- a/databases/adodb/pkg-message
+++ b/databases/adodb/pkg-message
@@ -1,2 +1,3 @@
-You can add the adodb path (default: ${ADODB_DIR}) to the "include_path=" 
-directive in your php.ini
+
+You can add the ADOdb path (default: /usr/local/share/adodb) 
+to the "include_path=" directive in your php.ini
diff --git a/databases/adodb/pkg-plist b/databases/adodb/pkg-plist
index 5bf8c6a08cc4..30b319b32443 100644
--- a/databases/adodb/pkg-plist
+++ b/databases/adodb/pkg-plist
@@ -1,124 +1,143 @@
-@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
-@unexec if cmp -s %D/%%ADODB_TESTS%%/test4.php %D/%%ADODB_TESTS%%/test4.php.sample; then rm -f %D/%%ADODB_TESTS%%/test4.php; fi
-@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-exceptions.inc.php
+%%ADODB_DIR%%/adodb-iterator.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-perf.inc.php
+%%ADODB_DIR%%/adodb-php4.inc.php
 %%ADODB_DIR%%/adodb-time.inc.php
 %%ADODB_DIR%%/adodb-xmlschema.inc.php
-%%ADODB_DIR%%/adodb.gif
+%%ADODB_DIR%%/adodb-xmlschema.zip
 %%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%%/server.php
 %%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
-%%ADODB_DRIVERS%%/adodb-ado_mssql.inc.php
-%%ADODB_DRIVERS%%/adodb-borland_ibase.inc.php
-%%ADODB_DRIVERS%%/adodb-csv.inc.php
-%%ADODB_DRIVERS%%/adodb-db2.inc.php
-%%ADODB_DRIVERS%%/adodb-fbsql.inc.php
-%%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
-%%ADODB_TESTS%%/test4.php.sample
-%%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
+%%ADODB_DIR%%/datadict/datadict-access.inc.php
+%%ADODB_DIR%%/datadict/datadict-db2.inc.php
+%%ADODB_DIR%%/datadict/datadict-generic.inc.php
+%%ADODB_DIR%%/datadict/datadict-ibase.inc.php
+%%ADODB_DIR%%/datadict/datadict-informix.inc.php
+%%ADODB_DIR%%/datadict/datadict-mssql.inc.php
+%%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-sybase.inc.php
+%%ADODB_DIR%%/drivers/adodb-access.inc.php
+%%ADODB_DIR%%/drivers/adodb-ado.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
+%%ADODB_DIR%%/drivers/adodb-csv.inc.php
+%%ADODB_DIR%%/drivers/adodb-db2.inc.php
+%%ADODB_DIR%%/drivers/adodb-fbsql.inc.php
+%%ADODB_DIR%%/drivers/adodb-firebird.inc.php
+%%ADODB_DIR%%/drivers/adodb-ibase.inc.php
+%%ADODB_DIR%%/drivers/adodb-informix.inc.php
+%%ADODB_DIR%%/drivers/adodb-informix72.inc.php
+%%ADODB_DIR%%/drivers/adodb-mssql.inc.php
+%%ADODB_DIR%%/drivers/adodb-mssqlpo.inc.php
+%%ADODB_DIR%%/drivers/adodb-mysql.inc.php
+%%ADODB_DIR%%/drivers/adodb-mysqli.inc.php
+%%ADODB_DIR%%/drivers/adodb-mysqlt.inc.php
+%%ADODB_DIR%%/drivers/adodb-oci8.inc.php
+%%ADODB_DIR%%/drivers/adodb-oci805.inc.php
+%%ADODB_DIR%%/drivers/adodb-oci8po.inc.php
+%%ADODB_DIR%%/drivers/adodb-odbc.inc.php
+%%ADODB_DIR%%/drivers/adodb-odbc_mssql.inc.php
+%%ADODB_DIR%%/drivers/adodb-odbc_oracle.inc.php
+%%ADODB_DIR%%/drivers/adodb-oracle.inc.php
+%%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-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-sybase.inc.php
+%%ADODB_DIR%%/drivers/adodb-vfp.inc.php
+%%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-de.inc.php
+%%ADODB_DIR%%/lang/adodb-en.inc.php
+%%ADODB_DIR%%/lang/adodb-es.inc.php
+%%ADODB_DIR%%/lang/adodb-fr.inc.php
+%%ADODB_DIR%%/lang/adodb-it.inc.php
+%%ADODB_DIR%%/lang/adodb-pt-br.inc.php
+%%ADODB_DIR%%/lang/adodb-ru1251.inc.php
+%%ADODB_DIR%%/lang/adodb-sv.inc.php
+%%ADODB_DIR%%/perf/perf-db2.inc.php
+%%ADODB_DIR%%/perf/perf-informix.inc.php
+%%ADODB_DIR%%/perf/perf-mssql.inc.php
+%%ADODB_DIR%%/perf/perf-mysql.inc.php
+%%ADODB_DIR%%/perf/perf-oci8.inc.php
+%%ADODB_DIR%%/perf/perf-postgres.inc.php
+%%ADODB_DIR%%/session/adodb-compress-bzip2.php
+%%ADODB_DIR%%/session/adodb-compress-gzip.php
+%%ADODB_DIR%%/session/adodb-cryptsession.php
+%%ADODB_DIR%%/session/adodb-encrypt-mcrypt.php
+%%ADODB_DIR%%/session/adodb-encrypt-md5.php
+%%ADODB_DIR%%/session/adodb-encrypt-secret.php
+%%ADODB_DIR%%/session/adodb-sess.txt
+%%ADODB_DIR%%/session/adodb-session-clob.php
+%%ADODB_DIR%%/session/adodb-session.php
+%%ADODB_DIR%%/session/adodb-sessions.mysql.sql
+%%ADODB_DIR%%/session/adodb-sessions.oracle.clob.sql
+%%ADODB_DIR%%/session/adodb-sessions.oracle.sql
+%%ADODB_DIR%%/session/crypt.inc.php
+%%ADODB_DIR%%/session/old/adodb-cryptsession.php
+%%ADODB_DIR%%/session/old/adodb-session-clob.php
+%%ADODB_DIR%%/session/old/adodb-session.php
+%%ADODB_DIR%%/session/old/crypt.inc.php
+%%TESTS%%%%ADODB_DIR%%/tests/benchmark.php
+%%TESTS%%%%ADODB_DIR%%/tests/client.php
+%%TESTS%%%%ADODB_DIR%%/tests/test-datadict.php
+%%TESTS%%%%ADODB_DIR%%/tests/test.php
+%%TESTS%%%%ADODB_DIR%%/tests/test2.php
+%%TESTS%%%%ADODB_DIR%%/tests/test3.php
+%%TESTS%%%%ADODB_DIR%%/tests/test4.php
+%%TESTS%%%%ADODB_DIR%%/tests/test5.php
+%%TESTS%%%%ADODB_DIR%%/tests/test_rs_array.php
+%%TESTS%%%%ADODB_DIR%%/tests/testcache.php
+%%TESTS%%%%ADODB_DIR%%/tests/testdatabases.inc.php
+%%TESTS%%%%ADODB_DIR%%/tests/testgenid.php
+%%TESTS%%%%ADODB_DIR%%/tests/testmssql.php
+%%TESTS%%%%ADODB_DIR%%/tests/testoci8.php
+%%TESTS%%%%ADODB_DIR%%/tests/testoci8cursor.php
+%%TESTS%%%%ADODB_DIR%%/tests/testpaging.php
+%%TESTS%%%%ADODB_DIR%%/tests/testpear.php
+%%TESTS%%%%ADODB_DIR%%/tests/testsessions.php
+%%TESTS%%%%ADODB_DIR%%/tests/time.php
+%%TESTS%%%%ADODB_DIR%%/tests/tmssql.php
+%%TESTS%%%%ADODB_DIR%%/tests/xmlschema.xml
 %%PORTDOCS%%%%DOCSDIR%%/docs-adodb.htm
 %%PORTDOCS%%%%DOCSDIR%%/docs-datadict.htm
+%%PORTDOCS%%%%DOCSDIR%%/docs-perf.htm
 %%PORTDOCS%%%%DOCSDIR%%/docs-session.htm
+%%PORTDOCS%%%%DOCSDIR%%/license.txt
+%%PORTDOCS%%%%DOCSDIR%%/old-changelog.htm
 %%PORTDOCS%%%%DOCSDIR%%/readme.htm
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
 %%PORTDOCS%%%%DOCSDIR%%/tips_portable_sql.htm
 %%PORTDOCS%%%%DOCSDIR%%/tute.htm
+%%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb.gif
+%%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb.png
+%%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb2.gif
+%%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb2.png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/cute_icons_for_site
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%ADODB_DATADICT%%
-@dirrm %%ADODB_DRIVERS%%
-@dirrm %%ADODB_LANG%%
-@dirrm %%ADODB_TESTS%%
+@dirrm %%ADODB_DIR%%/datadict
+@dirrm %%ADODB_DIR%%/drivers
+@dirrm %%ADODB_DIR%%/lang
+@dirrm %%ADODB_DIR%%/perf
+@dirrm %%ADODB_DIR%%/session/old
+@dirrm %%ADODB_DIR%%/session
+%%TESTS%%@dirrm %%ADODB_DIR%%/tests
 @dirrm %%ADODB_DIR%%
-@dirrm www/data.default/php
-@unexec rmdir %D/www/data.default 2> /dev/null || true
-@unexec rmdir %D/www 2> /dev/null || true