4 files changed, 90 insertions, 92 deletions

diff --git a/devel/pear-PHPUnit2/Makefile b/devel/pear-PHPUnit2/Makefile
index c675a642d69f..1a654ae62844 100644
--- a/devel/pear-PHPUnit2/Makefile
+++ b/devel/pear-PHPUnit2/Makefile
@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	PHPUnit2
-PORTVERSION=	2.2.0
-PORTREVISION=	1
+DISTVERSION=	2.2.0beta4
+PORTEPOCH=	1
 CATEGORIES=	devel www pear
-DISTNAME=	${PORTNAME}-${PORTVERSION}beta3
 
 MAINTAINER=	antonio@php.net
-COMMENT=	Regression testing framework for unit tests
+COMMENT=	PEAR regression testing framework for unit tests
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/Benchmark/Timer.php:${PORTSDIR}/benchmarks/pear-Benchmark
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 LATEST_LINK=	pear-PHPUnit2
-OPTIONS=	PEAR_BENCHMARK "PEAR::Benchmark support" on \
-		PEAR_LOG "PEAR::Log support" off
+OPTIONS=	PEAR_LOG "PEAR::Log support" Off
 
 NO_PACKAGE=	Conflicting dependences between PHP4 and PHP5
 
@@ -36,55 +34,56 @@ 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/TestDecorator.php \
-		Extensions/TestSetup.php Framework/Assert.php \
-		Framework/AssertionFailedError.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 \
+		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/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 \
+		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 \
-		TextUI/ResultPrinter.php TextUI/TestRunner.php Util/Filter.php \
-		Util/Printer.php Util/Skeleton.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
 
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_PEAR_BENCHMARK)
-BUILD_DEPENDS+=	${PEARDIR}/Benchmark/Timer.php:${PORTSDIR}/benchmarks/pear-Benchmark
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e "s|@version@|${PORTVERSION}|" ${WRKSRC}/Runner/Version.php
 
 .if defined(WITH_PEAR_LOG)
-BUILD_DEPENDS+=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
+RUN_DEPENDS+=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
 .endif
 
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|@version@|${PORTVERSION}|" ${WRKSRC}/Runner/Version.php
+PHP_VERS=	${PHP_VERSION:S/.//g}
+
+.if defined(PHP_VERS) && ${PHP_VERS} < 502
+IGNORE=		"You need PHP 5.0.2 or later to install PEAR::PHPUnit2"
+.endif
+
+do-build:
+	${DO_NADA}
 
+.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 0725c209ff12..6c93e3978498 100644
--- a/devel/pear-PHPUnit2/distinfo
+++ b/devel/pear-PHPUnit2/distinfo
@@ -1,2 +1,2 @@
-MD5 (PEAR/PHPUnit2-2.2.0beta3.tgz) = b1e3b6054c1a1c1a757451cb291250d4
-SIZE (PEAR/PHPUnit2-2.2.0beta3.tgz) = 38517
+MD5 (PEAR/PHPUnit2-2.2.0beta4.tgz) = fee3c0ce7994eeb59dd00f249da98909
+SIZE (PEAR/PHPUnit2-2.2.0beta4.tgz) = 38776
diff --git a/devel/pear-PHPUnit3/Makefile b/devel/pear-PHPUnit3/Makefile
index c675a642d69f..1a654ae62844 100644
--- a/devel/pear-PHPUnit3/Makefile
+++ b/devel/pear-PHPUnit3/Makefile
@@ -6,20 +6,18 @@
 #
 
 PORTNAME=	PHPUnit2
-PORTVERSION=	2.2.0
-PORTREVISION=	1
+DISTVERSION=	2.2.0beta4
+PORTEPOCH=	1
 CATEGORIES=	devel www pear
-DISTNAME=	${PORTNAME}-${PORTVERSION}beta3
 
 MAINTAINER=	antonio@php.net
-COMMENT=	Regression testing framework for unit tests
+COMMENT=	PEAR regression testing framework for unit tests
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/Benchmark/Timer.php:${PORTSDIR}/benchmarks/pear-Benchmark
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 LATEST_LINK=	pear-PHPUnit2
-OPTIONS=	PEAR_BENCHMARK "PEAR::Benchmark support" on \
-		PEAR_LOG "PEAR::Log support" off
+OPTIONS=	PEAR_LOG "PEAR::Log support" Off
 
 NO_PACKAGE=	Conflicting dependences between PHP4 and PHP5
 
@@ -36,55 +34,56 @@ 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/TestDecorator.php \
-		Extensions/TestSetup.php Framework/Assert.php \
-		Framework/AssertionFailedError.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 \
+		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/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 \
+		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 \
-		TextUI/ResultPrinter.php TextUI/TestRunner.php Util/Filter.php \
-		Util/Printer.php Util/Skeleton.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
 
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_PEAR_BENCHMARK)
-BUILD_DEPENDS+=	${PEARDIR}/Benchmark/Timer.php:${PORTSDIR}/benchmarks/pear-Benchmark
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e "s|@version@|${PORTVERSION}|" ${WRKSRC}/Runner/Version.php
 
 .if defined(WITH_PEAR_LOG)
-BUILD_DEPENDS+=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
+RUN_DEPENDS+=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
 .endif
 
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|@version@|${PORTVERSION}|" ${WRKSRC}/Runner/Version.php
+PHP_VERS=	${PHP_VERSION:S/.//g}
+
+.if defined(PHP_VERS) && ${PHP_VERS} < 502
+IGNORE=		"You need PHP 5.0.2 or later to install PEAR::PHPUnit2"
+.endif
+
+do-build:
+	${DO_NADA}
 
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-PHPUnit3/distinfo b/devel/pear-PHPUnit3/distinfo
index 0725c209ff12..6c93e3978498 100644
--- a/devel/pear-PHPUnit3/distinfo
+++ b/devel/pear-PHPUnit3/distinfo
@@ -1,2 +1,2 @@
-MD5 (PEAR/PHPUnit2-2.2.0beta3.tgz) = b1e3b6054c1a1c1a757451cb291250d4
-SIZE (PEAR/PHPUnit2-2.2.0beta3.tgz) = 38517
+MD5 (PEAR/PHPUnit2-2.2.0beta4.tgz) = fee3c0ce7994eeb59dd00f249da98909
+SIZE (PEAR/PHPUnit2-2.2.0beta4.tgz) = 38776