- Update to bsd.java.mk 2.0

- Use JAVAJARDIR and JAVALIBDIR
- Dynamic plist
- Unroll documentation install loop
- Honor hier(7): install samples in ${EXAMPLESDIR}

PR:		74285
Submitted by:	me

2 files changed, 25 insertions, 216 deletions

diff --git a/java/junit/Makefile b/java/junit/Makefile
index 73b04524ef29..4856b2bb3d12 100644
--- a/java/junit/Makefile
+++ b/java/junit/Makefile
@@ -16,32 +16,41 @@ MAINTAINER=	hq@FreeBSD.org
 COMMENT=	A regression testing utility for use with the Java(TM) Language
 
 USE_ZIP=	yes
-USE_JAVA=	1.1+
+USE_JAVA=	yes
 NO_BUILD=	yes
-NO_BUILD_DEPENDS_JAVA=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${USE_JAVA} == "1.1"
-RUN_DEPENDS+=	${LOCALBASE}/share/java/classes/jfc-1.1.1/swing.jar:${PORTSDIR}/java/jfc
+.if ${JAVA_PORT_VERSION} == "1.1"
+RUN_DEPENDS+=	${JAVALIBDIR}/jfc-1.1.1/swing.jar:${PORTSDIR}/java/jfc
 .endif
 
 .if !defined(NOPORTDOCS)
-DATADIRS=	doc javadoc junit
+PORTDOCS=	README.html cpl-v10.html doc javadoc
 .endif
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+PLIST_FILES=	%%JAVAJARDIR%%/junit.jar %%DATADIR%%/src.jar
+PLIST_DIRS=	%%DATADIR%%
 
 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}; \
-		${FIND} ${DIR} -type d -exec ${MKDIR} ${DOCSDIR}/\{} \; ;\
-		${FIND} ${DIR} -type f -exec ${INSTALL_DATA} \{} ${DOCSDIR}/\{} \;
-.endfor
+	${MKDIR} ${JAVAJARDIR}
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/junit.jar ${JAVAJARDIR}/
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/src.jar ${DATADIR}/
+	cd ${INSTALL_WRKSRC}/junit/samples \
+	  && ${FIND} . -type d -exec ${MKDIR} ${EXAMPLESDIR}/\{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${EXAMPLESDIR}/\{} \;
+.if !defined(NOPORTDOCS)
+	cd ${INSTALL_WRKSRC} \
+	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/\{} \; \
+	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} \{} ${DOCSDIR}/\{} \;
 .endif
 
+post-install:
+	@cd ${INSTALL_WRKSRC}/junit/samples \
+	  && ${FIND} -s . -type f \
+	    | ${SED} 's,^\.,${EXAMPLESDIR:S,^${PREFIX}/,,},' >>${TMPPLIST} \
+	  && ${FIND} -s -d . -type d \
+	    | ${SED} 's,^\.,@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,},' >>${TMPPLIST}
+
 .include <bsd.port.post.mk>
