. Update to 10.k.

. Make this port act more like the other java ports.

The actual change is based on the followup submitted by Conor McDermottroe
plus some tweaks from the patch in the PR and myself.

PR:		63582
Submitted by:	Conor McDermottroe <ports@mcdermottroe.com>
                Matthew West <mwest@uct.ac.za>
Approved by:	maintainer timeout

3 files changed, 28 insertions, 64 deletions

diff --git a/java/java-cup/Makefile b/java/java-cup/Makefile
index 20a6891..a783fcc 100644
--- a/java/java-cup/Makefile
+++ b/java/java-cup/Makefile
@@ -6,43 +6,41 @@
 #
 
 PORTNAME=	java_cup
-PORTVERSION=	10.g
+PORTVERSION=	10.k
 CATEGORIES=	java
 MASTER_SITES=	http://www.cs.princeton.edu/~appel/modern/java/CUP/
-DISTNAME=	java_cup_v10g
+DISTNAME=	${PORTNAME}_v${PORTVERSION:S|.||}
 
 MAINTAINER=	nordwick@xcf.berkeley.edu
 COMMENT=	An LALR parser generator in Java
 
-BUILD_DEPENDS=	${JAVADIR}/bin/javac:${PORTSDIR}/java/jdk11
-RUN_DEPENDS=	${JAVADIR}/bin/java:${PORTSDIR}/java/jdk11
-
-JAVASUBDIR=	jdk1.1.8
-JAVADIR=	${PREFIX}/${JAVASUBDIR}
-JAVALIBDIR=	${JAVADIR}/lib
-
+USE_JAVA=	1.1+
+NEED_JAVAC=	yes
 NO_WRKSUBDIR=	yes
 
-PLIST_SUB=	JAVASUBDIR=${JAVASUBDIR}
+PLIST_SUB=	JAVAJARDIR=${JAVAJARDIR:S|^${PREFIX}/||} PORTNAME=${PORTNAME}
 
 do-build:
