3 files changed, 115 insertions, 80 deletions

diff --git a/java/junit/Makefile b/java/junit/Makefile
index e1e52ce97881..2d1133400307 100644
--- a/java/junit/Makefile
+++ b/java/junit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	junit
-PORTVERSION=	3.7
-PORTREVISION=	1
+PORTVERSION=	3.8
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -33,7 +32,9 @@ DATADIRS=	doc javadoc junit
 do-install:
 	${MKDIR} ${PREFIX}/share/java/classes ${DOCSDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/junit.jar ${PREFIX}/share/java/classes
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/src.jar ${DOCSDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/README.html ${DOCSDIR}
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/cpl-v10.html ${DOCSDIR}
 .if defined(DATADIRS)
 .for DIR in ${DATADIRS}
 	cd ${INSTALL_WRKSRC}; \
diff --git a/java/junit/distinfo b/java/junit/distinfo
index 540e645f3591..913c40012a09 100644
--- a/java/junit/distinfo
+++ b/java/junit/distinfo
@@ -1 +1 @@
-MD5 (junit3.7.zip) = ff5816f35fa99bc4347af65fb40d86c9
+MD5 (junit3.8.zip) = 2782390f02d9a691202e0d41506e95b6
diff --git a/java/junit/pkg-plist b/java/junit/pkg-plist
index fb93eec7659a..b2ca79d83c37 100644
--- a/java/junit/pkg-plist
+++ b/java/junit/pkg-plist
@@ -1,10 +1,11 @@
 share/java/classes/junit.jar
 share/doc/junit/README.html
+share/doc/junit/cpl-v10.html
+share/doc/junit/src.jar
+%%PORTDOCS%%share/doc/junit/doc/Changes34.html
 %%PORTDOCS%%share/doc/junit/doc/JUnitProperties.html
 %%PORTDOCS%%share/doc/junit/doc/changes21.html
-%%PORTDOCS%%share/doc/junit/doc/changes34.html
 %%PORTDOCS%%share/doc/junit/doc/cookbook/IMG00001.GIF
-%%PORTDOCS%%share/doc/junit/doc/cookbook/IMG00002.GIF
 %%PORTDOCS%%share/doc/junit/doc/cookbook/cookbook.htm
 %%PORTDOCS%%share/doc/junit/doc/cookbook/logo.gif
 %%PORTDOCS%%share/doc/junit/doc/cookstour/Image1.gif
@@ -22,6 +23,8 @@ share/doc/junit/README.html
 %%PORTDOCS%%share/doc/junit/doc/testinfected/logo.gif
 %%PORTDOCS%%share/doc/junit/doc/testinfected/testing.htm
 %%PORTDOCS%%share/doc/junit/javadoc/allclasses-frame.html
+%%PORTDOCS%%share/doc/junit/javadoc/allclasses-noframe.html
+%%PORTDOCS%%share/doc/junit/javadoc/constant-values.html
 %%PORTDOCS%%share/doc/junit/javadoc/deprecated-list.html
 %%PORTDOCS%%share/doc/junit/javadoc/help-doc.html
 %%PORTDOCS%%share/doc/junit/javadoc/index-all.html
@@ -36,6 +39,7 @@ share/doc/junit/README.html
 %%PORTDOCS%%share/doc/junit/javadoc/junit/extensions/package-tree.html
 %%PORTDOCS%%share/doc/junit/javadoc/junit/framework/Assert.html
 %%PORTDOCS%%share/doc/junit/javadoc/junit/framework/AssertionFailedError.html
+%%PORTDOCS%%share/doc/junit/javadoc/junit/framework/ComparisonFailure.html
 %%PORTDOCS%%share/doc/junit/javadoc/junit/framework/Protectable.html
 %%PORTDOCS%%share/doc/junit/javadoc/junit/framework/Test.html
 %%PORTDOCS%%share/doc/junit/javadoc/junit/framework/TestCase.html
@@ -67,85 +71,112 @@ share/doc/junit/README.html
 %%PORTDOCS%%share/doc/junit/junit/samples/money/MoneyBag.java
 %%PORTDOCS%%share/doc/junit/junit/samples/money/MoneyTest.class
 %%PORTDOCS%%share/doc/junit/junit/samples/money/MoneyTest.java
-%%PORTDOCS%%share/doc/junit/junit/tests/ActiveTestTest$SuccessTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/ActiveTestTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/ActiveTestTest.java
 %%PORTDOCS%%share/doc/junit/junit/tests/AllTests.class
 %%PORTDOCS%%share/doc/junit/junit/tests/AllTests.java
-%%PORTDOCS%%share/doc/junit/junit/tests/AssertTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/AssertTest.java
-%%PORTDOCS%%share/doc/junit/junit/tests/ClassLoaderTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/ClassLoaderTest.java
-%%PORTDOCS%%share/doc/junit/junit/tests/ExceptionTestCaseTest$ThrowExceptionTestCase.class
-%%PORTDOCS%%share/doc/junit/junit/tests/ExceptionTestCaseTest$ThrowNoExceptionTestCase.class
-%%PORTDOCS%%share/doc/junit/junit/tests/ExceptionTestCaseTest$ThrowRuntimeExceptionTestCase.class
-%%PORTDOCS%%share/doc/junit/junit/tests/ExceptionTestCaseTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/ExceptionTestCaseTest.java
-%%PORTDOCS%%share/doc/junit/junit/tests/ExtensionTest$1.class
-%%PORTDOCS%%share/doc/junit/junit/tests/ExtensionTest$2.class
-%%PORTDOCS%%share/doc/junit/junit/tests/ExtensionTest$3.class
-%%PORTDOCS%%share/doc/junit/junit/tests/ExtensionTest$4.class
-%%PORTDOCS%%share/doc/junit/junit/tests/ExtensionTest$5.class
-%%PORTDOCS%%share/doc/junit/junit/tests/ExtensionTest$TornDown.class
-%%PORTDOCS%%share/doc/junit/junit/tests/ExtensionTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/ExtensionTest.java
-%%PORTDOCS%%share/doc/junit/junit/tests/Failure.class
-%%PORTDOCS%%share/doc/junit/junit/tests/Failure.java
-%%PORTDOCS%%share/doc/junit/junit/tests/InheritedTestCase.class
-%%PORTDOCS%%share/doc/junit/junit/tests/InheritedTestCase.java
-%%PORTDOCS%%share/doc/junit/junit/tests/LoadedFromJar.class
-%%PORTDOCS%%share/doc/junit/junit/tests/LoadedFromJar.java
-%%PORTDOCS%%share/doc/junit/junit/tests/NoTestCaseClass.class
-%%PORTDOCS%%share/doc/junit/junit/tests/NoTestCaseClass.java
-%%PORTDOCS%%share/doc/junit/junit/tests/NoTestCases.class
-%%PORTDOCS%%share/doc/junit/junit/tests/NoTestCases.java
-%%PORTDOCS%%share/doc/junit/junit/tests/NotPublicTestCase.class
-%%PORTDOCS%%share/doc/junit/junit/tests/NotPublicTestCase.java
-%%PORTDOCS%%share/doc/junit/junit/tests/NotVoidTestCase.class
-%%PORTDOCS%%share/doc/junit/junit/tests/NotVoidTestCase.java
-%%PORTDOCS%%share/doc/junit/junit/tests/OneTestCase.class
-%%PORTDOCS%%share/doc/junit/junit/tests/OneTestCase.java
-%%PORTDOCS%%share/doc/junit/junit/tests/OverrideTestCase.class
-%%PORTDOCS%%share/doc/junit/junit/tests/OverrideTestCase.java
-%%PORTDOCS%%share/doc/junit/junit/tests/RepeatedTestTest$SuccessTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/RepeatedTestTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/RepeatedTestTest.java
-%%PORTDOCS%%share/doc/junit/junit/tests/SorterTest$Swapper.class
-%%PORTDOCS%%share/doc/junit/junit/tests/SorterTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/SorterTest.java
-%%PORTDOCS%%share/doc/junit/junit/tests/StackFilterTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/StackFilterTest.java
-%%PORTDOCS%%share/doc/junit/junit/tests/Success.class
-%%PORTDOCS%%share/doc/junit/junit/tests/Success.java
-%%PORTDOCS%%share/doc/junit/junit/tests/SuiteTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/SuiteTest.java
-%%PORTDOCS%%share/doc/junit/junit/tests/TestCaseClassLoaderTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestCaseClassLoaderTest.java
-%%PORTDOCS%%share/doc/junit/junit/tests/TestCaseTest$1.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestCaseTest$2.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestCaseTest$3.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestCaseTest$4.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestCaseTest$5.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestCaseTest$6.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestCaseTest$7.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestCaseTest$TornDown.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestCaseTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestCaseTest.java
-%%PORTDOCS%%share/doc/junit/junit/tests/TestImplementorTest$1.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestImplementorTest$2.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestImplementorTest$DoubleTestCase.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestImplementorTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestImplementorTest.java
-%%PORTDOCS%%share/doc/junit/junit/tests/TestListenerTest$1.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestListenerTest$2.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestListenerTest$3.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestListenerTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TestListenerTest.java
-%%PORTDOCS%%share/doc/junit/junit/tests/TextRunnerTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/TextRunnerTest.java
 %%PORTDOCS%%share/doc/junit/junit/tests/WasRun.class
 %%PORTDOCS%%share/doc/junit/junit/tests/WasRun.java
-%%PORTDOCS%%share/doc/junit/junit/tests/test.jar
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ActiveTestTest$SuccessTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ActiveTestTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ActiveTestTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/AllTests.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/AllTests.java
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ExceptionTestCaseTest$ThrowExceptionTestCase.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ExceptionTestCaseTest$ThrowNoExceptionTestCase.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ExceptionTestCaseTest$ThrowRuntimeExceptionTestCase.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ExceptionTestCaseTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ExceptionTestCaseTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ExtensionTest$1.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ExtensionTest$2.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ExtensionTest$3.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ExtensionTest$4.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ExtensionTest$5.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ExtensionTest$TornDown.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ExtensionTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/ExtensionTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/RepeatedTestTest$SuccessTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/RepeatedTestTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/extensions/RepeatedTestTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/AllTests.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/AllTests.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/AssertTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/AssertTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/Failure.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/Failure.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/InheritedTestCase.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/InheritedTestCase.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/NoArgTestCaseTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/NoArgTestCaseTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/NoTestCaseClass.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/NoTestCaseClass.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/NoTestCases.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/NoTestCases.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/NotPublicTestCase.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/NotPublicTestCase.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/NotVoidTestCase.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/NotVoidTestCase.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/OneTestCase.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/OneTestCase.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/OverrideTestCase.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/OverrideTestCase.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/Success.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/Success.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/SuiteTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/SuiteTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestCaseTest$1.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestCaseTest$2.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestCaseTest$3.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestCaseTest$4.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestCaseTest$5.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestCaseTest$6.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestCaseTest$7.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestCaseTest$8.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestCaseTest$9.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestCaseTest$TornDown.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestCaseTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestCaseTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestImplementorTest$1.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestImplementorTest$2.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestImplementorTest$DoubleTestCase.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestImplementorTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestImplementorTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestListenerTest$1.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestListenerTest$2.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestListenerTest$3.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestListenerTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/framework/TestListenerTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/AllTests.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/AllTests.java
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/BaseTestRunnerTest$MockRunner.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/BaseTestRunnerTest$NonStatic.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/BaseTestRunnerTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/BaseTestRunnerTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/ClassLoaderTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/ClassLoaderTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/LoadedFromJar.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/LoadedFromJar.java
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/SimpleTestCollectorTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/SimpleTestCollectorTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/SorterTest$Swapper.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/SorterTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/SorterTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/StackFilterTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/StackFilterTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TestCaseClassLoaderTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TestCaseClassLoaderTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TextFeedbackTest$1.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TextFeedbackTest$2.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TextFeedbackTest$3.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TextFeedbackTest$4.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TextFeedbackTest$5.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TextFeedbackTest$6.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TextFeedbackTest$7.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TextFeedbackTest$TestResultPrinter.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TextFeedbackTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TextFeedbackTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TextRunnerTest$1.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TextRunnerTest.class
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/TextRunnerTest.java
+%%PORTDOCS%%share/doc/junit/junit/tests/runner/test.jar
 %%PORTDOCS%%@dirrm share/doc/junit/doc/cookbook
 %%PORTDOCS%%@dirrm share/doc/junit/doc/cookstour
 %%PORTDOCS%%@dirrm share/doc/junit/doc/faq
@@ -157,6 +188,9 @@ share/doc/junit/README.html
 %%PORTDOCS%%@dirrm share/doc/junit/javadoc
 %%PORTDOCS%%@dirrm share/doc/junit/junit/samples/money
 %%PORTDOCS%%@dirrm share/doc/junit/junit/samples
+%%PORTDOCS%%@dirrm share/doc/junit/junit/tests/extensions
+%%PORTDOCS%%@dirrm share/doc/junit/junit/tests/framework
+%%PORTDOCS%%@dirrm share/doc/junit/junit/tests/runner
 %%PORTDOCS%%@dirrm share/doc/junit/junit/tests
 %%PORTDOCS%%@dirrm share/doc/junit/junit
 @dirrm share/doc/junit