- Update to version 1.20

- Better pkg-comment and pkg-plist

PR: 29114
Submitted by: MAINTAINER

5 files changed, 82 insertions, 73 deletions

diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index fbfed481fe2..d9e9e3f8801 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	adodb
-PORTVERSION=	1.12
-PORTREVISION=	1
+PORTVERSION=	1.20
 CATEGORIES=	databases www
 MASTER_SITES=	http://phplens.com/lens/dl/
-DISTNAME=	${PORTNAME}112
+DISTNAME=	${PORTNAME}120
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	abgoeree@uwnet.nl
@@ -21,18 +20,48 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	YES
 
 ADODB_DIR=	share/doc/apache/php/adodb
+ADODB_TEST=	share/examples/adodb/test
+PLIST_SUB=	ADODB_DIR=${ADODB_DIR} \
+		ADODB_TEST=${ADODB_TEST}
+
+DOCS=	readme.htm tute.htm readme.txt
+LIBS=	adodb-access.inc.php adodb-ado.inc.php adodb-ado_access.inc.php \
+	adodb-ado_mssql.inc.php adodb-csv.inc.php adodb-db2.inc.php \
+	adodb-fbsql.inc.php adodb-ibase.inc.php adodb-mssql.inc.php \
+	adodb-mysql.inc.php adodb-mysqlt.inc.php adodb-oci8.inc.php \
+	adodb-odbc.inc.php  adodb-odbc_mssql.inc.php adodb-oracle.inc.php \
+	adodb-postgres.inc.php adodb-postgres7.inc.php adodb-sybase.inc.php \
+	adodb.inc.php adodb-vfp.inc.php tohtml.inc.php
+SAMPLES=server.php adodb-session.php
+TESTS=	benchmark.php client.php test.php test2.php test3.php \
+	testcache.php testdatabases.inc.php
 
 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
+.for FILE in adodb-session.php benchmark.php client.php server.php test.php \
+	test2.php test3.php testcache.php
+	${PERL} -pi -e "s#(\./)?(adodb(-session)?|tohtml)+(\.inc)?\.php#${PREFIX}/${ADODB_DIR}/\2\4\.php#" ${WRKSRC}/${FILE}
+.endfor
 
 do-install:
-	${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}
+	@${MKDIR} ${PREFIX}/${ADODB_DIR}
+.for FILE in ${SAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} \
+		${PREFIX}/${ADODB_DIR}/${FILE}.sample
+.endfor
+.for FILE in ${LIBS}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_DIR}
+.endfor
+	@${MKDIR} ${PREFIX}/${ADODB_TEST}
+.for FILE in ${TESTS}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_TEST}
+.endfor
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/adodb
+.for FILE in ${DOCS}
+	${INSTALL_MAN} ${WRKSRC}/${FILE} ${PREFIX}/share/doc/adodb
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/databases/adodb/distinfo b/databases/adodb/distinfo
index 36adbbd755f..fa186f1acfc 100644
--- a/databases/adodb/distinfo
+++ b/databases/adodb/distinfo
@@ -1 +1 @@
-MD5 (adodb112.tgz) = ed97632a0304fad87dacecaf0b6213a6
+MD5 (adodb120.tgz) = 49d98f1b13203f93b3040d69592a8787
diff --git a/databases/adodb/pkg-comment b/databases/adodb/pkg-comment
index 04f9afa2653..3fce76f64e7 100644
--- a/databases/adodb/pkg-comment
+++ b/databases/adodb/pkg-comment
@@ -1 +1 @@
-A high quality database library for PHP4
+A database wrapper library for PHP4
diff --git a/databases/adodb/pkg-descr b/databases/adodb/pkg-descr
index 7b131812a19..67bb898e99f 100644
--- a/databases/adodb/pkg-descr
+++ b/databases/adodb/pkg-descr
@@ -1,32 +1,12 @@
 ADODB stands for Active Data Objects Data Base.
 
