4 files changed, 208 insertions, 206 deletions

diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index e812304e0e93..b092ff653441 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -12,9 +12,11 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-php-4-and-5/${PORTNAME}-${PORTVERSION:S
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	joehorn@gmail.com
 COMMENT=	Database library for PHP
 
+LICENSE=	BSD
+
 USE_PHP=	pcre
 
 CONFLICTS=	adodb-5.*
@@ -22,15 +24,14 @@ CONFLICTS=	adodb-5.*
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	YES
 
-ADODB_DIR?=	share/adodb
-PLIST_SUB=	ADODB_DIR=${ADODB_DIR}
-
 ADODB_SUBDIRS=	contrib datadict drivers lang pear perf session xsl
 
 OPTIONS=	TESTS "Install tests" off
 
 .include <bsd.port.pre.mk>
 
+SUB_FILES+=	pkg-message
+
 .if defined (WITH_TESTS)
 PLIST_SUB+=	TESTS=
 .else
@@ -41,18 +42,18 @@ post-patch:
 	@cd ${WRKSRC}; ${RM} -f cute_icons_for_site/Thumbs.db
 
 do-install:
-	@${MKDIR} ${PREFIX}/${ADODB_DIR}
+	@${MKDIR} ${DATADIR}
 	@cd ${WRKSRC}; ${FIND} ${ADODB_SUBDIRS} -type d \
-		-exec ${MKDIR} ${PREFIX}/${ADODB_DIR}/{} \;
+		-exec ${MKDIR} ${DATADIR}/{} \;
 	@cd ${WRKSRC}; ${FIND} . ! -path './*/*' -type f \( -name '*.php' -or -name '*.dtd' -or -name '*.zip' \) \
-		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${PREFIX}/${ADODB_DIR}/{} \;
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${DATADIR}/{} \;
 	@cd ${WRKSRC}; ${FIND} ${ADODB_SUBDIRS} -type f \
-		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${PREFIX}/${ADODB_DIR}/{} \;
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${DATADIR}/{} \;
 
 .if defined (WITH_TESTS)
-	@${MKDIR} ${PREFIX}/${ADODB_DIR}/tests
+	@${MKDIR} ${DATADIR}/tests
 	@cd ${WRKSRC}; ${FIND} tests -type f \
-		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${PREFIX}/${ADODB_DIR}/{} \;
+		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${DATADIR}/{} \;
 .endif
 
 post-install:
diff --git a/databases/adodb/files/pkg-message.in b/databases/adodb/files/pkg-message.in
new file mode 100644
index 000000000000..74e6bfabbeeb
--- /dev/null
+++ b/databases/adodb/files/pkg-message.in
@@ -0,0 +1,4 @@
+
+You can add the ADOdb path (%%DATADIR%%) 
+to the "include_path=" directive in your php.ini
+
diff --git a/databases/adodb/pkg-message b/databases/adodb/pkg-message
deleted file mode 100644
index 4ba5de8ec16b..000000000000
--- a/databases/adodb/pkg-message
+++ /dev/null
@@ -1,3 +0,0 @@
-
-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 04fcf15f60fc..2b0fbb8f5fb6 100644
--- a/databases/adodb/pkg-plist
+++ b/databases/adodb/pkg-plist
@@ -1,183 +1,183 @@
-%%ADODB_DIR%%/adodb-active-record.inc.php
-%%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-memcache.lib.inc.php
-%%ADODB_DIR%%/adodb-pager.inc.php
-%%ADODB_DIR%%/adodb-pear.inc.php
-%%ADODB_DIR%%/adodb-perf.inc.php
-%%ADODB_DIR%%/adodb-php4.inc.php
-%%ADODB_DIR%%/adodb-time.inc.php
-%%ADODB_DIR%%/adodb-time.zip
-%%ADODB_DIR%%/adodb-xmlschema.inc.php
-%%ADODB_DIR%%/adodb-xmlschema03.inc.php
-%%ADODB_DIR%%/adodb.inc.php
-%%ADODB_DIR%%/pivottable.inc.php
-%%ADODB_DIR%%/rsfilter.inc.php
-%%ADODB_DIR%%/server.php
-%%ADODB_DIR%%/toexport.inc.php
-%%ADODB_DIR%%/tohtml.inc.php
-%%ADODB_DIR%%/xmlschema.dtd
-%%ADODB_DIR%%/xmlschema03.dtd
-%%ADODB_DIR%%/contrib/toxmlrpc.inc.php
-%%ADODB_DIR%%/datadict/datadict-access.inc.php
-%%ADODB_DIR%%/datadict/datadict-db2.inc.php
-%%ADODB_DIR%%/datadict/datadict-firebird.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-mssqlnative.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-sapdb.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-ado5.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-ldap.inc.php
-%%ADODB_DIR%%/drivers/adodb-mssql.inc.php
-%%ADODB_DIR%%/drivers/adodb-mssqlnative.inc.php
-%%ADODB_DIR%%/drivers/adodb-mssql.inc.php.bak
-%%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
-%%ADODB_DIR%%/drivers/adodb-mysqlt.inc.php
-%%ADODB_DIR%%/drivers/adodb-netezza.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_db2.inc.php
-%%ADODB_DIR%%/drivers/adodb-odbc_mssql.inc.php
-%%ADODB_DIR%%/drivers/adodb-odbc_oracle.inc.php
-%%ADODB_DIR%%/drivers/adodb-odbtp.inc.php
-%%ADODB_DIR%%/drivers/adodb-odbtp_unicode.inc.php
-%%ADODB_DIR%%/drivers/adodb-oracle.inc.php
-%%ADODB_DIR%%/drivers/adodb-pdo.inc.php
-%%ADODB_DIR%%/drivers/adodb-pdo_mssql.inc.php
-%%ADODB_DIR%%/drivers/adodb-pdo_mysql.inc.php
-%%ADODB_DIR%%/drivers/adodb-pdo_oci.inc.php
-%%ADODB_DIR%%/drivers/adodb-pdo_pgsql.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-postgres8.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-sqlitepo.inc.php
-%%ADODB_DIR%%/drivers/adodb-sybase.inc.php
-%%ADODB_DIR%%/drivers/adodb-sybase_ase.inc.php
-%%ADODB_DIR%%/drivers/adodb-vfp.inc.php
-%%ADODB_DIR%%/lang/adodb-ar.inc.php
-%%ADODB_DIR%%/lang/adodb-bg.inc.php
-%%ADODB_DIR%%/lang/adodb-bgutf8.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-da.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-esperanto.inc.php
-%%ADODB_DIR%%/lang/adodb-fa.inc.php
-%%ADODB_DIR%%/lang/adodb-fr.inc.php
-%%ADODB_DIR%%/lang/adodb-hu.inc.php
-%%ADODB_DIR%%/lang/adodb-it.inc.php
-%%ADODB_DIR%%/lang/adodb-nl.inc.php
-%%ADODB_DIR%%/lang/adodb-pl.inc.php
-%%ADODB_DIR%%/lang/adodb-pt-br.inc.php
-%%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
-%%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-mssqlnative.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-cryptsession2.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-encrypt-sha1.php
-%%ADODB_DIR%%/session/adodb-sess.txt
-%%ADODB_DIR%%/session/adodb-session-clob.php
-%%ADODB_DIR%%/session/adodb-session-clob2.php
-%%ADODB_DIR%%/session/adodb-session.php
-%%ADODB_DIR%%/session/adodb-session2.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
-%%ADODB_DIR%%/session/session_schema.xml
-%%ADODB_DIR%%/session/session_schema2.xml
-%%ADODB_DIR%%/xsl/convert-0.1-0.2.xsl
-%%ADODB_DIR%%/xsl/convert-0.1-0.3.xsl
-%%ADODB_DIR%%/xsl/convert-0.2-0.1.xsl
-%%ADODB_DIR%%/xsl/convert-0.2-0.3.xsl
-%%ADODB_DIR%%/xsl/remove-0.2.xsl
-%%ADODB_DIR%%/xsl/remove-0.3.xsl
-%%TESTS%%%%ADODB_DIR%%/tests/benchmark.php
-%%TESTS%%%%ADODB_DIR%%/tests/client.php
-%%TESTS%%%%ADODB_DIR%%/tests/pdo.php
-%%TESTS%%%%ADODB_DIR%%/tests/test-active-record.php
-%%TESTS%%%%ADODB_DIR%%/tests/test-active-recs2.php
-%%TESTS%%%%ADODB_DIR%%/tests/test-datadict.php
-%%TESTS%%%%ADODB_DIR%%/tests/test-perf.php
-%%TESTS%%%%ADODB_DIR%%/tests/test-pgblob.php
-%%TESTS%%%%ADODB_DIR%%/tests/test-php5.php
-%%TESTS%%%%ADODB_DIR%%/tests/test-xmlschema.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
-%%TESTS%%%%ADODB_DIR%%/tests/xmlschema-mssql.xml
+%%DATADIR%%/adodb-active-record.inc.php
+%%DATADIR%%/adodb-csvlib.inc.php
+%%DATADIR%%/adodb-datadict.inc.php
+%%DATADIR%%/adodb-error.inc.php
+%%DATADIR%%/adodb-errorhandler.inc.php
+%%DATADIR%%/adodb-errorpear.inc.php
+%%DATADIR%%/adodb-exceptions.inc.php
+%%DATADIR%%/adodb-iterator.inc.php
+%%DATADIR%%/adodb-lib.inc.php
+%%DATADIR%%/adodb-memcache.lib.inc.php
+%%DATADIR%%/adodb-pager.inc.php
+%%DATADIR%%/adodb-pear.inc.php
+%%DATADIR%%/adodb-perf.inc.php
+%%DATADIR%%/adodb-php4.inc.php
+%%DATADIR%%/adodb-time.inc.php
+%%DATADIR%%/adodb-time.zip
+%%DATADIR%%/adodb-xmlschema.inc.php
+%%DATADIR%%/adodb-xmlschema03.inc.php
+%%DATADIR%%/adodb.inc.php
+%%DATADIR%%/pivottable.inc.php
+%%DATADIR%%/rsfilter.inc.php
+%%DATADIR%%/server.php
+%%DATADIR%%/toexport.inc.php
+%%DATADIR%%/tohtml.inc.php
+%%DATADIR%%/xmlschema.dtd
+%%DATADIR%%/xmlschema03.dtd
+%%DATADIR%%/contrib/toxmlrpc.inc.php
+%%DATADIR%%/datadict/datadict-access.inc.php
+%%DATADIR%%/datadict/datadict-db2.inc.php
+%%DATADIR%%/datadict/datadict-firebird.inc.php
+%%DATADIR%%/datadict/datadict-generic.inc.php
+%%DATADIR%%/datadict/datadict-ibase.inc.php
+%%DATADIR%%/datadict/datadict-informix.inc.php
+%%DATADIR%%/datadict/datadict-mssql.inc.php
+%%DATADIR%%/datadict/datadict-mssqlnative.inc.php
+%%DATADIR%%/datadict/datadict-mysql.inc.php
+%%DATADIR%%/datadict/datadict-oci8.inc.php
+%%DATADIR%%/datadict/datadict-postgres.inc.php
+%%DATADIR%%/datadict/datadict-sapdb.inc.php
+%%DATADIR%%/datadict/datadict-sybase.inc.php
+%%DATADIR%%/drivers/adodb-access.inc.php
+%%DATADIR%%/drivers/adodb-ado.inc.php
+%%DATADIR%%/drivers/adodb-ado5.inc.php
+%%DATADIR%%/drivers/adodb-ado_access.inc.php
+%%DATADIR%%/drivers/adodb-ado_mssql.inc.php
+%%DATADIR%%/drivers/adodb-borland_ibase.inc.php
+%%DATADIR%%/drivers/adodb-csv.inc.php
+%%DATADIR%%/drivers/adodb-db2.inc.php
+%%DATADIR%%/drivers/adodb-fbsql.inc.php
+%%DATADIR%%/drivers/adodb-firebird.inc.php
+%%DATADIR%%/drivers/adodb-ibase.inc.php
+%%DATADIR%%/drivers/adodb-informix.inc.php
+%%DATADIR%%/drivers/adodb-informix72.inc.php
+%%DATADIR%%/drivers/adodb-ldap.inc.php
+%%DATADIR%%/drivers/adodb-mssql.inc.php
+%%DATADIR%%/drivers/adodb-mssqlnative.inc.php
+%%DATADIR%%/drivers/adodb-mssql.inc.php.bak
+%%DATADIR%%/drivers/adodb-mssql_n.inc.php
+%%DATADIR%%/drivers/adodb-mssqlpo.inc.php
+%%DATADIR%%/drivers/adodb-mysql.inc.php
+%%DATADIR%%/drivers/adodb-mysqli.inc.php
+%%DATADIR%%/drivers/adodb-mysqlt.inc.php
+%%DATADIR%%/drivers/adodb-netezza.inc.php
+%%DATADIR%%/drivers/adodb-oci8.inc.php
+%%DATADIR%%/drivers/adodb-oci805.inc.php
+%%DATADIR%%/drivers/adodb-oci8po.inc.php
+%%DATADIR%%/drivers/adodb-odbc.inc.php
+%%DATADIR%%/drivers/adodb-odbc_db2.inc.php
+%%DATADIR%%/drivers/adodb-odbc_mssql.inc.php
+%%DATADIR%%/drivers/adodb-odbc_oracle.inc.php
+%%DATADIR%%/drivers/adodb-odbtp.inc.php
+%%DATADIR%%/drivers/adodb-odbtp_unicode.inc.php
+%%DATADIR%%/drivers/adodb-oracle.inc.php
+%%DATADIR%%/drivers/adodb-pdo.inc.php
+%%DATADIR%%/drivers/adodb-pdo_mssql.inc.php
+%%DATADIR%%/drivers/adodb-pdo_mysql.inc.php
+%%DATADIR%%/drivers/adodb-pdo_oci.inc.php
+%%DATADIR%%/drivers/adodb-pdo_pgsql.inc.php
+%%DATADIR%%/drivers/adodb-postgres.inc.php
+%%DATADIR%%/drivers/adodb-postgres64.inc.php
+%%DATADIR%%/drivers/adodb-postgres7.inc.php
+%%DATADIR%%/drivers/adodb-postgres8.inc.php
+%%DATADIR%%/drivers/adodb-proxy.inc.php
+%%DATADIR%%/drivers/adodb-sapdb.inc.php
+%%DATADIR%%/drivers/adodb-sqlanywhere.inc.php
+%%DATADIR%%/drivers/adodb-sqlite.inc.php
+%%DATADIR%%/drivers/adodb-sqlitepo.inc.php
+%%DATADIR%%/drivers/adodb-sybase.inc.php
+%%DATADIR%%/drivers/adodb-sybase_ase.inc.php
+%%DATADIR%%/drivers/adodb-vfp.inc.php
+%%DATADIR%%/lang/adodb-ar.inc.php
+%%DATADIR%%/lang/adodb-bg.inc.php
+%%DATADIR%%/lang/adodb-bgutf8.inc.php
+%%DATADIR%%/lang/adodb-ca.inc.php
+%%DATADIR%%/lang/adodb-cn.inc.php
+%%DATADIR%%/lang/adodb-cz.inc.php
+%%DATADIR%%/lang/adodb-da.inc.php
+%%DATADIR%%/lang/adodb-de.inc.php
+%%DATADIR%%/lang/adodb-en.inc.php
+%%DATADIR%%/lang/adodb-es.inc.php
+%%DATADIR%%/lang/adodb-esperanto.inc.php
+%%DATADIR%%/lang/adodb-fa.inc.php
+%%DATADIR%%/lang/adodb-fr.inc.php
+%%DATADIR%%/lang/adodb-hu.inc.php
+%%DATADIR%%/lang/adodb-it.inc.php
+%%DATADIR%%/lang/adodb-nl.inc.php
+%%DATADIR%%/lang/adodb-pl.inc.php
+%%DATADIR%%/lang/adodb-pt-br.inc.php
+%%DATADIR%%/lang/adodb-ro.inc.php
+%%DATADIR%%/lang/adodb-ru1251.inc.php
+%%DATADIR%%/lang/adodb-sv.inc.php
+%%DATADIR%%/lang/adodb_th.inc.php
+%%DATADIR%%/lang/adodb-uk1251.inc.php
+%%DATADIR%%/pear/readme.Auth.txt
+%%DATADIR%%/pear/Auth/Container/ADOdb.php
+%%DATADIR%%/perf/perf-db2.inc.php
+%%DATADIR%%/perf/perf-informix.inc.php
+%%DATADIR%%/perf/perf-mssql.inc.php
+%%DATADIR%%/perf/perf-mssqlnative.inc.php
+%%DATADIR%%/perf/perf-mysql.inc.php
+%%DATADIR%%/perf/perf-oci8.inc.php
+%%DATADIR%%/perf/perf-postgres.inc.php
+%%DATADIR%%/session/adodb-compress-bzip2.php
+%%DATADIR%%/session/adodb-compress-gzip.php
+%%DATADIR%%/session/adodb-cryptsession.php
+%%DATADIR%%/session/adodb-cryptsession2.php
+%%DATADIR%%/session/adodb-encrypt-mcrypt.php
+%%DATADIR%%/session/adodb-encrypt-md5.php
+%%DATADIR%%/session/adodb-encrypt-secret.php
+%%DATADIR%%/session/adodb-encrypt-sha1.php
+%%DATADIR%%/session/adodb-sess.txt
+%%DATADIR%%/session/adodb-session-clob.php
+%%DATADIR%%/session/adodb-session-clob2.php
+%%DATADIR%%/session/adodb-session.php
+%%DATADIR%%/session/adodb-session2.php
+%%DATADIR%%/session/adodb-sessions.mysql.sql
+%%DATADIR%%/session/adodb-sessions.oracle.clob.sql
+%%DATADIR%%/session/adodb-sessions.oracle.sql
+%%DATADIR%%/session/crypt.inc.php
+%%DATADIR%%/session/old/adodb-cryptsession.php
+%%DATADIR%%/session/old/adodb-session-clob.php
+%%DATADIR%%/session/old/adodb-session.php
+%%DATADIR%%/session/old/crypt.inc.php
+%%DATADIR%%/session/session_schema.xml
+%%DATADIR%%/session/session_schema2.xml
+%%DATADIR%%/xsl/convert-0.1-0.2.xsl
+%%DATADIR%%/xsl/convert-0.1-0.3.xsl
+%%DATADIR%%/xsl/convert-0.2-0.1.xsl
+%%DATADIR%%/xsl/convert-0.2-0.3.xsl
+%%DATADIR%%/xsl/remove-0.2.xsl
+%%DATADIR%%/xsl/remove-0.3.xsl
+%%TESTS%%%%DATADIR%%/tests/benchmark.php
+%%TESTS%%%%DATADIR%%/tests/client.php
+%%TESTS%%%%DATADIR%%/tests/pdo.php
+%%TESTS%%%%DATADIR%%/tests/test-active-record.php
+%%TESTS%%%%DATADIR%%/tests/test-active-recs2.php
+%%TESTS%%%%DATADIR%%/tests/test-datadict.php
+%%TESTS%%%%DATADIR%%/tests/test-perf.php
+%%TESTS%%%%DATADIR%%/tests/test-pgblob.php
+%%TESTS%%%%DATADIR%%/tests/test-php5.php
+%%TESTS%%%%DATADIR%%/tests/test-xmlschema.php
+%%TESTS%%%%DATADIR%%/tests/test.php
+%%TESTS%%%%DATADIR%%/tests/test2.php
+%%TESTS%%%%DATADIR%%/tests/test3.php
+%%TESTS%%%%DATADIR%%/tests/test4.php
+%%TESTS%%%%DATADIR%%/tests/test5.php
+%%TESTS%%%%DATADIR%%/tests/test_rs_array.php
+%%TESTS%%%%DATADIR%%/tests/testcache.php
+%%TESTS%%%%DATADIR%%/tests/testdatabases.inc.php
+%%TESTS%%%%DATADIR%%/tests/testgenid.php
+%%TESTS%%%%DATADIR%%/tests/testmssql.php
+%%TESTS%%%%DATADIR%%/tests/testoci8.php
+%%TESTS%%%%DATADIR%%/tests/testoci8cursor.php
+%%TESTS%%%%DATADIR%%/tests/testpaging.php
+%%TESTS%%%%DATADIR%%/tests/testpear.php
+%%TESTS%%%%DATADIR%%/tests/testsessions.php
+%%TESTS%%%%DATADIR%%/tests/time.php
+%%TESTS%%%%DATADIR%%/tests/tmssql.php
+%%TESTS%%%%DATADIR%%/tests/xmlschema.xml
+%%TESTS%%%%DATADIR%%/tests/xmlschema-mssql.xml
 %%PORTDOCS%%%%DOCSDIR%%/docs-active-record.htm
 %%PORTDOCS%%%%DOCSDIR%%/docs-adodb.htm
 %%PORTDOCS%%%%DOCSDIR%%/docs-datadict.htm
@@ -195,16 +195,16 @@
 %%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb2.gif
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/cute_icons_for_site
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%ADODB_DIR%%/contrib
-@dirrm %%ADODB_DIR%%/datadict
-@dirrm %%ADODB_DIR%%/drivers
-@dirrm %%ADODB_DIR%%/lang
-@dirrm %%ADODB_DIR%%/pear/Auth/Container
-@dirrm %%ADODB_DIR%%/pear/Auth
-@dirrm %%ADODB_DIR%%/pear
-@dirrm %%ADODB_DIR%%/perf
-@dirrm %%ADODB_DIR%%/session/old
-@dirrm %%ADODB_DIR%%/session
-@dirrm %%ADODB_DIR%%/xsl
-%%TESTS%%@dirrm %%ADODB_DIR%%/tests
-@dirrm %%ADODB_DIR%%
+@dirrm %%DATADIR%%/contrib
+@dirrm %%DATADIR%%/datadict
+@dirrm %%DATADIR%%/drivers
+@dirrm %%DATADIR%%/lang
+@dirrm %%DATADIR%%/pear/Auth/Container
+@dirrm %%DATADIR%%/pear/Auth
+@dirrm %%DATADIR%%/pear
+@dirrm %%DATADIR%%/perf
+@dirrm %%DATADIR%%/session/old
+@dirrm %%DATADIR%%/session
+@dirrm %%DATADIR%%/xsl
+%%TESTS%%@dirrm %%DATADIR%%/tests
+@dirrm %%DATADIR%%