2 files changed, 25 insertions, 19 deletions

diff --git a/devel/pear-PHP_CompatInfo/Makefile b/devel/pear-PHP_CompatInfo/Makefile
index f3ad6afbe68e..7ef4c1c5e10d 100644
--- a/devel/pear-PHP_CompatInfo/Makefile
+++ b/devel/pear-PHP_CompatInfo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	PHP_CompatInfo
-PORTVERSION=	1.5.1
+PORTVERSION=	1.6.1
 CATEGORIES=	devel pear
 
 MAINTAINER=	chinsan@FreeBSD.org
@@ -21,29 +21,27 @@ USE_DOS2UNIX=	yes
 CATEGORY=	PHP
 FILES=		CompatInfo/Cli.php CompatInfo/const_array.php \
 		CompatInfo/func_array.php CompatInfo.php
-DOCS=		TDG/img/admons/caution.png TDG/img/admons/important.png \
-		TDG/img/admons/note.png TDG/img/admons/tip.png \
-		TDG/img/admons/warning.png TDG/img/created-with-docbook.png \
-		TDG/img/external-link.gif TDG/img/pearsmall.gif TDG/book.css \
-		TDG/ch01.html TDG/ch01s02.html TDG/ch01s03.html TDG/ch02.html \
-		TDG/ch02s02.html TDG/ch02s03.html TDG/ch02s04.html \
-		TDG/ch02s05.html TDG/ch02s06.html TDG/ch02s07.html \
-		TDG/ch02s08.html TDG/ch03.html TDG/ch03s02.html \
-		TDG/ch04.html TDG/ch04s02.html TDG/ch05.html TDG/ch05s02.html \
-		TDG/ch06.html TDG/ch06s02.html TDG/ch07.html TDG/ch07s02.html \
-		TDG/ch08.html TDG/index.html TDG/pr01.html TDG/pr01s02.html \
-		TDG/pt01.html TDG/pt02.html TDG/pt03.html TDG/re01.html \
-		TDG/re02.html TDG/re03.html TDG/re04.html TDG/re05.html
 EXAMPLES=	checkConstants.php checkExtensions.php checkPHP5.php \
 		ci_frontend.php cliCustom.php cliOutput.txt \
 		ignorePHP5implements.php parseArray.php parseDir.php \
 		parseFile.php parseString.php
-TESTS=		checkMax.php sample_req6056.php
+TESTS=		emptyDir/empty_dir.txt parseDir/PHP5/tokens.php5 \
+		parseDir/extensions.php parseDir/phpinfo.php \
+		parseFile/conditional.php parseFile/empty.php \
+		parseFile/math.php parseFile/PackageUpdate.php \
+		parseFile/php5_method_chaining.php \
+		parseFile/php5_method_chaining_samp2.php \
+		parseFile/phpweb-entities.php parseFile/zip.php AllTests.php \
+		checkMax.php PHP_CompatInfo_TestSuite_Bugs.php \
+		PHP_CompatInfo_TestSuite_Cli.php \
+		PHP_CompatInfo_TestSuite_Standard.php sample_req6056.php
 _EXAMPLESDIR=	docs/examples
 
 LATEST_LINK=	pear-PHP_CompatInfo
 OPTIONS=	PEAR_CONSOLE_TABLE "PEAR::Console_Table support" off \
-		PEAR_CONSOLE_GETARGS "PEAR::Console_Getargs support" off
+		PEAR_CONSOLE_GETARGS "PEAR::Console_Getargs support" off \
+		PEAR_PHPUNIT "PEAR::PHPUnit support" on \
+		PEAR_XML_UTIL "PEAR::XML_Util support" on
 
 .include <bsd.port.pre.mk>
 
@@ -55,5 +53,13 @@ RUN_DEPENDS+=	${PEARDIR}/Console/Table.php:${PORTSDIR}/devel/pear-Console_Table
 RUN_DEPENDS+=	${PEARDIR}/Console/Console_TestListener.php:${PORTSDIR}/devel/pear-Console_Getargs
 .endif
 
+.if defined(WITH_PEAR_PHPUNIT)
+RUN_DEPENDS+=	${PEARDIR}/PHPUnit.php:${PORTSDIR}/devel/pear-PHPUnit
+.endif
+
+.if defined(WITH_PEAR_XML_UTIL)
+RUN_DEPENDS+=	${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
+.endif
+
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-PHP_CompatInfo/distinfo b/devel/pear-PHP_CompatInfo/distinfo
index 38de7aa8feec..01d50cc3e0a2 100644
--- a/devel/pear-PHP_CompatInfo/distinfo
+++ b/devel/pear-PHP_CompatInfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (PEAR/PHP_CompatInfo-1.5.1.tgz) = 0180665d11d4c3dae706b6cbd3f21ba7
-SHA256 (PEAR/PHP_CompatInfo-1.5.1.tgz) = 911e6fe8af7ad05ecdbbd2ada4e16f5cebfad9323b4af12cfab819aff59d31bf
-SIZE (PEAR/PHP_CompatInfo-1.5.1.tgz) = 122434
+MD5 (PEAR/PHP_CompatInfo-1.6.1.tgz) = 595282cf8c6aaa4bd10fcd0a20d00ac2
+SHA256 (PEAR/PHP_CompatInfo-1.6.1.tgz) = 96816647351e2391504d3800af66e0c147e797c6449286643311de96e91ed041
+SIZE (PEAR/PHP_CompatInfo-1.6.1.tgz) = 96119