-	for JSRC in ${WRKSRC}/java_cup/*.java ${WRKSRC}/java_cup/runtime/*.java; \
-	do CLASSPATH=${WRKSRC} ${PREFIX}/${JAVASUBDIR}/bin/javac $$JSRC; done
+	${JAVAC} -classpath ${WRKSRC} ${WRKSRC}/java_cup/*.java \
+		${WRKSRC}/java_cup/runtime/*.java
+	cd ${WRKSRC} && \
+		${JAR} cf ${PORTNAME}.jar java_cup/*.class \
+		java_cup/runtime/*.class
 
 do-install:
-	${MKDIR} ${JAVALIBDIR}/java_cup
-	${MKDIR} ${JAVALIBDIR}/java_cup/runtime
-	${CP} ${WRKSRC}/java_cup/*.class ${JAVALIBDIR}/java_cup
-	${CP} ${WRKSRC}/java_cup/runtime/*.class ${JAVALIBDIR}/java_cup/runtime
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.jar ${JAVAJARDIR}
 
 post-install:
-	${MKDIR} ${JAVADIR}/cup
-	${INSTALL_MAN} ${WRKSRC}/manual.html ${JAVADIR}/cup
-	${INSTALL_MAN} ${WRKSRC}/README ${JAVADIR}/cup
-	${INSTALL_MAN} ${WRKSRC}/LICENSE ${JAVADIR}/cup
-	@${ECHO_MSG} "Documentation installed in ${JAVADIR}/cup"
-	@${ECHO_MSG} "   manual.html --  How to build a grammer."
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/manual.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/cup_logo.gif ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
+	@${ECHO_MSG} "Documentation installed in ${DOCSDIR}"
+	@${ECHO_MSG} "   manual.html --  How to build a grammar."
 	@${ECHO_MSG} "   README -- How to get it working."
 	@${ECHO_MSG} "   LICENSE -- How not to get sued."
+.endif
 
 .include <bsd.port.mk>
diff --git a/java/java-cup/distinfo b/java/java-cup/distinfo
index b3db0c5..b55c559 100644
--- a/java/java-cup/distinfo
+++ b/java/java-cup/distinfo
@@ -1 +1,2 @@
-MD5 (java_cup_v10g.tar.gz) = 2b124198a7ed696a63546a83199237f7
+MD5 (java_cup_v10k.tar.gz) = 8b11edfec13c590ea443d0f0ae0da479
+SIZE (java_cup_v10k.tar.gz) = 190843
diff --git a/java/java-cup/pkg-plist b/java/java-cup/pkg-plist
index ba6c636..4d37b68 100644
--- a/java/java-cup/pkg-plist
+++ b/java/java-cup/pkg-plist
@@ -1,41 +1,6 @@
-%%JAVASUBDIR%%/lib/java_cup/CUP$parser$actions.class
-%%JAVASUBDIR%%/lib/java_cup/Main.class
-%%JAVASUBDIR%%/lib/java_cup/action_part.class
-%%JAVASUBDIR%%/lib/java_cup/action_production.class
-%%JAVASUBDIR%%/lib/java_cup/assoc.class
-%%JAVASUBDIR%%/lib/java_cup/emit.class
-%%JAVASUBDIR%%/lib/java_cup/internal_error.class
-%%JAVASUBDIR%%/lib/java_cup/lalr_item.class
-%%JAVASUBDIR%%/lib/java_cup/lalr_item_set.class
-%%JAVASUBDIR%%/lib/java_cup/lalr_state.class
-%%JAVASUBDIR%%/lib/java_cup/lalr_transition.class
-%%JAVASUBDIR%%/lib/java_cup/lexer.class
-%%JAVASUBDIR%%/lib/java_cup/lr_item_core.class
-%%JAVASUBDIR%%/lib/java_cup/non_terminal.class
-%%JAVASUBDIR%%/lib/java_cup/nonassoc_action.class
-%%JAVASUBDIR%%/lib/java_cup/parse_action.class
-%%JAVASUBDIR%%/lib/java_cup/parse_action_row.class
-%%JAVASUBDIR%%/lib/java_cup/parse_action_table.class
-%%JAVASUBDIR%%/lib/java_cup/parse_reduce_row.class
-%%JAVASUBDIR%%/lib/java_cup/parse_reduce_table.class
-%%JAVASUBDIR%%/lib/java_cup/parser.class
-%%JAVASUBDIR%%/lib/java_cup/production.class
-%%JAVASUBDIR%%/lib/java_cup/production_part.class
-%%JAVASUBDIR%%/lib/java_cup/reduce_action.class
-%%JAVASUBDIR%%/lib/java_cup/shift_action.class
-%%JAVASUBDIR%%/lib/java_cup/sym.class
-%%JAVASUBDIR%%/lib/java_cup/symbol.class
-%%JAVASUBDIR%%/lib/java_cup/symbol_part.class
-%%JAVASUBDIR%%/lib/java_cup/symbol_set.class
-%%JAVASUBDIR%%/lib/java_cup/terminal.class
-%%JAVASUBDIR%%/lib/java_cup/terminal_set.class
-%%JAVASUBDIR%%/lib/java_cup/version.class
-%%JAVASUBDIR%%/lib/java_cup/runtime/Symbol.class
-%%JAVASUBDIR%%/lib/java_cup/runtime/lr_parser.class
-%%JAVASUBDIR%%/lib/java_cup/runtime/virtual_parse_stack.class
-@dirrm %%JAVASUBDIR%%/lib/java_cup/runtime
-@dirrm %%JAVASUBDIR%%/lib/java_cup
-%%JAVASUBDIR%%/cup/manual.html
-%%JAVASUBDIR%%/cup/README
-%%JAVASUBDIR%%/cup/LICENSE
-@dirrm %%JAVASUBDIR%%/cup
+%%JAVAJARDIR%%/%%PORTNAME%%.jar
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/cup_logo.gif
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%@dirrm %%DOCSDIR%%