--- Makefile.orig	2008-06-07 02:00:20.000000000 +0800
+++ Makefile	2008-06-07 02:43:31.000000000 +0800
@@ -6,19 +6,20 @@
 #
 
 PORTNAME=	DB_Table
-PORTVERSION=	1.5.2
+PORTVERSION=	1.5.3
 PORTEPOCH=	1
 CATEGORIES=	databases www pear
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR object-oriented interface to a database table
 
-BUILD_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB \
-		${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 LATEST_LINK=	pear-DB_Table
-OPTIONS=	PEAR_HTML_QUICKFORM "PEAR::HTML_QuickForm support" off
+OPTIONS=	PEAR_HTML_QUICKFORM "PEAR::HTML_QuickForm support" off \
+		PEAR_DB "PEAR::DB support" off \
+		PEAR_MDB2 "PEAR::MDB2 support" off
 
 CATEGORY=	DB
 FILES=		Table.php Table/Manager/ibase.php Table/Manager/mysql.php \
@@ -26,7 +27,7 @@
 		Table/Manager/pgsql.php Table/Manager/sqlite.php \
 		Table/Date.php Table/Manager.php Table/QuickForm.php \
 		Table/Valid.php \
-                Table/Base.php Table/XML.php \
+		Table/Base.php Table/XML.php \
 		Table/Generator.php Table/Database.php
 DOCS=		_sources.txt all-words.txt mssql-words.txt mysql-words.txt \
 		oci8-words.txt pgsql-words.txt sql92-words.txt sql99-words.txt \
@@ -78,5 +79,13 @@
 RUN_DEPENDS+=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
 .endif
 
+.if defined(WITH_PEAR_DB)
+RUN_DEPENDS+=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
+.endif
+
+.if defined(WITH_PEAR_MDB2)
+RUN_DEPENDS+=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
+.endif
+
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- distinfo.orig	2008-06-06 19:38:22.000000000 +0800
+++ distinfo	2008-06-07 02:03:38.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (PEAR/DB_Table-1.5.2.tgz) = f50ae69730c28554acf30d0a840c4e82
-SHA256 (PEAR/DB_Table-1.5.2.tgz) = 849a3d63dff8b28150887e0a8c22875c6501edcc74eb3a9001a19f292126ed40
-SIZE (PEAR/DB_Table-1.5.2.tgz) = 116132
+MD5 (PEAR/DB_Table-1.5.3.tgz) = 3b9d586258fcaccb067900972ba4e089
+SHA256 (PEAR/DB_Table-1.5.3.tgz) = 604cd09d1730e32ff68fa4fb4e014f697cb7f67b9c2f9b70eb8dace626e569fb
+SIZE (PEAR/DB_Table-1.5.3.tgz) = 116152