diff --git a/java/junit/pkg-plist b/java/junit/pkg-plist
deleted file mode 100644
index daa31602030d..000000000000
--- a/java/junit/pkg-plist
+++ /dev/null
@@ -1,200 +0,0 @@
-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/cookbook/IMG00001.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
-%%PORTDOCS%%share/doc/junit/doc/cookstour/Image2.gif
-%%PORTDOCS%%share/doc/junit/doc/cookstour/Image3.gif
-%%PORTDOCS%%share/doc/junit/doc/cookstour/Image4.gif
-%%PORTDOCS%%share/doc/junit/doc/cookstour/Image5.gif
-%%PORTDOCS%%share/doc/junit/doc/cookstour/Image6.gif
-%%PORTDOCS%%share/doc/junit/doc/cookstour/Image7.gif
-%%PORTDOCS%%share/doc/junit/doc/cookstour/cookstour.htm
-%%PORTDOCS%%share/doc/junit/doc/faq/faq.htm
-%%PORTDOCS%%share/doc/junit/doc/testinfected/IMG00001.GIF
-%%PORTDOCS%%share/doc/junit/doc/testinfected/IMG00002.GIF
-%%PORTDOCS%%share/doc/junit/doc/testinfected/IMG00003.GIF
-%%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
-%%PORTDOCS%%share/doc/junit/javadoc/index.html
-%%PORTDOCS%%share/doc/junit/javadoc/junit/extensions/ActiveTestSuite.html
-%%PORTDOCS%%share/doc/junit/javadoc/junit/extensions/ExceptionTestCase.html
-%%PORTDOCS%%share/doc/junit/javadoc/junit/extensions/RepeatedTest.html
-%%PORTDOCS%%share/doc/junit/javadoc/junit/extensions/TestDecorator.html
-%%PORTDOCS%%share/doc/junit/javadoc/junit/extensions/TestSetup.html
-%%PORTDOCS%%share/doc/junit/javadoc/junit/extensions/package-frame.html
-%%PORTDOCS%%share/doc/junit/javadoc/junit/extensions/package-summary.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
-%%PORTDOCS%%share/doc/junit/javadoc/junit/framework/TestFailure.html
-%%PORTDOCS%%share/doc/junit/javadoc/junit/framework/TestListener.html
-%%PORTDOCS%%share/doc/junit/javadoc/junit/framework/TestResult.html
-%%PORTDOCS%%share/doc/junit/javadoc/junit/framework/TestSuite.html
-%%PORTDOCS%%share/doc/junit/javadoc/junit/framework/package-frame.html
-%%PORTDOCS%%share/doc/junit/javadoc/junit/framework/package-summary.html
-%%PORTDOCS%%share/doc/junit/javadoc/junit/framework/package-tree.html
-%%PORTDOCS%%share/doc/junit/javadoc/overview-frame.html
-%%PORTDOCS%%share/doc/junit/javadoc/overview-summary.html
-%%PORTDOCS%%share/doc/junit/javadoc/overview-tree.html
-%%PORTDOCS%%share/doc/junit/javadoc/package-list
-%%PORTDOCS%%share/doc/junit/javadoc/packages.html
-%%PORTDOCS%%share/doc/junit/javadoc/serialized-form.html
-%%PORTDOCS%%share/doc/junit/javadoc/stylesheet.css
-%%PORTDOCS%%share/doc/junit/junit/samples/AllTests.class
-%%PORTDOCS%%share/doc/junit/junit/samples/AllTests.java
-%%PORTDOCS%%share/doc/junit/junit/samples/SimpleTest.class
-%%PORTDOCS%%share/doc/junit/junit/samples/SimpleTest.java
-%%PORTDOCS%%share/doc/junit/junit/samples/VectorTest.class
-%%PORTDOCS%%share/doc/junit/junit/samples/VectorTest.java
-%%PORTDOCS%%share/doc/junit/junit/samples/money/IMoney.class
-%%PORTDOCS%%share/doc/junit/junit/samples/money/IMoney.java
-%%PORTDOCS%%share/doc/junit/junit/samples/money/Money.class
-%%PORTDOCS%%share/doc/junit/junit/samples/money/Money.java
-%%PORTDOCS%%share/doc/junit/junit/samples/money/MoneyBag.class
-%%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/AllTests.class
-%%PORTDOCS%%share/doc/junit/junit/tests/AllTests.java
-%%PORTDOCS%%share/doc/junit/junit/tests/WasRun.class
-%%PORTDOCS%%share/doc/junit/junit/tests/WasRun.java
-%%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/ComparisonFailureTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/framework/ComparisonFailureTest.java
-%%PORTDOCS%%share/doc/junit/junit/tests/framework/DoublePrecisionAssertTest.class
-%%PORTDOCS%%share/doc/junit/junit/tests/framework/DoublePrecisionAssertTest.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
-%%PORTDOCS%%@dirrm share/doc/junit/doc/testinfected
-%%PORTDOCS%%@dirrm share/doc/junit/doc
-%%PORTDOCS%%@dirrm share/doc/junit/javadoc/junit/extensions
-%%PORTDOCS%%@dirrm share/doc/junit/javadoc/junit/framework
-%%PORTDOCS%%@dirrm share/doc/junit/javadoc/junit
-%%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