4 files changed, 43 insertions, 23 deletions

diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index dba4b51408f3..fbfed481fe2a 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -20,9 +20,19 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	YES
 
+ADODB_DIR=	share/doc/apache/php/adodb
+
+post-patch:
+	${PERL} -pi -e 's!^readme\.htm!${PREFIX}/${ADODB_DIR}/readme\.htm!' \
+		${WRKSRC}/readme.txt
+	${PERL} -pi -e 's!^tute\.htm!${PREFIX}/${ADODB_DIR}/tute\.htm!' \
+		${WRKSRC}/readme.txt
+
 do-install:
-	${RM} -f ${WRKSRC}/*.orig
-	${MKDIR} ${PREFIX}/share/doc/apache/php/adodb
-	${INSTALL_DATA} ${WRKSRC}/* ${PREFIX}/share/doc/apache/php/adodb
+	${MKDIR} ${PREFIX}/share/doc/adodb
+	${MKDIR} ${PREFIX}/${ADODB_DIR}
+	${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/adodb
+	${INSTALL_DATA} ${WRKSRC}/*.php ${PREFIX}/${ADODB_DIR}
+	${INSTALL_DATA} ${WRKSRC}/*.htm ${PREFIX}/${ADODB_DIR}
 
 .include <bsd.port.mk>
diff --git a/databases/adodb/pkg-comment b/databases/adodb/pkg-comment
index 56f4daa25512..04f9afa26538 100644
--- a/databases/adodb/pkg-comment
+++ b/databases/adodb/pkg-comment
@@ -1 +1 @@
-Standardized database access for PHP4
+A high quality database library for PHP4
diff --git a/databases/adodb/pkg-descr b/databases/adodb/pkg-descr
index daeb9473dc58..7b131812a194 100644
--- a/databases/adodb/pkg-descr
+++ b/databases/adodb/pkg-descr
@@ -1,21 +1,32 @@
-PHP's database access functions are not standardized.
-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 stands for Active Data Objects Data Base.
 
-ADODB currently supports: MySQL, PostgreSQL, Interbase, Oracle, MS SQL 7,
-Foxpro, Access, ADO, Sybase and generic ODBC.
-The Sybase and PostgreSQL drivers are community contributions.
-The developers of ABODB hope more people will contribute drivers to support
-more databases.
+ADODB currently supports: 
+	MySQL, PostgreSQL, Interbase, Oracle, MS SQL 7
+	Foxpro, Access, ADO, Sybase and generic ODBC.
+
+Unique Features of ADODB:
+
+* Easy for Windows programmers to adapt to because many of the conventions 
+  are similar to Microsoft's ADO.
+
+* Unlike other PHP database classes which focus only on select statements
+  ADODB provides support code to handle inserts and updates which can be
+  adapted to multiple databases quickly. Methods are provided for date
+  handling, string concatenation and string quoting characters for 
+  differing databases.
 
-Feature requests and bug reports can be emailed to jlim@natsoft.com.my or
-posted to http://php.weblogs.com/discuss/msgReader$96.
+* A metatype system is built in so that types such as CHAR, TEXT and STRING
+  are equivalent in different databases.
+
+* Easy to port because all the database dependant code are stored in stub
+  functions. You do not need to port the core logic of the classes.
+
+* PHP4 session support. You can store your session information using ADODB
+  for true portability and scalability. See adodb-session.php for more 
+  information.
 
 WWW: http://php.weblogs.com/ADODB
 
---
-Andre Goeree <abgoeree@uwnet.nl>
+-- Andre
+abgoeree@uwnet.nl
+
diff --git a/databases/adodb/pkg-plist b/databases/adodb/pkg-plist
index 8d43d54a1133..b0a78dca2bbb 100644
--- a/databases/adodb/pkg-plist
+++ b/databases/adodb/pkg-plist
@@ -1,9 +1,10 @@
+share/doc/adodb/license.txt
+share/doc/adodb/readme.txt
 share/doc/apache/php/adodb/adodb-access.inc.php
 share/doc/apache/php/adodb/adodb-ado.inc.php
 share/doc/apache/php/adodb/adodb-ado_access.inc.php
 share/doc/apache/php/adodb/adodb-ado_mssql.inc.php
 share/doc/apache/php/adodb/adodb-csv.inc.php
-share/doc/apache/php/adodb/adodb-d.apj
 share/doc/apache/php/adodb/adodb-db2.inc.php
 share/doc/apache/php/adodb/adodb-fbsql.inc.php
 share/doc/apache/php/adodb/adodb-ibase.inc.php
@@ -22,9 +23,7 @@ share/doc/apache/php/adodb/adodb-vfp.inc.php
 share/doc/apache/php/adodb/adodb.inc.php
 share/doc/apache/php/adodb/benchmark.php
 share/doc/apache/php/adodb/client.php
-share/doc/apache/php/adodb/license.txt
 share/doc/apache/php/adodb/readme.htm
-share/doc/apache/php/adodb/readme.txt
 share/doc/apache/php/adodb/server.php
 share/doc/apache/php/adodb/test.php
 share/doc/apache/php/adodb/test2.php
@@ -33,6 +32,6 @@ share/doc/apache/php/adodb/testcache.php
 share/doc/apache/php/adodb/testdatabases.inc.php
 share/doc/apache/php/adodb/tohtml.inc.php
 share/doc/apache/php/adodb/tute.htm
-share/doc/apache/php/adodb/vssver.scc
 @dirrm share/doc/apache/php/adodb
 @dirrm share/doc/apache/php
+@dirrm share/doc/adodb