java/javahelp:

- Remove dead entry from MASTER_SITES
- Add stage support
- Drop unneeded JAVA_VERSION
- Convert NOPORTDOCS to option
- Amend COMMENT, update WWW

java/jrosetta:
- Add stage support
- Drop JAVA_VERSION

math/jlatexmath:
- Remove dead entry from MASTER_SITES
- Add stage support
- Drop JAVA_VERSION
- Use options helpers

2 files changed, 25 insertions, 28 deletions

diff --git a/java/javahelp/Makefile b/java/javahelp/Makefile
index e0018e670f4a..d7d8bdbdfd84 100644
--- a/java/javahelp/Makefile
+++ b/java/javahelp/Makefile
@@ -5,49 +5,46 @@ PORTNAME=	javahelp
 PORTVERSION=	2.0.05
 PORTREVISION=	1
 CATEGORIES=	java devel
-MASTER_SITES=	http://download.java.net/javadesktop/javahelp/ \
-		http://www.predatorlabs.net/dl/
+MASTER_SITES=	http://download.java.net/javadesktop/javahelp/
 DISTNAME=	${PORTNAME}2_0_05
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A system to add online help to Java applications
+COMMENT=	Online help support for Java applications
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
 JAVA_RUN=	yes
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/jh2.0
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-patch:
 	${REINPLACE_CMD} -e 's|$$JAVAHELP_HOME/javahelp/bin/|${JAVAJARDIR}/|' ${WRKSRC}/javahelp/bin/jhindexer
 	${REINPLACE_CMD} -e 's|$$JAVAHELP_HOME/javahelp/bin/|${JAVAJARDIR}/|' ${WRKSRC}/javahelp/bin/jhsearch
 	(cd ${WRKSRC} && ${RM} -rf `${FIND} . -type d -name .svn`)
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/LICENSE.html ${JAVAJARDIR}/LICENSE.${PORTNAME}.html
-	${INSTALL_SCRIPT} ${WRKSRC}/javahelp/bin/jhindexer ${PREFIX}/bin/jhindexer
-	${INSTALL_SCRIPT} ${WRKSRC}/javahelp/bin/jhsearch ${PREFIX}/bin/jhsearch
-	${INSTALL_DATA} ${WRKSRC}/javahelp/bin/jhindexer.jar ${JAVAJARDIR}/jhindexer.jar
-	${INSTALL_DATA} ${WRKSRC}/javahelp/bin/jhsearch.jar ${JAVAJARDIR}/jhsearch.jar
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jh.jar ${JAVAJARDIR}/jh.jar
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jhall.jar ${JAVAJARDIR}/jhall.jar
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jhbasic.jar ${JAVAJARDIR}/jhbasic.jar
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jsearch.jar ${JAVAJARDIR}/jsearch.jar
-	${MKDIR} ${JAVAJARDIR}/dtd
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/favorites_2_0.dtd ${JAVAJARDIR}/dtd/favorites_2_0.dtd
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/helpset_2_0.dtd ${JAVAJARDIR}/dtd/helpset_2_0.dtd
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/index_2_0.dtd ${JAVAJARDIR}/dtd/index_2_0.dtd
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/map_2_0.dtd ${JAVAJARDIR}/dtd/map_2_0.dtd
-	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/toc_2_0.dtd ${JAVAJARDIR}/dtd/toc_2_0.dtd
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.html ${DOCSDIR}
-	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
-	(cd ${WRKSRC}/demos/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
-.endif
+	${INSTALL_DATA} ${WRKSRC}/LICENSE.html ${STAGEDIR}${JAVAJARDIR}/LICENSE.${PORTNAME}.html
+	${INSTALL_SCRIPT} ${WRKSRC}/javahelp/bin/jhindexer ${STAGEDIR}${PREFIX}/bin/jhindexer
+	${INSTALL_SCRIPT} ${WRKSRC}/javahelp/bin/jhsearch ${STAGEDIR}${PREFIX}/bin/jhsearch
+	${INSTALL_DATA} ${WRKSRC}/javahelp/bin/jhindexer.jar ${STAGEDIR}${JAVAJARDIR}/jhindexer.jar
+	${INSTALL_DATA} ${WRKSRC}/javahelp/bin/jhsearch.jar ${STAGEDIR}${JAVAJARDIR}/jhsearch.jar
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jh.jar ${STAGEDIR}${JAVAJARDIR}/jh.jar
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jhall.jar ${STAGEDIR}${JAVAJARDIR}/jhall.jar
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jhbasic.jar ${STAGEDIR}${JAVAJARDIR}/jhbasic.jar
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/jsearch.jar ${STAGEDIR}${JAVAJARDIR}/jsearch.jar
+	${MKDIR} ${STAGEDIR}${JAVAJARDIR}/dtd
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/favorites_2_0.dtd ${STAGEDIR}${JAVAJARDIR}/dtd/favorites_2_0.dtd
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/helpset_2_0.dtd ${STAGEDIR}${JAVAJARDIR}/dtd/helpset_2_0.dtd
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/index_2_0.dtd ${STAGEDIR}${JAVAJARDIR}/dtd/index_2_0.dtd
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/map_2_0.dtd ${STAGEDIR}${JAVAJARDIR}/dtd/map_2_0.dtd
+	${INSTALL_DATA} ${WRKSRC}/javahelp/lib/dtd/toc_2_0.dtd ${STAGEDIR}${JAVAJARDIR}/dtd/toc_2_0.dtd
+	${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.html ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/demos/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/java/javahelp/pkg-descr b/java/javahelp/pkg-descr
index 8880b7b8a5b9..407ce1eb1082 100644
--- a/java/javahelp/pkg-descr
+++ b/java/javahelp/pkg-descr
@@ -4,4 +4,4 @@ is both a JCP specification (JSR 97) and a reference implementation of
 that specification. The JavaHelp system open source project includes the
 source to the reference implementation.
 
-WWW: https://javahelp.dev.java.net/
+WWW: https://javahelp.java.net/