--- MOVED	(revision 520577)
+++ MOVED	(working copy)
@@ -13600,3 +13600,4 @@ 
 lang/php71-extensions|lang/php72-extensions|2019-12-17|Has expired: upstream security support ended
 devel/pecl-request||2019-12-17|Has expired: upstream security support ended
 devel/googlemock||2019-12-19|Merged into devel/googletest
+java/jakarta-bcel|java/apache-bcel|2019-12-22|Renamed upstream
--- java/Makefile	(revision 520577)
+++ java/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
     COMMENT = Java language support
 
+    SUBDIR += apache-bcel
     SUBDIR += apache-commons-cli
     SUBDIR += apache-commons-collections
     SUBDIR += apache-commons-lang
@@ -42,7 +43,6 @@ 
     SUBDIR += intellij-ultimate
     SUBDIR += jad
     SUBDIR += jai
-    SUBDIR += jakarta-bcel
     SUBDIR += jakarta-commons-beanutils
     SUBDIR += jakarta-commons-codec
     SUBDIR += jakarta-commons-dbcp
--- java/apache-bcel/Makefile	(revision 520577)
+++ java/apache-bcel/Makefile	(working copy)
@@ -1,19 +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
+
 NO_ARCH=	yes
 
+WRKSRC= 	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PLIST_FILES=	%%JAVAJARDIR%%/bcel.jar
 
 OPTIONS_DEFINE=	DOCS
@@ -21,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>
--- java/apache-bcel/distinfo	(revision 520577)
+++ java/apache-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
--- java/apache-bcel/pkg-descr	(revision 520577)
+++ java/apache-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/
--- java/jakarta-bcel/Makefile	(revision 520577)
+++ java/jakarta-bcel/Makefile	(nonexistent)
@@ -1,29 +0,0 @@ 
-# $FreeBSD$
-
-PORTNAME=	bcel
-PORTVERSION=	5.2
-PORTREVISION=	2
-CATEGORIES=	java devel
-MASTER_SITES=	APACHE_JAKARTA/${PORTNAME}/binaries
-PKGNAMEPREFIX=	jakarta-
-
-MAINTAINER=	java@FreeBSD.org
-COMMENT=	Library for generating Java bytecode
-
-NO_BUILD=	yes
-USE_JAVA=	yes
-NO_ARCH=	yes
-
-PLIST_FILES=	%%JAVAJARDIR%%/bcel.jar
-
-OPTIONS_DEFINE=	DOCS
-
-PORTDOCS=	*
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.jar \
-	    ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "-not -empty")
-
-.include <bsd.port.mk>
--- java/jakarta-bcel/distinfo	(revision 520577)
+++ java/jakarta-bcel/distinfo	(nonexistent)
@@ -1,2 +0,0 @@ 
-SHA256 (bcel-5.2.tar.gz) = 669e96c3553e2c4f41842f8837c544b8fb00c58cc45e1904964d52a74cb3f78e
-SIZE (bcel-5.2.tar.gz) = 2080066
--- java/jakarta-bcel/pkg-descr	(revision 520577)
+++ java/jakarta-bcel/pkg-descr	(nonexistent)
@@ -1,19 +0,0 @@ 
-The Byte Code Engineering Library (formerly known as JavaClass) is
-intended to give users a convenient possibility to analyze, create,
-and manipulate (binary) Java class files (those ending with
-.class). Classes are represented by objects which contain all the
-symbolic information of the given class: methods, fields and byte code
-instructions, in particular.
-
-Such objects can be read from an existing file, be transformed by a
-program (e.g. a class loader at run-time) and dumped to a file
-again. An even more interesting application is the creation of classes
-from scratch at run-time. The Byte Code Engineering Library (BCEL) may
-be also useful if you want to learn about the Java Virtual Machine
-(JVM) and the format of Java .class files.
-
-BCEL is already being used successfully in several projects such as
-compilers, optimizers, obsfuscators and analysis tools, the most
-popular probably being the Xalan XSLT processor at Apache.
-
-WWW: http://jakarta.apache.org/bcel/