2 files changed, 26 insertions, 31 deletions

diff --git a/databases/pear-MDB2/Makefile b/databases/pear-MDB2/Makefile
index 5b51ced084cf..3285329ccc5c 100644
--- a/databases/pear-MDB2/Makefile
+++ b/databases/pear-MDB2/Makefile
@@ -7,60 +7,55 @@
 
 PORTNAME=	MDB2
 PORTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	databases www pear
-DISTNAME=	${PORTNAME}-${PORTVERSION}beta2
+DISTNAME=	${PORTNAME}-${PORTVERSION}beta3
 
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR database abstraction layer
 
-BUILD_DEPENDS=  ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
-RUN_DEPENDS=    ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
-
-USE_PHP=	yes
+BUILD_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 FILES=		MDB2/Date.php MDB2/Extended.php MDB2/Iterator.php MDB2/LOB.php \
 		MDB2/Driver/fbsql.php MDB2/Driver/ibase.php MDB2/Driver/mssql.php \
-		MDB2/Driver/mysql.php MDB2/Driver/oci8.php MDB2/Driver/pgsql.php \
-		MDB2/Driver/querysim.php MDB2/Driver/sqlite.php \
+		MDB2/Driver/mysql.php MDB2/Driver/mysqli.php MDB2/Driver/oci8.php \
+		MDB2/Driver/pgsql.php MDB2/Driver/querysim.php MDB2/Driver/sqlite.php \
 		MDB2/Driver/Datatype/Common.php MDB2/Driver/Datatype/fbsql.php \
 		MDB2/Driver/Datatype/ibase.php MDB2/Driver/Datatype/mssql.php \
-		MDB2/Driver/Datatype/mysql.php MDB2/Driver/Datatype/oci8.php \
-		MDB2/Driver/Datatype/pgsql.php MDB2/Driver/Datatype/sqlite.php \
-		MDB2/Driver/Manager/Common.php MDB2/Driver/Manager/fbsql.php \
-		MDB2/Driver/Manager/ibase.php MDB2/Driver/Manager/mssql.php \
-		MDB2/Driver/Manager/mysql.php MDB2/Driver/Manager/oci8.php \
+		MDB2/Driver/Datatype/mysql.php MDB2/Driver/Datatype/mysqli.php \
+		MDB2/Driver/Datatype/oci8.php MDB2/Driver/Datatype/pgsql.php \
+		MDB2/Driver/Datatype/sqlite.php MDB2/Driver/Manager/Common.php \
+		MDB2/Driver/Manager/fbsql.php MDB2/Driver/Manager/ibase.php \
+		MDB2/Driver/Manager/mssql.php MDB2/Driver/Manager/mysql.php \
+		MDB2/Driver/Manager/mysqli.php MDB2/Driver/Manager/oci8.php \
 		MDB2/Driver/Manager/pgsql.php MDB2/Driver/Manager/sqlite.php \
 		MDB2/Driver/Native/fbsql.php MDB2/Driver/Native/ibase.php \
 		MDB2/Driver/Native/mssql.php MDB2/Driver/Native/mysql.php \
-		MDB2/Driver/Native/oci8.php MDB2/Driver/Native/pgsql.php \
-		MDB2/Driver/Native/sqlite.php MDB2/Driver/Reverse/Common.php \
-		MDB2/Driver/Reverse/fbsql.php MDB2/Driver/Reverse/ibase.php \
-		MDB2/Driver/Reverse/mssql.php MDB2/Driver/Reverse/mysql.php \
+		MDB2/Driver/Native/mysqli.php MDB2/Driver/Native/oci8.php \
+		MDB2/Driver/Native/pgsql.php MDB2/Driver/Native/sqlite.php \
+		MDB2/Driver/Reverse/Common.php MDB2/Driver/Reverse/fbsql.php \
+		MDB2/Driver/Reverse/ibase.php MDB2/Driver/Reverse/mssql.php \
+		MDB2/Driver/Reverse/mysql.php MDB2/Driver/Reverse/mysqli.php \
 		MDB2/Driver/Reverse/oci8.php MDB2/Driver/Reverse/pgsql.php \
 		MDB2/Driver/Reverse/sqlite.php MDB2/Tools/Manager.php \
-		MDB2/Tools/Parser.php MDB2/Tools/reverse_engineer_xml_schema.php \
+		MDB2/Tools/reverse_engineer_xml_schema.php \
+		MDB2/Tools/Manager/Parser.php MDB2/Tools/Manager/Writer.php \
 		MDB2/Wrapper/peardb.php MDB2.php
 DOCS=		CONTRIBUTORS datatypes.html Driver_Datatype_skeleton.php \
 		Driver_Manager_skeleton.php Driver_Native_skeleton.php \
 		Driver_Reverse_skeleton.php Driver_skeleton.php MAINTAINERS \
 		MDB.dtd MDB.xsl querysim_readme.txt README STATUS TODO \
-		xml_schema_documentation.html examples/example.php \
-		examples/metapear_test_db.schema examples/peardb_wrapper_example.php
+		xml_schema_documentation.html
+EXAMPLES=	example.php metapear_test_db.schema peardb_wrapper_example.php
 TESTS=		clitest.php Console_TestListener.php driver_test.schema \
 		HTML_TestListener.php lob_test.schema MDB2_api_testcase.php \
 		MDB2_bugs_testcase.php MDB2_manager_testcase.php \
 		MDB2_native_testcase.php MDB2_reverse_testcase.php \
-		MDB2_usage_testcase.php README test.php test.schema \
-		testchoose.php tests.css testUtils.php test_setup.php.dist \
-		templates/results.tpl
+		MDB2_usage_testcase.php README test.php testchoose.php \
+		tests.css testUtils.php test_setup.php.dist templates/results.tpl
+_EXAMPLESDIR=	docs/examples
 
 .include <bsd.port.pre.mk>
-
-PHP_VERS=       ${PHP_VERSION:S/.//g}
-
-.if defined(PHP_VERS) && ${PHP_VERS} < 420
-IGNORE=         "You need PHP 4.2.0 or later to install PEAR::MDB2"
-.endif
-
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/databases/pear-MDB2/distinfo b/databases/pear-MDB2/distinfo
index f7761be9a0b7..93193d8f00b6 100644
--- a/databases/pear-MDB2/distinfo
+++ b/databases/pear-MDB2/distinfo
@@ -1,2 +1,2 @@
-MD5 (PEAR/MDB2-2.0.0beta2.tgz) = 202829a526d27207bc46823b3b5b8553
-SIZE (PEAR/MDB2-2.0.0beta2.tgz) = 176377
+MD5 (PEAR/MDB2-2.0.0beta3.tgz) = 0718e2dd50d306a9852b1050698c7339
+SIZE (PEAR/MDB2-2.0.0beta3.tgz) = 190209