java/java-cup: update to 11.b.20160615 and unexpire

Further changes:
- use a prebuilt binary instead of building from source
- change license to SMLNJ in agreement with maintainer

PR:		245466
Submitted by:	Jashank Jeremy
Approved by:	maintainer
MFH:		2020Q2

4 files changed, 48 insertions, 26 deletions

diff --git a/java/java-cup/Makefile b/java/java-cup/Makefile
index a298110d9189..b0e0d36c1875 100644
--- a/java/java-cup/Makefile
+++ b/java/java-cup/Makefile
@@ -2,36 +2,45 @@
 # $FreeBSD$
 
 PORTNAME=	cup
-PORTVERSION=	11.a
-PORTREVISION=	2
+PORTVERSION=	11b.20160615
 CATEGORIES=	java devel
-MASTER_SITES=	http://www2.cs.tum.edu/projects/cup/ \
-		http://mirrors.mcdermottroe.com/www2.cs.tum.edu/projects/cup/
+MASTER_SITES=	http://www2.cs.tum.edu/projects/cup/releases/
 PKGNAMEPREFIX=	java-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-v${PORTVERSION:S|.||}-20050516-sources
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-bin-${PORTVERSION:S|.|-|}
 
 MAINTAINER=	eg@fbsd.lt
 COMMENT=	LALR parser generator in Java
 
-BROKEN=		unfetchable
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2020-05-05
-
-BROKEN_armv6=		fails to build: build.xml: Java returned: 1
-BROKEN_armv7=		fails to build: build.xml: Java returned: 1
+LICENSE=	SMLNJ
+LICENSE_NAME=	Standard ML of New Jersey License
+LICENSE_TEXT=	The text of the license can be obtained from the following URL:\
+		http://www2.cs.tum.edu/projects/cup/licence.php
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USE_JAVA=	yes
-USE_ANT=	yes
-WRKSRC=		${WRKDIR}/cup-tum
+NO_BUILD=	yes
 
-# Silly hack because the naming in CUP is all over the place
-DISTJARNAME=	${PKGNAMEPREFIX}${PORTNAME}-10k-TUM
+SUB_FILES=	java-cup.sh
+CUP_VERSION=	${PORTVERSION:R}
+SUB_LIST=	CUP_VERSION=${CUP_VERSION}
 
-PLIST_FILES=	%%JAVAJARDIR%%/${DISTJARNAME}.jar \
-		%%JAVAJARDIR%%/${DISTJARNAME}-runtime.jar
+PLIST_FILES=	bin/java-cup \
+		${JAVAJARDIR}/${PKGNAMEPREFIX}${PORTNAME}.jar \
+		${JAVAJARDIR}/${PKGNAMEPREFIX}${PORTNAME}-runtime.jar \
+		${JAVAJARDIR}/${PKGNAMEPREFIX}${PORTNAME}-${CUP_VERSION}.jar \
+		${JAVAJARDIR}/${PKGNAMEPREFIX}${PORTNAME}-${CUP_VERSION}-runtime.jar
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/dist/${DISTJARNAME}.jar ${STAGEDIR}${JAVAJARDIR}
-	${INSTALL_DATA} ${WRKSRC}/dist/${DISTJARNAME}-runtime.jar ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/java-cup.sh ${STAGEDIR}${PREFIX}/bin/java-cup
+
+	${INSTALL_DATA} ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${CUP_VERSION}.jar \
+		${STAGEDIR}${JAVAJARDIR}/${PKGNAMEPREFIX}${PORTNAME}-${CUP_VERSION}.jar
+	${LN} -s ${PKGNAMEPREFIX}${PORTNAME}-${CUP_VERSION}.jar \
+		${STAGEDIR}${JAVAJARDIR}/${PKGNAMEPREFIX}${PORTNAME}.jar
+
+	${INSTALL_DATA} ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${CUP_VERSION}-runtime.jar \
+		${STAGEDIR}${JAVAJARDIR}/${PKGNAMEPREFIX}${PORTNAME}-${CUP_VERSION}-runtime.jar
+	${LN} -s ${PKGNAMEPREFIX}${PORTNAME}-${CUP_VERSION}-runtime.jar \
+		${STAGEDIR}${JAVAJARDIR}/${PKGNAMEPREFIX}${PORTNAME}-runtime.jar
 
 .include <bsd.port.mk>
diff --git a/java/java-cup/distinfo b/java/java-cup/distinfo
index 7038669fcfb8..90520cdf84a8 100644
--- a/java/java-cup/distinfo
+++ b/java/java-cup/distinfo
@@ -1,2 +1,3 @@
-SHA256 (java-cup-v11a-20050516-sources.tar.gz) = af0a664e4dd4f5fdf8ec546f9560363d1f297114fa0d4612032936267afab203
-SIZE (java-cup-v11a-20050516-sources.tar.gz) = 362129
+TIMESTAMP = 1586399405
+SHA256 (java-cup-bin-11b-20160615.tar.gz) = 3f01d657882380c1e5dc1593d9db7b5ded853429b7e52bc517f9bcbb4a65decc
+SIZE (java-cup-bin-11b-20160615.tar.gz) = 144985
diff --git a/java/java-cup/files/java-cup.sh.in b/java/java-cup/files/java-cup.sh.in
new file mode 100644
index 000000000000..f0f70a1acb5e
--- /dev/null
+++ b/java/java-cup/files/java-cup.sh.in
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Derived from a similar script for ports/java/jflex.
+#
+# $FreeBSD$
+
+# Allow the user to override where java-cup.jar lives
+JAVAJARDIR="${JAVAJARDIR:-"%%JAVAJARDIR%%"}"
+
+exec "%%LOCALBASE%%/bin/java" -jar "${JAVAJARDIR}/java-cup-%%CUP_VERSION%%.jar" "$@"
diff --git a/java/java-cup/pkg-descr b/java/java-cup/pkg-descr
index 1f11430b59ca..20c727d270bd 100644
--- a/java/java-cup/pkg-descr
+++ b/java/java-cup/pkg-descr
@@ -1,5 +1,7 @@
-This is the Java based Constructor of Useful Parsers (CUP for short).  It
-serves the same role as the widely used program YAXX and in fact offers most
-of the features of YACC.  However,  CUP is written in Java, uses specifications
-including embedded Java code, and produces parsers which are implemented in
-Java.
+Constructor of Useful Parsers (CUP), a system for generating LALR
+parsers from simple specifications.  It serves the same role as the
+widely-used program `yacc', and in fact offers most of the features of
+`yacc'; however, CUP is written in Java, uses specifications including
+embedded Java code, and produces parsers with are implemented in Java.
+
+WWW: http://www2.cs.tum.edu/projects/cup/