Skip site navigation (1)Skip section navigation (2)
Date:      10 Jul 2001 20:50:07 -0000
From:      "Andre Goeree" <abgoeree@uwnet.nl>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/28881: Update port: databases/adodb
Message-ID:  <20010710205007.31951.qmail@mandark.attica.home>

next in thread | raw e-mail | index | archive | help

>Number:         28881
>Category:       ports
>Synopsis:       Update port: databases/adodb
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 10 13:50:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Maintainer
>Release:        FreeBSD 4.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD mandark.attica.home 4.3-STABLE FreeBSD 4.3-STABLE #6: Tue Jul 10 19:33:56 CEST 2001 toor@mandark.attica.home:/usr/obj/usr/src/sys/CUSTOM i386

>Description:

Modified files:
 Makefile	Do all patching in post-patch
		Install the test scripts in share/examples/adodb
		Respect NOPORTDOCS
		Display a message about where to find the tests
		Bump revision because of security enhancements:
		 The test scripts try to communicate with databases
		 on the network, this could possibly be exploited.

 pkg-comment	A more fitting comment
 pkg-desc	A shorter description

 pkg-plist	%%NOPORTDOCS%%
		update moved files, use PLIST_SUB variables

Removed files:
 files/patch-adodb-odbc.inc.php
		Obsolete now all patching is done in the Makefile
		Note that the attached patch will leave an empty file

>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /home/ago/etc/cvsroot/ports/databases/adodb/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile	2001/07/07 22:24:08	1.7
+++ Makefile	2001/07/10 20:12:53
@@ -7,7 +7,7 @@
 
 PORTNAME=	adodb
 PORTVERSION=	1.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases www
 MASTER_SITES=	http://phplens.com/lens/dl/
 DISTNAME=	${PORTNAME}112
@@ -20,19 +20,59 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	YES
 
+ADODB_DOC=	share/doc/adodb
 ADODB_DIR=	share/doc/apache/php/adodb
+ADODB_TEST=	share/examples/adodb
+PLIST_SUB=	ADODB_DIR=${ADODB_DIR} \
+		ADODB_TEST=${ADODB_TEST}
 
 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
+	@${PERL} -pi -e 's#,0,#,\$$row=0,#' ${WRKSRC}/adodb-odbc.inc.php
+	@${PERL} -pi -e 's#/path/to/set/here/##' ${WRKSRC}/readme.htm
+	@${PERL} -pi -e 's#^readme\.htm#${PREFIX}/${ADODB_DOC}/readme\.htm#' ${WRKSRC}/readme.txt
+	@${PERL} -pi -e 's#^tute\.htm#${PREFIX}/${ADODB_DOC}/tute\.htm#' ${WRKSRC}/readme.txt
+.for file in adodb-session.php benchmark.php client.php server.php readme.htm \
+	test2.php test3.php testcache.php test.php tute.htm
+	@${PERL} -pi -e 's#\./##' ${WRKSRC}/${file}
+	@${PERL} -pi -e 's#adodb\.inc\.php#${PREFIX}/${ADODB_DIR}/adodb\.inc\.php#' ${WRKSRC}/${file}
+	@${PERL} -pi -e 's#tohtml\.inc\.php#${PREFIX}/${ADODB_DIR}/tohtml\.inc\.php#' ${WRKSRC}/${file}
+	@${PERL} -pi -e 's#adodb-session\.php#${PREFIX}/${ADODB_DIR}/adodb-session\.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 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-session.php \
+	adodb-sybase.inc.php adodb-vfp.inc.php adodb.inc.php tohtml.inc.php
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/${ADODB_DIR}
+.endfor
+	@${MKDIR} ${PREFIX}/${ADODB_TEST}
+.for file in benchmark.php client.php server.php test.php test2.php test3.php \
+	testcache.php testdatabases.inc.php readme.txt
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/${ADODB_TEST}
+.endfor
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/${ADODB_DOC}
+.for doc in readme.htm tute.htm license.txt
+	@${INSTALL_MAN} ${WRKSRC}/${doc} ${PREFIX}/${ADODB_DOC}
+.endfor
+.endif
+	@${ECHO_MSG} "------------------------------------------------------------------------"
+	@${ECHO_MSG} " The ADODB test scripts are installed in ${PREFIX}/${ADODB_TEST}"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " To test your ADODB installation:"
+	@${ECHO_MSG} " Open ${PREFIX}/${ADODB_TEST}/testdatabases.inc.php and modify the"
+	@${ECHO_MSG} " connection parameters to suit your database."
+	@${ECHO_MSG} " Copy the files in ${PREFIX}/${ADODB_TEST} to a directory that is"
+	@${ECHO_MSG} " readable by your web server and you should be able to run the tests from"
+	@${ECHO_MSG} " that directory. Read ${PREFIX}/${ADODB_TEST}/readme.txt for more"
+	@${ECHO_MSG} " information about each test."
+	@${ECHO_MSG} "-------------------------------------------------------------------------"
 
 .include <bsd.port.mk>
