Attachment 20581 Details for Bug 36287 – file.diff

[patch] file.diff

file.diff (text/plain), 9.07 KB, created by ago on 2002-03-25 10:50:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ago

Created: 2002-03-25 10:50:03 UTC

Size: 9.07 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ago/etc/cvsroot/ports/databases/adodb/Makefile,v
>retrieving revision 1.27
>diff -u -r1.27 Makefile
>--- Makefile	22 Feb 2002 23:32:40 -0000	1.27
>+++ Makefile	25 Mar 2002 10:22:45 -0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	adodb
>-PORTVERSION=	1.72
>+PORTVERSION=	1.81
> CATEGORIES=	databases www
> MASTER_SITES=	http://phplens.com/lens/dl/
> DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
>@@ -19,49 +19,101 @@
> WRKSRC=		${WRKDIR}/${PORTNAME}
> NO_BUILD=	YES
> 
>-ADODB_DIR=	www/data.default/adodb
>-ADODB_TEST=	share/examples/adodb
>+ADODB_DIR=	www/data.default/php/adodb
>+ADODB_DRIVERS=	${ADODB_DIR}/drivers
>+ADODB_TESTS=	${ADODB_DIR}/tests
> PLIST_SUB=	ADODB_DIR=${ADODB_DIR} \
>-		ADODB_TEST=${ADODB_TEST} \
>+		ADODB_DRIVERS=${ADODB_DRIVERS} \
>+		ADODB_TESTS=${ADODB_TESTS} \
> 		DOCSDIR=share/doc/adodb
> 
>-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-borland_ibase.inc.php adodb-csv.inc.php \
>-	adodb-csvlib.inc.php adodb-db2.inc.php adodb-errorhandler.inc.php \
>-	adodb-errorpear.inc.php adodb-fbsql.inc.php adodb-firebird.inc.php \
>-	adodb-ibase.inc.php adodb-informix.inc.php adodb-lib.inc.php \
>-	adodb-mssql.inc.php adodb-mysql.inc.php adodb-mysqlt.inc.php \
>-	adodb-oci8.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-pear.inc.php adodb-postgres.inc.php \
>-	adodb-postgres7.inc.php adodb-proxy.inc.php adodb-sybase.inc.php \
>-	adodb.inc.php adodb-vfp.inc.php crypt.inc.php tohtml.inc.php
>-PICS=	adodb.gif adodb.png adodb2.gif adodb2.png
>-SAMPLES=adodb-cryptsession.php adodb-session.php server.php
>-TESTS=	benchmark.php client.php test.php test2.php test3.php test4.php \
>-	test5.php testcache.php testdatabases.inc.php testoci8.php \
>-	testpaging.php testpear.php testsessions.php
>-
>-post-patch:
>-.for FILE in adodb-session.php benchmark.php client.php server.php test.php \
>-	test2.php test3.php test4.php test5.php testcache.php testoci8.php \
>-	testpaging.php testpear.php testsessions.php
>-	${PERL} -pi -e "s#(\./)?(adodb(-session|-pear)?|tohtml)+(\.inc)?\.php#${PREFIX}/${ADODB_DIR}/\2\4\.php#" ${WRKSRC}/${FILE}
>-.endfor
>+DOCS=		readme.htm tute.htm readme.txt
>+
>+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-mssql.inc.php \
>+		drivers/adodb-mysql.inc.php \
>+		drivers/adodb-mysqlt.inc.php \
>+		drivers/adodb-oci8.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-postgres7.inc.php \
>+		drivers/adodb-proxy.inc.php \
>+		drivers/adodb-sybase.inc.php \
>+		drivers/adodb-vfp.inc.php \
>+
>+INCLUDES=	adodb-csvlib.inc.php \
>+		adodb-errorhandler.inc.php \
>+		adodb-errorpear.inc.php \
>+		adodb-pear.inc.php \
>+		adodb-lib.inc.php \
>+		adodb.inc.php \
>+		client.php \
>+		crypt.inc.php \
>+		tohtml.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.php \
>+		server.php
>+
>+TESTS=		tests/benchmark.php \
>+		tests/test.php \
>+		tests/test2.php \
>+		tests/test3.php \
>+		tests/test4.php \
>+		tests/test5.php \
>+		tests/testcache.php \
>+		tests/testdatabases.inc.php \
>+		tests/testoci8.php \
>+		tests/testpaging.php \
>+		tests/testpear.php \
>+		tests/testsessions.php
> 
> do-install:
>-	@${MKDIR} ${PREFIX}/${ADODB_DIR}
>+	@${MKDIR} ${PREFIX}/${ADODB_DRIVERS}
>+	@${MKDIR} ${PREFIX}/${ADODB_TESTS}
>+.for FILE in ${DRIVERS}
>+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_DRIVERS}
>+.endfor
>+.for FILE in ${INCLUDES}
>+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_DIR}/${FILE}
>+.endfor
>+.for FILE in ${PICS}
>+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_DIR}
>+.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
> .endfor
>-.for FILE in ${LIBS} ${PICS}
>-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_DIR}
>-.endfor
>-	@${MKDIR} ${PREFIX}/${ADODB_TEST}
> .for FILE in ${TESTS}
>-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${ADODB_TEST}
>+	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
> .endfor
> 
> post-install:
>Index: distinfo
>===================================================================
>RCS file: /home/ago/etc/cvsroot/ports/databases/adodb/distinfo,v
>retrieving revision 1.12
>diff -u -r1.12 distinfo
>--- distinfo	22 Feb 2002 23:32:40 -0000	1.12
>+++ distinfo	25 Mar 2002 08:43:01 -0000
>@@ -1 +1 @@
>-MD5 (adodb172.tgz) = 882db4caed8893f76ba27537d3b1426c
>+MD5 (adodb181.tgz) = 9e1fb91ec20ca1de71c3363cec7d009c
>Index: pkg-plist
>===================================================================
>RCS file: /home/ago/etc/cvsroot/ports/databases/adodb/pkg-plist,v
>retrieving revision 1.14
>diff -u -r1.14 pkg-plist
>--- pkg-plist	22 Feb 2002 23:32:40 -0000	1.14
>+++ pkg-plist	25 Mar 2002 10:39:08 -0000
>@@ -1,59 +1,61 @@
>-%%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-borland_ibase.inc.php
> %%ADODB_DIR%%/adodb-cryptsession.php.sample
>-%%ADODB_DIR%%/adodb-csv.inc.php
> %%ADODB_DIR%%/adodb-csvlib.inc.php
>-%%ADODB_DIR%%/adodb-db2.inc.php
> %%ADODB_DIR%%/adodb-errorhandler.inc.php
> %%ADODB_DIR%%/adodb-errorpear.inc.php
>-%%ADODB_DIR%%/adodb-fbsql.inc.php
>-%%ADODB_DIR%%/adodb-firebird.inc.php
>-%%ADODB_DIR%%/adodb-ibase.inc.php
>-%%ADODB_DIR%%/adodb-informix.inc.php
> %%ADODB_DIR%%/adodb-lib.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-oci8po.inc.php
>-%%ADODB_DIR%%/adodb-odbc.inc.php
>-%%ADODB_DIR%%/adodb-odbc_mssql.inc.php
>-%%ADODB_DIR%%/adodb-odbc_oracle.inc.php
>-%%ADODB_DIR%%/adodb-oracle.inc.php
> %%ADODB_DIR%%/adodb-pear.inc.php
>-%%ADODB_DIR%%/adodb-postgres.inc.php
>-%%ADODB_DIR%%/adodb-postgres7.inc.php
>-%%ADODB_DIR%%/adodb-proxy.inc.php
> %%ADODB_DIR%%/adodb-session.php.sample
>-%%ADODB_DIR%%/adodb-sybase.inc.php
>-%%ADODB_DIR%%/adodb-vfp.inc.php
> %%ADODB_DIR%%/adodb.gif
> %%ADODB_DIR%%/adodb.inc.php
> %%ADODB_DIR%%/adodb.png
> %%ADODB_DIR%%/adodb2.gif
> %%ADODB_DIR%%/adodb2.png
>+%%ADODB_DIR%%/client.php
> %%ADODB_DIR%%/crypt.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%%/test4.php
>-%%ADODB_TEST%%/test5.php
>-%%ADODB_TEST%%/testcache.php
>-%%ADODB_TEST%%/testdatabases.inc.php
>-%%ADODB_TEST%%/testoci8.php
>-%%ADODB_TEST%%/testpaging.php
>-%%ADODB_TEST%%/testpear.php
>-%%ADODB_TEST%%/testsessions.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-mssql.inc.php
>+%%ADODB_DRIVERS%%/adodb-mysql.inc.php
>+%%ADODB_DRIVERS%%/adodb-mysqlt.inc.php
>+%%ADODB_DRIVERS%%/adodb-oci8.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-postgres7.inc.php
>+%%ADODB_DRIVERS%%/adodb-proxy.inc.php
>+%%ADODB_DRIVERS%%/adodb-sybase.inc.php
>+%%ADODB_DRIVERS%%/adodb-vfp.inc.php
>+%%ADODB_TESTS%%/benchmark.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%%/testoci8.php.sample
>+%%ADODB_TESTS%%/testpaging.php.sample
>+%%ADODB_TESTS%%/testpear.php.sample
>+%%ADODB_TESTS%%/testsessions.php.sample
> %%PORTDOCS%%%%DOCSDIR%%/readme.htm
> %%PORTDOCS%%%%DOCSDIR%%/readme.txt
> %%PORTDOCS%%%%DOCSDIR%%/tute.htm
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>+@dirrm %%ADODB_DRIVERS%%
>+@dirrm %%ADODB_TESTS%%
> @dirrm %%ADODB_DIR%%
>-@dirrm %%ADODB_TEST%%
>+@dirrm www/data.default/php

Actions: View | Diff

Attachments on bug 36287: 20581