--- Makefile	2009-03-31 23:02:49.000000000 +0800
+++ Makefile	2009-04-01 07:13:58.000000000 +0800
@@ -6,7 +6,7 @@ 
 #
 
 PORTNAME=	XML_Query2XML
-PORTVERSION=	1.7.0
+PORTVERSION=	1.7.1
 CATEGORIES=	databases pear
 
 MAINTAINER=	wenheping@gmail.com
@@ -16,25 +16,30 @@ 
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 LATEST_LINK=	pear-XML_Query2xml
-OPTIONS=	PEAR_MDB2 "Add support for pear-MDB2" Off
+OPTIONS=	PEAR_MDB2 "Add support for pear-MDB2" Off \
+		PEAR_Net_LDAP2 "Add support for pear-Net_LDAP2" Off
+
+FILES=	XML/Query2XML.php XML/Query2XML/ISO9075Mapper.php \
+	XML/Query2XML/Callback.php \
+	XML/Query2XML/Data.php \
+	XML/Query2XML/Data/Condition/NonEmpty.php \
+	XML/Query2XML/Data/Condition.php \
+	XML/Query2XML/Data/Processor/Base64.php \
+	XML/Query2XML/Data/Processor/CDATA.php \
+	XML/Query2XML/Data/Processor/Unserialize.php \
+	XML/Query2XML/Data/Processor.php \
+	XML/Query2XML/Data/Source/ColumnValue.php \
+	XML/Query2XML/Data/Source/PHPCallback.php \
+	XML/Query2XML/Data/Source/Static.php \
+	XML/Query2XML/Data/Source.php \
+	XML/Query2XML/Driver/ADOdb.php \
+	XML/Query2XML/Driver/DB.php \
+	XML/Query2XML/Driver/Caching.php \
+	XML/Query2XML/Driver/LDAP.php \
+	XML/Query2XML/Driver/MDB2.php \
+	XML/Query2XML/Driver/PDO.php \
+	XML/Query2XML/Driver/LDAP2.php
 
-CATEGORY=	XML
-FILES=		XML/Query2XML.php XML/Query2XML/ISO9075Mapper.php \
-		XML/Query2XML/Callback.php \
-		XML/Query2XML/Command/Base64.php \
-		XML/Query2XML/Command/CDATA.php \
-		XML/Query2XML/Command/Chain.php \
-		XML/Query2XML/Command/ColumnValue.php \
-		XML/Query2XML/Command/NonEmpty.php \
-		XML/Query2XML/Command/PHPCallback.php \
-		XML/Query2XML/Command/Static.php \
-		XML/Query2XML/Command/Unserialize.php \
-		XML/Query2XML/Driver/ADOdb.php \
-		XML/Query2XML/Driver/DB.php \
-		XML/Query2XML/Driver/LDAP.php \
-		XML/Query2XML/Driver/MDB2.php \
-		XML/Query2XML/Driver/PDO.php \
-		XML/Query2XML/Driver/LDAP2.php
 DOCS=	case01/case01.php case01/case01.xml case02/case02.log \
 	case02/case02.php case02/case02.profile \
 	case02/case02.xml case02/case02_debug.php \
@@ -50,6 +55,7 @@ 
 	case08/case08.php case08/case08.profile case08/case08.xml \
 	case08/case08_debug.php
 _DOCSDIR=	cases
+
 TESTS=	Query2XML_Tests.psql \
 	Query2XML_Tests.sq2 \
 	Query2XML_Tests.sql \
@@ -280,6 +286,8 @@ 
 	XML_Query2XML/LDAP/getXML/throwLDAPException_queryError.phpt \
 	XML_Query2XML/LDAP/ldap_init.php \
 	XML_Query2XML/LDAP/skipif.php \
+	XML_Query2XML/NoDBLayer/factory/throwConfigException.phpt \
+	XML_Query2XML/NoDBLayer/factory/throwDBException.phpt \
 	XML_Query2XML/settings.php \
 	XML_Query2XML_ISO9075Mapper/map/_X_UC.phpt \
 	XML_Query2XML_ISO9075Mapper/map/_x.phpt \
@@ -316,5 +324,9 @@ 
 BUILD_DEPENDS+=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
 .endif
 
+.if defined(WITH_PEAR_Net_LDAP2)
+BUILD_DEPENDS+=	${PEARDIR}/Net/LDAP2.php:${PORTSDIR}/net/pear-Net_LDAP2
+.endif
+
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- distinfo	2008-05-06 20:22:21.000000000 +0800
+++ distinfo	2009-03-31 23:04:32.000000000 +0800
@@ -1,3 +1,3 @@ 
-MD5 (PEAR/XML_Query2XML-1.7.0.tgz) = 989171d373b1cdfece39603824192ce3
-SHA256 (PEAR/XML_Query2XML-1.7.0.tgz) = 4c45e7c96b19be6c1f643fd99a50b56c0b5271df41502ff8a55772eacc3edc8e
-SIZE (PEAR/XML_Query2XML-1.7.0.tgz) = 142345
+MD5 (PEAR/XML_Query2XML-1.7.1.tgz) = 0d669e5326401bcd257b3954500fd79d
+SHA256 (PEAR/XML_Query2XML-1.7.1.tgz) = b43407cab18d683b0d2501dc912958c8e5f87d3246e51a11c541d703d7cb03bd
+SIZE (PEAR/XML_Query2XML-1.7.1.tgz) = 169218