Index: pkg-comment
===================================================================
RCS file: /home/ago/etc/cvsroot/ports/databases/adodb/pkg-comment,v
retrieving revision 1.2
diff -u -r1.2 pkg-comment
--- pkg-comment	2001/07/07 19:32:03	1.2
+++ pkg-comment	2001/07/10 09:24:26
@@ -1 +1 @@
-A high quality database library for PHP4
+A database wrapper library for PHP4
Index: pkg-descr
===================================================================
RCS file: /home/ago/etc/cvsroot/ports/databases/adodb/pkg-descr,v
retrieving revision 1.3
diff -u -r1.3 pkg-descr
--- pkg-descr	2001/07/07 22:23:30	1.3
+++ pkg-descr	2001/07/10 20:10:41
@@ -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
-
Index: pkg-plist
===================================================================
RCS file: /home/ago/etc/cvsroot/ports/databases/adodb/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- pkg-plist	2001/07/07 20:50:53	1.4
+++ pkg-plist	2001/07/10 20:46:09
@@ -1,37 +1,38 @@
-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-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
+%%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
+%%ADODB_DIR%%/adodb-sybase.inc.php
+%%ADODB_DIR%%/adodb-vfp.inc.php
+%%ADODB_DIR%%/adodb.inc.php
+%%ADODB_DIR%%/tohtml.inc.php
+%%ADODB_TEST%%/benchmark.php
+%%ADODB_TEST%%/client.php
+%%ADODB_TEST%%/readme.txt
+%%ADODB_TEST%%/server.php
+%%ADODB_TEST%%/test.php
+%%ADODB_TEST%%/test2.php
+%%ADODB_TEST%%/test3.php
+%%ADODB_TEST%%/testcache.php
+%%ADODB_TEST%%/testdatabases.inc.php
+%%PORTDOCS%%share/doc/adodb/license.txt
+%%PORTDOCS%%share/doc/adodb/readme.htm
+%%PORTDOCS%%share/doc/adodb/tute.htm
+%%PORTDOCS%%@dirrm share/doc/adodb
+@dirrm %%ADODB_DIR%%
 @dirrm share/doc/apache/php
-@dirrm share/doc/adodb
+@dirrm %%ADODB_TEST%%
Index: files/patch-adodb-odbc.inc.php
===================================================================
RCS file: /home/ago/etc/cvsroot/ports/databases/adodb/files/patch-adodb-odbc.inc.php,v
retrieving revision 1.1
diff -u -r1.1 patch-adodb-odbc.inc.php
--- files/patch-adodb-odbc.inc.php	2001/06/29 10:32:50	1.1
+++ files/patch-adodb-odbc.inc.php	2001/07/10 18:25:47
@@ -1,20 +0,0 @@
---- adodb-odbc.inc.php.orig	Wed Jun  6 06:17:56 2001
-+++ adodb-odbc.inc.php	Thu Jun 28 10:00:41 2001
-@@ -310,7 +310,7 @@
- 	{
- 		if ($this->_numOfRows != 0 && !$this->EOF) {		
- 			$this->_currentRow++;
--			if (odbc_fetch_into($this->_queryID,0,$this->fields)) return true;
-+			if (odbc_fetch_into($this->_queryID,$row=0,$this->fields)) return true;
- 		}
- 		$this->EOF = true;
- 		return false;
-@@ -318,7 +318,7 @@
- 	
- 	function _fetch($ignore_fields=false)
- 	{
--		return odbc_fetch_into($this->_queryID,0,$this->fields);
-+		return odbc_fetch_into($this->_queryID,$row=0,$this->fields);
- 	}
- 	
- 	function _close() {
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010710205007.31951.qmail>