2 files changed, 33 insertions, 29 deletions

diff --git a/devel/pear-PHPUnit2/Makefile b/devel/pear-PHPUnit2/Makefile
index f5f3334e90b1..f51417f3dec9 100644
--- a/devel/pear-PHPUnit2/Makefile
+++ b/devel/pear-PHPUnit2/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	PHPUnit2
-PORTVERSION=	2.1.6
-PORTEPOCH=	3
-CATEGORIES=	devel www pear
+PORTVERSION=	2.2.0
+CATEGORIES=	devel pear
 
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR regression testing framework for unit tests
@@ -17,7 +16,7 @@ BUILD_DEPENDS=	${PEARDIR}/Benchmark/Timer.php:${PORTSDIR}/benchmarks/pear-Benchm
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 LATEST_LINK=	pear-PHPUnit2
-OPTIONS=	PEAR_LOG "PEAR::Log support" Off
+OPTIONS=	PEAR_LOG "PEAR::Log support" off
 
 NO_PACKAGE=	Conflicting dependences between PHP4 and PHP5
 
@@ -33,35 +32,39 @@ FILES=		Extensions/CodeCoverage/Renderer/HTML.php \
 		Extensions/Log/XML.php Extensions/TestDox/ResultPrinter/HTML.php \
 		Extensions/TestDox/ResultPrinter/Text.php \
 		Extensions/TestDox/NamePrettifier.php \
-		Extensions/TestDox/ResultPrinter.php Extensions/ExceptionTestCase.php \
-		Extensions/PerformanceTestCase.php Extensions/RepeatedTest.php \
+		Extensions/TestDox/ResultPrinter.php \
+		Extensions/ExceptionTestCase.php Extensions/PerformanceTestCase.php \
+		Extensions/RepeatedTest.php \
 		Extensions/TestDecorator.php Extensions/TestSetup.php \
 		Framework/Assert.php Framework/AssertionFailedError.php \
-		Framework/ComparisonFailure.php Framework/IncompleteTest.php \
-		Framework/IncompleteTestError.php Framework/Test.php \
-		Framework/TestCase.php Framework/TestFailure.php \
+		Framework/Error.php Framework/ComparisonFailure.php \
+		Framework/IncompleteTest.php Framework/IncompleteTestError.php \
+		Framework/Test.php Framework/TestCase.php Framework/TestFailure.php \
 		Framework/TestListener.php Framework/TestResult.php \
-		Framework/TestSuite.php Framework/Warning.php Runner/BaseTestRunner.php \
-		Runner/IncludePathTestCollector.php Runner/StandardTestSuiteLoader.php \
-		Runner/TestCollector.php Runner/TestRunListener.php \
-		Runner/TestSuiteLoader.php Runner/Version.php Tests/Framework/AllTests.php \
-		Tests/Framework/AssertTest.php Tests/Framework/ComparisonFailureTest.php \
-		Tests/Framework/SuiteTest.php Tests/Framework/TestCaseTest.php \
-		Tests/Framework/TestImplementorTest.php Tests/Framework/TestListenerTest.php \
-		Tests/Extensions/TestDox/AllTests.php \
-		Tests/Extensions/TestDox/NamePrettifierTest.php Tests/Extensions/AllTests.php \
-		Tests/Extensions/ExceptionTestCaseTest.php Tests/Extensions/ExtensionTest.php \
+		Framework/TestSuite.php Framework/Warning.php \
+		Runner/BaseTestRunner.php Runner/IncludePathTestCollector.php \
+		Runner/StandardTestSuiteLoader.php Runner/TestCollector.php \
+		Runner/TestRunListener.php Runner/TestSuiteLoader.php \
+		Runner/Version.php Tests/Framework/AllTests.php \
+		Tests/Framework/AssertTest.php \
+		Tests/Framework/ComparisonFailureTest.php Tests/Framework/SuiteTest.php \
+		Tests/Framework/TestCaseTest.php Tests/Framework/TestImplementorTest.php \
+		Tests/Framework/TestListenerTest.php Tests/Extensions/TestDox/AllTests.php \
+		Tests/Extensions/TestDox/NamePrettifierTest.php \
+		Tests/Extensions/AllTests.php Tests/Extensions/ExceptionTestCaseTest.php \
+		Tests/Extensions/ExtensionTest.php \
 		Tests/Extensions/PerformanceTestCaseTest.php \
 		Tests/Extensions/RepeatedTestTest.php Tests/Runner/AllTests.php \
 		Tests/Runner/BaseTestRunnerTest.php Tests/AllTests.php \
 		Tests/DoubleTestCase.php Tests/Error.php Tests/Failure.php \
-		Tests/InheritedTestCase.php Tests/MockRunner.php Tests/NoArgTestCaseTest.php \
-		Tests/NonStatic.php Tests/NoTestCaseClass.php Tests/NoTestCases.php \
-		Tests/NotPublicTestCase.php Tests/NotVoidTestCase.php Tests/OneTestCase.php \
-		Tests/OverrideTestCase.php Tests/SetupFailure.php Tests/Sleep.php \
-		Tests/Success.php Tests/TearDownFailure.php Tests/ThrowExceptionTestCase.php \
-		Tests/ThrowNoExceptionTestCase.php Tests/TornDown.php Tests/TornDown2.php \
-		Tests/TornDown3.php Tests/TornDown4.php Tests/TornDown5.php Tests/WasRun.php \
+		Tests/InheritedTestCase.php Tests/Iterator.php Tests/MockRunner.php \
+		Tests/NoArgTestCaseTest.php Tests/NonStatic.php Tests/NoTestCaseClass.php \
+		Tests/NoTestCases.php Tests/NotPublicTestCase.php Tests/NotVoidTestCase.php \
+		Tests/OneTestCase.php Tests/OverrideTestCase.php Tests/SetupFailure.php \
+		Tests/Sleep.php Tests/Success.php Tests/TearDownFailure.php \
+		Tests/ThrowExceptionTestCase.php Tests/ThrowNoExceptionTestCase.php \
+		Tests/TornDown.php Tests/TornDown2.php Tests/TornDown3.php \
+		Tests/TornDown4.php Tests/TornDown5.php Tests/WasRun.php \
 		TextUI/ResultPrinter.php TextUI/TestRunner.php Util/Filter.php \
 		Util/Printer.php Util/Skeleton.php
 SCRIPTFILES=	phpunit
@@ -69,10 +72,11 @@ SCRIPTFILES=	phpunit
 post-patch:
 	@${REINPLACE_CMD} -e "s|@version@|${PORTVERSION}|" ${WRKSRC}/Runner/Version.php
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_PEAR_LOG)
 RUN_DEPENDS+=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
 .endif
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-PHPUnit2/distinfo b/devel/pear-PHPUnit2/distinfo
index f8f39e33d316..0f4bdc8465a9 100644
--- a/devel/pear-PHPUnit2/distinfo
+++ b/devel/pear-PHPUnit2/distinfo
@@ -1,2 +1,2 @@
-MD5 (PEAR/PHPUnit2-2.1.6.tgz) = e6a99c41191bc77f5e16d079beda50fb
-SIZE (PEAR/PHPUnit2-2.1.6.tgz) = 35136
+MD5 (PEAR/PHPUnit2-2.2.0.tgz) = 12596f4574ffc8cee55a113a2cea3752
+SIZE (PEAR/PHPUnit2-2.2.0.tgz) = 38446