-ADODB currently supports: 
+ADODB provides a common API to communicate with any supported database.
+
+Supported databases:
 	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.
-
-* 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
+- Ago
 abgoeree@uwnet.nl
-
diff --git a/databases/adodb/pkg-plist b/databases/adodb/pkg-plist
index b0a78dca2bb..675caf7b595 100644
--- a/databases/adodb/pkg-plist
+++ b/databases/adodb/pkg-plist
@@ -1,37 +1,37 @@
-share/doc/adodb/license.txt
+%%ADODB_DIR%%/adodb-access.inc.php
+%%ADODB_DIR%%/adodb-ado.inc.php
+%%ADODB_DIR%%/adodb-ado_access.inc.php
+%%ADODB_DIR%%/adodb-ado_mssql.inc.php
+%%ADODB_DIR%%/adodb-csv.inc.php
+%%ADODB_DIR%%/adodb-db2.inc.php
+%%ADODB_DIR%%/adodb-fbsql.inc.php
+%%ADODB_DIR%%/adodb-ibase.inc.php
+%%ADODB_DIR%%/adodb-mssql.inc.php
+%%ADODB_DIR%%/adodb-mysql.inc.php
+%%ADODB_DIR%%/adodb-mysqlt.inc.php
+%%ADODB_DIR%%/adodb-oci8.inc.php
+%%ADODB_DIR%%/adodb-odbc.inc.php
+%%ADODB_DIR%%/adodb-odbc_mssql.inc.php
+%%ADODB_DIR%%/adodb-oracle.inc.php
+%%ADODB_DIR%%/adodb-postgres.inc.php
+%%ADODB_DIR%%/adodb-postgres7.inc.php
+%%ADODB_DIR%%/adodb-session.php.sample
+%%ADODB_DIR%%/adodb-sybase.inc.php
+%%ADODB_DIR%%/adodb-vfp.inc.php
+%%ADODB_DIR%%/adodb.inc.php
+%%ADODB_DIR%%/server.php.sample
+%%ADODB_DIR%%/tohtml.inc.php
+%%ADODB_TEST%%/benchmark.php
+%%ADODB_TEST%%/client.php
+%%ADODB_TEST%%/test.php
+%%ADODB_TEST%%/test2.php
+%%ADODB_TEST%%/test3.php
+%%ADODB_TEST%%/testcache.php
+%%ADODB_TEST%%/testdatabases.inc.php
+share/doc/adodb/readme.htm
 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-db2.inc.php
-share/doc/apache/php/adodb/adodb-fbsql.inc.php
-share/doc/apache/php/adodb/adodb-ibase.inc.php
-share/doc/apache/php/adodb/adodb-mssql.inc.php
-share/doc/apache/php/adodb/adodb-mysql.inc.php
-share/doc/apache/php/adodb/adodb-mysqlt.inc.php
-share/doc/apache/php/adodb/adodb-oci8.inc.php
-share/doc/apache/php/adodb/adodb-odbc.inc.php
-share/doc/apache/php/adodb/adodb-odbc_mssql.inc.php
-share/doc/apache/php/adodb/adodb-oracle.inc.php
-share/doc/apache/php/adodb/adodb-postgres.inc.php
-share/doc/apache/php/adodb/adodb-postgres7.inc.php
-share/doc/apache/php/adodb/adodb-session.php
-share/doc/apache/php/adodb/adodb-sybase.inc.php
-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/readme.htm
-share/doc/apache/php/adodb/server.php
-share/doc/apache/php/adodb/test.php
-share/doc/apache/php/adodb/test2.php
-share/doc/apache/php/adodb/test3.php
-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
-@dirrm share/doc/apache/php/adodb
-@dirrm share/doc/apache/php
+share/doc/adodb/tute.htm
 @dirrm share/doc/adodb
+@dirrm %%ADODB_DIR%%
+@dirrm share/doc/apache/php
+@dirrm %%ADODB_TEST%%