Index: java/jakarta-bcel/Makefile
===================================================================
--- java/jakarta-bcel/Makefile	(revision 513999)
+++ java/jakarta-bcel/Makefile	(working copy)
@@ -1,20 +1,23 @@
 # $FreeBSD$
 
 PORTNAME=	bcel
-PORTVERSION=	5.2
-PORTREVISION=	2
+PORTVERSION=	6.4.1
 CATEGORIES=	java devel
-MASTER_SITES=	APACHE_JAKARTA/${PORTNAME}/binaries
-PKGNAMEPREFIX=	jakarta-
+MASTER_SITES=	APACHE_COMMONS_BINARIES
+PKGNAMEPREFIX=	apache-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Library for generating Java bytecode
 
+LICENSE=	APACHE20
+
 NO_BUILD=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	8+
 NO_ARCH=	yes
 
+WRKSRC= 	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PLIST_FILES=	%%JAVAJARDIR%%/bcel.jar
 
 OPTIONS_DEFINE=	DOCS
@@ -22,9 +25,9 @@
 PORTDOCS=	*
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar \
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar \
 	    ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "-not -empty")
+	(cd ${WRKSRC}/apidocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "-not -empty")
 
 .include <bsd.port.mk>
Index: java/jakarta-bcel/distinfo
===================================================================
--- java/jakarta-bcel/distinfo	(revision 513999)
+++ java/jakarta-bcel/distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (bcel-5.2.tar.gz) = 669e96c3553e2c4f41842f8837c544b8fb00c58cc45e1904964d52a74cb3f78e
-SIZE (bcel-5.2.tar.gz) = 2080066
+TIMESTAMP = 1570484666
+SHA256 (bcel-6.4.1-bin.tar.gz) = 1621dfa6418c6c2df83ea4da5eda9eb84955a3332c8e2580dd96e2db95fd8085
+SIZE (bcel-6.4.1-bin.tar.gz) = 5740090
Index: java/jakarta-bcel/pkg-descr
===================================================================
--- java/jakarta-bcel/pkg-descr	(revision 513999)
+++ java/jakarta-bcel/pkg-descr	(working copy)
@@ -16,4 +16,4 @@
 compilers, optimizers, obsfuscators and analysis tools, the most
 popular probably being the Xalan XSLT processor at Apache.
 
-WWW: http://jakarta.apache.org/bcel/
+WWW: http://commons.apache.org/proper/commons-bcel/