64 files changed, 196 insertions, 96 deletions

diff --git a/MOVED b/MOVED
index 0e31b2560b0d..8b7f58229a2f 100644
--- a/MOVED
+++ b/MOVED
@@ -13054,3 +13054,16 @@ x11/xtrap||2019-10-01|Deprecated upstream
 security/softhsm|security/softhsm2|2019-10-04|Has expired: End-of-life announced, update to softhsm2 ASAP.
 net/asterisk15|net/asterisk16|2019-10-04|Has expired: Asterisk 15.x will reach EOL on 2019-10-03. Please migrate to net/asterisk16
 x11-wm/fvwm|x11-wm/fvwm2|2019-10-06|Has expired: Unfetchable, unmaintained, unsupported upstream
+databases/jakarta-commons-dbutils|databases/apache-commons-dbutils|2019-10-06|Renamed upstream
+devel/jakarta-commons-configuration|devel/apache-commons-configuration|2019-10-06|Renamed upstream
+devel/jakarta-commons-io|devel/apache-commons-io|2019-10-06|Renamed upstream
+devel/jakarta-commons-jxpath|devel/apache-commons-jxpath|2019-10-06|Renamed upstream
+devel/jakarta-commons-modeler|devel/apache-commons-modeler|2019-10-06|Renamed upstream
+java/jakarta-commons-cli|apache-commons-cli|2019-10-06|Renamed upstream
+java/jakarta-commons-collections|java/apache-commons-collections|2019-10-06|Renamed upstream
+java/jakarta-commons-lang|apache-commons-lang|2019-10-06|Renamed upstream
+java/jakarta-commons-logging|java/apache-commons-logging|2019-10-06|Renamed upstream
+java/jakarta-commons-primitives|java/apache-commons-primitives|2019-10-06|Renamed upstream
+lang/jakarta-commons-jelly|lang/apache-commons-jelly|2019-10-06|Renamed upstream
+net/jakarta-commons-net|net/apache-commons-net|2019-10-06|Renamed upstream
+textproc/jakarta-commons-digester|textproc/apache-commons-digester|2019-10-06|Renamed upstream
diff --git a/databases/Makefile b/databases/Makefile
index 691981f2ff2a..8f7dc28e3a36 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -15,6 +15,7 @@
     SUBDIR += adodb
     SUBDIR += adodb5
     SUBDIR += akonadi
+    SUBDIR += apache-commons-dbutils
     SUBDIR += apq
     SUBDIR += apq-mysql
     SUBDIR += apq-odbc
@@ -113,7 +114,6 @@
     SUBDIR += ipa_sdb
     SUBDIR += iplike
     SUBDIR += isql-viewer
-    SUBDIR += jakarta-commons-dbutils
     SUBDIR += jasperreports
     SUBDIR += jdb
     SUBDIR += jdbc-oracle11g
diff --git a/databases/jakarta-commons-dbutils/Makefile b/databases/apache-commons-dbutils/Makefile
index f8d3d5e049ba..3d4d1c7ac05e 100644
--- a/databases/jakarta-commons-dbutils/Makefile
+++ b/databases/apache-commons-dbutils/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	commons-dbutils
 PORTVERSION=	1.7
 CATEGORIES=	databases java
 MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/databases/jakarta-commons-dbutils/distinfo b/databases/apache-commons-dbutils/distinfo
index 753d2646a7b7..753d2646a7b7 100644
--- a/databases/jakarta-commons-dbutils/distinfo
+++ b/databases/apache-commons-dbutils/distinfo
diff --git a/databases/jakarta-commons-dbutils/pkg-descr b/databases/apache-commons-dbutils/pkg-descr
index da293d64c72e..da293d64c72e 100644
--- a/databases/jakarta-commons-dbutils/pkg-descr
+++ b/databases/apache-commons-dbutils/pkg-descr
diff --git a/devel/Makefile b/devel/Makefile
index fe76aa72689b..d99ca0595e97 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -124,6 +124,10 @@
     SUBDIR += antlr3
     SUBDIR += antlr4
     SUBDIR += apache-ant
+    SUBDIR += apache-commons-configuration
+    SUBDIR += apache-commons-io
+    SUBDIR += apache-commons-jxpath
+    SUBDIR += apache-commons-modeler
     SUBDIR += apache-rat
     SUBDIR += aphpbreakdown
     SUBDIR += aphpunit
@@ -1026,11 +1030,7 @@
     SUBDIR += itext
     SUBDIR += ivykis
     SUBDIR += iz
-    SUBDIR += jakarta-commons-configuration
     SUBDIR += jakarta-commons-daemon
-    SUBDIR += jakarta-commons-io
-    SUBDIR += jakarta-commons-jxpath
-    SUBDIR += jakarta-commons-modeler
     SUBDIR += jam
     SUBDIR += jansson
     SUBDIR += java-findbugs
diff --git a/devel/jakarta-commons-configuration/Makefile b/devel/apache-commons-configuration/Makefile
index cbfe62f5ce9e..c976d1d057a7 100644
--- a/devel/jakarta-commons-configuration/Makefile
+++ b/devel/apache-commons-configuration/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	commons-configuration
 PORTVERSION=	1.10
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,7 +15,7 @@ LICENSE=	APACHE20
 
 RUN_DEPENDS=	${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \
 		${JAVALIBDIR}/commons-lang.jar:java/jakarta-commons-lang \
-		${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
+		${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/devel/jakarta-commons-configuration/distinfo b/devel/apache-commons-configuration/distinfo
index 43d41c56b753..43d41c56b753 100644
--- a/devel/jakarta-commons-configuration/distinfo
+++ b/devel/apache-commons-configuration/distinfo
diff --git a/devel/jakarta-commons-configuration/pkg-descr b/devel/apache-commons-configuration/pkg-descr
index bfec199140c7..525af682e7fa 100644
--- a/devel/jakarta-commons-configuration/pkg-descr
+++ b/devel/apache-commons-configuration/pkg-descr
@@ -7,12 +7,17 @@ Configuration parameters may be loaded from the following sources:
 
   * Properties files
   * XML documents
+  * Windows INI files
+  * Property list files (plist)
   * JNDI
   * JDBC Datasource
+  * System properties
+  * Applet parameters
+  * Servlet parameters
 
 Different configuration sources can be mixed using a ConfigurationFactory and
 CompositeConfiguration. Additional sources of configuration parameters can be
 created by using custom configuration objects. This customization can be
 achieved by extending AbstractConfiguration.
 
-WWW: http://jakarta.apache.org/commons/configuration/
+WWW: http://commons.apache.org/proper/commons-configuration/
diff --git a/devel/jakarta-commons-io/Makefile b/devel/apache-commons-io/Makefile
index f1395a66d88f..0621d5111dde 100644
--- a/devel/jakarta-commons-io/Makefile
+++ b/devel/apache-commons-io/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	commons-io
 PORTVERSION=	2.6
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/jakarta-commons-io/distinfo b/devel/apache-commons-io/distinfo
index 4d77571f8bc5..4d77571f8bc5 100644
--- a/devel/jakarta-commons-io/distinfo
+++ b/devel/apache-commons-io/distinfo
diff --git a/devel/jakarta-commons-io/pkg-descr b/devel/apache-commons-io/pkg-descr
index f1f64271d017..f1f64271d017 100644
--- a/devel/jakarta-commons-io/pkg-descr
+++ b/devel/apache-commons-io/pkg-descr
diff --git a/devel/jakarta-commons-jxpath/Makefile b/devel/apache-commons-jxpath/Makefile
index 35f0330695e0..6e795139ecf7 100644
--- a/devel/jakarta-commons-jxpath/Makefile
+++ b/devel/apache-commons-jxpath/Makefile
@@ -5,9 +5,11 @@ PORTNAME=	commons-jxpath
 PORTVERSION=	1.3
 CATEGORIES=	devel www java
 MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
+LICENSE=	APACHE20
+
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities for manipulating Java Beans using the XPath syntax
 
diff --git a/devel/jakarta-commons-jxpath/distinfo b/devel/apache-commons-jxpath/distinfo
index 2ffe54588e4a..2ffe54588e4a 100644
--- a/devel/jakarta-commons-jxpath/distinfo
+++ b/devel/apache-commons-jxpath/distinfo
diff --git a/devel/jakarta-commons-jxpath/pkg-descr b/devel/apache-commons-jxpath/pkg-descr
index 2de18b2de3c8..5d24286ce755 100644
--- a/devel/jakarta-commons-jxpath/pkg-descr
+++ b/devel/apache-commons-jxpath/pkg-descr
@@ -3,4 +3,4 @@ expression language called XPath. JXPath applies XPath  expressions to
 graphs of objects of all kinds: JavaBeans, Maps, Servlet contexts, DOM
 etc, including mixtures thereof.
 
-WWW: http://jakarta.apache.org/commons/jxpath/
+WWW: http://commons.apache.org/proper/commons-jxpath/
diff --git a/devel/jakarta-commons-modeler/Makefile b/devel/apache-commons-modeler/Makefile
index 418ea0f8b82f..f16d0d84a701 100644
--- a/devel/jakarta-commons-modeler/Makefile
+++ b/devel/apache-commons-modeler/Makefile
@@ -3,14 +3,15 @@
 
 PORTNAME=	commons-modeler
 PORTVERSION=	2.0.1
-PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mechanisms to create Model MBeans compatible with JMX specification
 
+LICENSE=	APACHE20
+
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/devel/jakarta-commons-modeler/distinfo b/devel/apache-commons-modeler/distinfo
index 96951f002387..96951f002387 100644
--- a/devel/jakarta-commons-modeler/distinfo
+++ b/devel/apache-commons-modeler/distinfo
diff --git a/devel/jakarta-commons-modeler/pkg-descr b/devel/apache-commons-modeler/pkg-descr
index 2eec22377327..0487fdbd191b 100644
--- a/devel/jakarta-commons-modeler/pkg-descr
+++ b/devel/apache-commons-modeler/pkg-descr
@@ -15,4 +15,4 @@ information. The Modeler component is designed to make this process fairly pain
 Model MBean to be supported. In addition, Modeler provides a factory mechanism
 to create the actual Model MBean instances themselves.
 
-WWW: http://jakarta.apache.org/commons/modeler/
+WWW: https://commons.apache.org/dormant/commons-modeler/
diff --git a/devel/charva/Makefile b/devel/charva/Makefile
index 6d78ddf0adef..8f1712c9b0dc 100644
--- a/devel/charva/Makefile
+++ b/devel/charva/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	charva
 PORTVERSION=	1.1.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}
@@ -12,7 +12,7 @@ MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Java Windowing Toolkit for Text Terminals
 
 BUILD_DEPENDS=	gmake:devel/gmake
-RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
+RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 
 BROKEN_armv6=		fails to compile: build.xml: compilation failed
 BROKEN_armv7=		fails to compile: build.xml: compilation failed
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index d2ea518f753e..525c4fe2a6e8 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-openoffice
 PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP}
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	editors java
 MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \
@@ -232,8 +232,8 @@ CONFIGURE_ARGS+=	--enable-symbols
 .endif
 
 .if ${PORT_OPTIONS:MREPORT_BUILDER} || ${PORT_OPTIONS:MWIKI_PUBLISHER}
-BUILD_DEPENDS+=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
-RUN_DEPENDS+=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
+BUILD_DEPENDS+=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
+RUN_DEPENDS+=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 CONFIGURE_ARGS+=	--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar
 .else
 CONFIGURE_ARGS+=	--without-commons-logging
diff --git a/java/Makefile b/java/Makefile
index 7245c690c1a8..f06431ded1a9 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -3,6 +3,11 @@
 
     COMMENT = Java language support
 
+    SUBDIR += apache-commons-cli
+    SUBDIR += apache-commons-collections
+    SUBDIR += apache-commons-lang
+    SUBDIR += apache-commons-logging
+    SUBDIR += apache-commons-primitives
     SUBDIR += aparapi
     SUBDIR += avis
     SUBDIR += berkeley-db
@@ -39,17 +44,12 @@
     SUBDIR += jai
     SUBDIR += jakarta-bcel
     SUBDIR += jakarta-commons-beanutils
-    SUBDIR += jakarta-commons-cli
     SUBDIR += jakarta-commons-codec
-    SUBDIR += jakarta-commons-collections
     SUBDIR += jakarta-commons-dbcp
     SUBDIR += jakarta-commons-discovery
     SUBDIR += jakarta-commons-httpclient
-    SUBDIR += jakarta-commons-lang
     SUBDIR += jakarta-commons-lang3
-    SUBDIR += jakarta-commons-logging
     SUBDIR += jakarta-commons-pool
-    SUBDIR += jakarta-commons-primitives
     SUBDIR += jakarta-oro
     SUBDIR += jakarta-regexp
     SUBDIR += jasmin
diff --git a/java/jakarta-commons-cli/Makefile b/java/apache-commons-cli/Makefile
index ae8a03806f32..3c8f8fef617b 100644
--- a/java/jakarta-commons-cli/Makefile
+++ b/java/apache-commons-cli/Makefile
@@ -3,10 +3,9 @@
 
 PORTNAME=	commons-cli
 PORTVERSION=	1.4
-PORTEPOCH=	1
 CATEGORIES=	java devel
 MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/java/jakarta-commons-cli/distinfo b/java/apache-commons-cli/distinfo
index d17791bd43f0..d17791bd43f0 100644
--- a/java/jakarta-commons-cli/distinfo
+++ b/java/apache-commons-cli/distinfo
diff --git a/java/apache-commons-cli/pkg-descr b/java/apache-commons-cli/pkg-descr
new file mode 100644
index 000000000000..f4bf86fafc24
--- /dev/null
+++ b/java/apache-commons-cli/pkg-descr
@@ -0,0 +1,4 @@
+The Apache Commons CLI library provides a simple and easy to use
+API for working with the command line arguments and options.
+
+WWW: http://commons.apache.org/proper/commons-cli/
diff --git a/java/jakarta-commons-collections/Makefile b/java/apache-commons-collections/Makefile
index 8d18f1a2c234..16ab1601e58f 100644
--- a/java/jakarta-commons-collections/Makefile
+++ b/java/apache-commons-collections/Makefile
@@ -5,16 +5,19 @@ PORTNAME=	commons-collections
 PORTVERSION=	3.2.1
 CATEGORIES=	java devel
 MASTER_SITES=	APACHE_COMMONS_SOURCE
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Classes that extend/augment the Java Collections Framework
 
+LICENSE=	APACHE20
+
+USES=		dos2unix
+
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	8+
 USE_ANT=	yes
-USES=		dos2unix
 DOS2UNIX_GLOB=	Multi*.java Test*.java
 
 ALL_TARGET=	jar
diff --git a/java/jakarta-commons-collections/distinfo b/java/apache-commons-collections/distinfo
index 66bcef28aaaa..ef7c4127095b 100644
--- a/java/jakarta-commons-collections/distinfo
+++ b/java/apache-commons-collections/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1570206793
 SHA256 (commons-collections-3.2.1-src.tar.gz) = 9a4a800cb7ecdaf3b6f608cd608682b88b506f1b1c4b727d15471ae3329fc63d
 SIZE (commons-collections-3.2.1-src.tar.gz) = 609930
diff --git a/java/jakarta-commons-collections/files/patch-jdk8 b/java/apache-commons-collections/files/patch-jdk8
index 3c4cd156b6b3..b59963086a39 100644
--- a/java/jakarta-commons-collections/files/patch-jdk8
+++ b/java/apache-commons-collections/files/patch-jdk8
@@ -1,6 +1,6 @@
---- src/java/org/apache/commons/collections/MultiHashMap.java
+--- src/java/org/apache/commons/collections/MultiHashMap.java.orig	2019-10-04 16:36:43 UTC
 +++ src/java/org/apache/commons/collections/MultiHashMap.java
-@@ -331,21 +331,21 @@ public class MultiHashMap extends HashMap implements MultiMap {
+@@ -331,21 +331,21 @@ public class MultiHashMap extends HashMap implements M
       * @param item  the value to remove
       * @return the value removed (which was passed in), null if nothing removed
       */
@@ -26,8 +26,7 @@
      }
  
      /**
-
---- src/java/org/apache/commons/collections/MultiMap.java
+--- src/java/org/apache/commons/collections/MultiMap.java.orig	2019-10-04 16:36:43 UTC
 +++ src/java/org/apache/commons/collections/MultiMap.java
 @@ -66,7 +66,7 @@ public interface MultiMap extends Map {
       * @throws ClassCastException if the key or value is of an invalid type
@@ -47,8 +46,7 @@
  
      /**
       * Gets a collection containing all the values in the map.
-
---- src/java/org/apache/commons/collections/map/MultiKeyMap.java
+--- src/java/org/apache/commons/collections/map/MultiKeyMap.java.orig	2019-10-04 16:36:43 UTC
 +++ src/java/org/apache/commons/collections/map/MultiKeyMap.java
 @@ -197,7 +197,7 @@ public class MultiKeyMap
       * @param key2  the second key
@@ -76,10 +74,9 @@
      }
  
      /**
-
---- src/java/org/apache/commons/collections/map/MultiValueMap.java
+--- src/java/org/apache/commons/collections/map/MultiValueMap.java.orig	2019-10-04 16:36:43 UTC
 +++ src/java/org/apache/commons/collections/map/MultiValueMap.java
-@@ -153,19 +153,19 @@ public class MultiValueMap extends AbstractMapDecorator implements MultiMap {
+@@ -153,19 +153,19 @@ public class MultiValueMap extends AbstractMapDecorato
       * @param value the value to remove
       * @return the value removed (which was passed in), null if nothing removed
       */
@@ -103,10 +100,9 @@
      }
  
      /**
-
---- src/test/org/apache/commons/collections/TestMultiHashMap.java
+--- src/test/org/apache/commons/collections/TestMultiHashMap.java.orig	2019-10-04 16:36:43 UTC
 +++ src/test/org/apache/commons/collections/TestMultiHashMap.java
-@@ -464,11 +464,11 @@ public class TestMultiHashMap extends AbstractTestMap {
+@@ -464,11 +464,11 @@ public class TestMultiHashMap extends AbstractTestMap 
          map.put("A", "AA");
          map.put("A", "AB");
          map.put("A", "AC");
@@ -123,10 +119,9 @@
          assertEquals(new MultiHashMap(), map);
      }
  
-
---- src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
+--- src/test/org/apache/commons/collections/map/TestMultiKeyMap.java.orig	2019-10-04 16:36:43 UTC
 +++ src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
-@@ -315,10 +315,10 @@ public class TestMultiKeyMap extends AbstractTestIterableMap {
+@@ -315,10 +315,10 @@ public class TestMultiKeyMap extends AbstractTestItera
              switch (key.size()) {
                  case 2:
                  assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1)));
@@ -139,6 +134,3 @@
                  assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));
                  break;
                  case 3:
--- 
-2.5.0
-
diff --git a/java/jakarta-commons-collections/pkg-descr b/java/apache-commons-collections/pkg-descr
index 30ff4cf8b74a..82612041d587 100644
--- a/java/jakarta-commons-collections/pkg-descr
+++ b/java/apache-commons-collections/pkg-descr
@@ -1,12 +1,11 @@
 A suite of classes that extend or augment the Java Collections Framework.
 
-There are certain holes left unfilled by Sun's implementations, and the
-Jakarta-Commons Collections Component strives to fulfill them. Among the
-features of this package are:
+Commons-Collections seek to build upon the JDK classes by providing new interfaces, implementations and utilities. There are many features,
+including:
 
 Special-purpose implementations of Lists and Maps for fast access Adapter
 classes from Java1-style containers (arrays, enumerations) to Java 2-style
 collections. Methods to test or create typical set-theory properties of
 collections such as union, intersection, and closure.
 
-WWW: http://jakarta.apache.org/commons/collections/
+WWW: http://commons.apache.org/proper/commons-collections/
diff --git a/java/jakarta-commons-lang/Makefile b/java/apache-commons-lang/Makefile
index c9099b278dde..1dc30a7a3b81 100644
--- a/java/jakarta-commons-lang/Makefile
+++ b/java/apache-commons-lang/Makefile
@@ -5,11 +5,11 @@ PORTNAME=	commons-lang
 PORTVERSION=	2.6
 CATEGORIES=	java devel
 MASTER_SITES=	APACHE_COMMONS_SOURCE
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Jakarta library with helper utilities for the java.lang API
+COMMENT=	Apache library with helper utilities for the java.lang API
 
 LICENSE=	APACHE20
 
diff --git a/java/jakarta-commons-lang/distinfo b/java/apache-commons-lang/distinfo
index 7e9fabf47253..7e9fabf47253 100644
--- a/java/jakarta-commons-lang/distinfo
+++ b/java/apache-commons-lang/distinfo
diff --git a/java/jakarta-commons-lang/pkg-descr b/java/apache-commons-lang/pkg-descr
index f3201fc3f34a..a9e5b50b78ec 100644
--- a/java/jakarta-commons-lang/pkg-descr
+++ b/java/apache-commons-lang/pkg-descr
@@ -10,4 +10,4 @@ enum type, an exception structure that supports multiple types of
 nested-Exceptions and a series of utlities dedicated to help with
 building methods, such as hashCode, toString and equals.
 
-WWW: http://jakarta.apache.org/commons/lang/
+WWW: http://commons.apache.org/proper/commons-lang/
diff --git a/java/jakarta-commons-logging/Makefile b/java/apache-commons-logging/Makefile
index 7271807ca0a5..d11312f4134b 100644
--- a/java/jakarta-commons-logging/Makefile
+++ b/java/apache-commons-logging/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	commons-logging
 PORTVERSION=	1.2
 CATEGORIES=	java devel
 MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/java/jakarta-commons-logging/distinfo b/java/apache-commons-logging/distinfo
index a8e6b728f678..dbbab162e5d4 100644
--- a/java/jakarta-commons-logging/distinfo
+++ b/java/apache-commons-logging/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1570207571
 SHA256 (commons-logging-1.2-bin.tar.gz) = 3f758805c7290d9c6d22d1451587c9f7232744aef4c984e88aa683cdea0587bd
 SIZE (commons-logging-1.2-bin.tar.gz) = 315429
diff --git a/java/jakarta-commons-logging/pkg-descr b/java/apache-commons-logging/pkg-descr
index cca5492a557b..02a93bf2c47d 100644
--- a/java/jakarta-commons-logging/pkg-descr
+++ b/java/apache-commons-logging/pkg-descr
@@ -1,4 +1,4 @@
-Jakarta Commons Logging library.
+Apache Commons Logging library.
 
 There is a great need for debugging and logging information inside of Commons
 components such as HTTPClient and DBCP. However, there are many logging APIs
@@ -9,4 +9,4 @@ libraries. Commons components may use the Logging API to remove compile-time
 and run-time dependencies on any particular logging package, and contributors
 may write Log implementations for the library of their choice.
 
-WWW: http://jakarta.apache.org/commons/logging/
+WWW: http://commons.apache.org/proper/commons-logging/
diff --git a/java/jakarta-commons-primitives/Makefile b/java/apache-commons-primitives/Makefile
index d2b42ac33f1a..d0f90bd72722 100644
--- a/java/jakarta-commons-primitives/Makefile
+++ b/java/apache-commons-primitives/Makefile
@@ -3,15 +3,16 @@
 
 PORTNAME=	commons-primitives
 PORTVERSION=	1.0
-PORTREVISION=	3
 CATEGORIES=	java
 MASTER_SITES=	APACHE_COMMONS_SOURCE
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library supporting Java primitive types
 
+LICENSE=	APACHE20
+
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
diff --git a/java/jakarta-commons-primitives/distinfo b/java/apache-commons-primitives/distinfo
index a67b7cbf3782..a67b7cbf3782 100644
--- a/java/jakarta-commons-primitives/distinfo
+++ b/java/apache-commons-primitives/distinfo
diff --git a/java/jakarta-commons-primitives/pkg-descr b/java/apache-commons-primitives/pkg-descr
index 8b027b0211ab..3c8644d749fd 100644
--- a/java/jakarta-commons-primitives/pkg-descr
+++ b/java/apache-commons-primitives/pkg-descr
@@ -1,4 +1,4 @@
-Apache Jakarta Commons Primitives provides a collection of types and utilities
+Apache Commons Primitives provides a collection of types and utilities
 optimized for working with Java primitives (boolean, byte, char, double, float,
 int, long, short). Generally, the Commons-Primitives classes are faster,
 smaller and easier to work with than their purely Object based alternatives.
@@ -6,4 +6,4 @@ smaller and easier to work with than their purely Object based alternatives.
 Currently Commons Primitives is primarily composed of implementations of the
 java.util collections adapted for the primitive types.
 
-WWW: http://jakarta.apache.org/commons/primitives
+WWW: http://commons.apache.org/dormant/commons-primitives/
diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
index 4f71830f072c..c099069efeb3 100644
--- a/java/jakarta-commons-beanutils/Makefile
+++ b/java/jakarta-commons-beanutils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	commons-beanutils
 PORTVERSION=	1.9.2
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
@@ -13,10 +14,10 @@ COMMENT=	JavaBeans utility library
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
-		${JAVALIBDIR}/commons-collections.jar:java/jakarta-commons-collections
-RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
-		${JAVALIBDIR}/commons-collections.jar:java/jakarta-commons-collections
+BUILD_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
+		${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections
+RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
+		${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections
 
 USES=		dos2unix
 USE_JAVA=	yes
diff --git a/java/jakarta-commons-cli/pkg-descr b/java/jakarta-commons-cli/pkg-descr
deleted file mode 100644
index 92c720c4d4f3..000000000000
--- a/java/jakarta-commons-cli/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-The Jakarta Commons CLI library provides a simple and easy to use
-API for working with the command line arguments and options.
-
-WWW: http://jakarta.apache.org/commons/cli/
diff --git a/java/jakarta-commons-httpclient/Makefile b/java/jakarta-commons-httpclient/Makefile
index 9d0a38b74fa2..1b682d7f3837 100644
--- a/java/jakarta-commons-httpclient/Makefile
+++ b/java/jakarta-commons-httpclient/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	commons-httpclient
 DISTVERSION=	3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java www
 MASTER_SITES=	APACHE/httpcomponents/${PORTNAME}/source
 PKGNAMEPREFIX=	jakarta-
@@ -14,9 +14,9 @@ COMMENT=	Package implementing the client side of the HTTP standard
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
+BUILD_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 BUILD_DEPENDS+=	${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec
-RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
+RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 RUN_DEPENDS+=	${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec
 
 OPTIONS_DEFINE=	DOCS
diff --git a/java/jakarta-oro/pkg-descr b/java/jakarta-oro/pkg-descr
index fc15f6512b0d..21a52b2b5616 100644
--- a/java/jakarta-oro/pkg-descr
+++ b/java/jakarta-oro/pkg-descr
@@ -7,4 +7,6 @@ libraries from ORO, Inc. (www.oroinc.com).  They have been donated to
 the Jakarta Project by Daniel Savarese (www.savarese.org), the
 copyright holder of the ORO libraries.
 
+As of 2010-09-01, the ORO project is retired.
+
 WWW: http://jakarta.apache.org/oro/
diff --git a/java/jakarta-regexp/pkg-descr b/java/jakarta-regexp/pkg-descr
index 00b0866dc117..d91bade637c4 100644
--- a/java/jakarta-regexp/pkg-descr
+++ b/java/jakarta-regexp/pkg-descr
@@ -1,3 +1,5 @@
 A 100% Pure Java Regular Expression package by Jonathan Locke.
 
+As of 2011-04-17, the Regexp project is retired.
+
 WWW: http://jakarta.apache.org/regexp/
diff --git a/lang/Makefile b/lang/Makefile
index b39e8107b450..8365cedd2e00 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -11,6 +11,7 @@
     SUBDIR += alchemist.el
     SUBDIR += algol68g
     SUBDIR += angelscript
+    SUBDIR += apache-commons-jelly
     SUBDIR += arena
     SUBDIR += asis
     SUBDIR += asn1c
@@ -152,7 +153,6 @@
     SUBDIR += io-devel
     SUBDIR += itcl
     SUBDIR += itcl4
-    SUBDIR += jakarta-commons-jelly
     SUBDIR += janet
     SUBDIR += jimtcl
     SUBDIR += jruby
diff --git a/lang/jakarta-commons-jelly/Makefile b/lang/apache-commons-jelly/Makefile
index 34a440723d0f..f69eba1efeb2 100644
--- a/lang/jakarta-commons-jelly/Makefile
+++ b/lang/apache-commons-jelly/Makefile
@@ -3,14 +3,15 @@
 
 PORTNAME=	commons-jelly
 PORTVERSION=	1.0
-PORTREVISION=	3
 CATEGORIES=	lang devel java
 MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML based scripting engine
 
+LICENSE=	APACHE20
+
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
diff --git a/lang/jakarta-commons-jelly/distinfo b/lang/apache-commons-jelly/distinfo
index 76d134fb15dd..7969817c5712 100644
--- a/lang/jakarta-commons-jelly/distinfo
+++ b/lang/apache-commons-jelly/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1570225476
 SHA256 (commons-jelly-1.0.tar.gz) = c945943c1ca8c05170d1a7eb7402363c6817819321e1b2ae749d4ee93f27061b
 SIZE (commons-jelly-1.0.tar.gz) = 3384141
diff --git a/lang/jakarta-commons-jelly/files/jelly.sh.in b/lang/apache-commons-jelly/files/jelly.sh.in
index bcc7cc0427a1..bcc7cc0427a1 100644
--- a/lang/jakarta-commons-jelly/files/jelly.sh.in
+++ b/lang/apache-commons-jelly/files/jelly.sh.in
diff --git a/lang/jakarta-commons-jelly/pkg-descr b/lang/apache-commons-jelly/pkg-descr
index a7f9433f14c8..717f2f15f2b8 100644
--- a/lang/jakarta-commons-jelly/pkg-descr
+++ b/lang/apache-commons-jelly/pkg-descr
@@ -12,4 +12,4 @@ dynamic web site generation. A single Jelly tag can produce, consume, filter or
 transform XML events. This leads to a powerful XML pipeline engine similar in
 some ways to Cocoon.
 
-WWW: http://jakarta.apache.org/commons/jelly/index.html
+WWW: http://commons.apache.org/proper/commons-jelly/index.html
diff --git a/mail/mime4j/Makefile b/mail/mime4j/Makefile
index c8e078208d44..b2dde935dcd6 100644
--- a/mail/mime4j/Makefile
+++ b/mail/mime4j/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mime4j
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	mail java
 MASTER_SITES=	APACHE/james/${PORTNAME}
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}-bin
@@ -12,7 +13,7 @@ COMMENT=	Java parser for e-mail message streams
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
+RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 47cc165b4d14..49a850dbd3d6 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scilab
 PORTVERSION=	5.5.2
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	math cad java
 MASTER_SITES=	https://www.scilab.org/download/${PORTVERSION}/
 DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX}
@@ -68,7 +68,7 @@ _GUI_DEPENDS+=	${JAVALIBDIR}/flexdock.jar:devel/flexdock \
 		foprep:math/jeuclid \
 		${JAVALIBDIR}/jhall.jar:java/javahelp \
 		${JAVALIBDIR}/jrosetta-api.jar:java/jrosetta \
-		${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
+		${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
 		${JAVALIBDIR}/jgraphx.jar:java/jgraphx \
 		${JAVALIBDIR}/jlatexmath.jar:math/jlatexmath \
 		${LOCALBASE}/share/java/ecj-4.5.jar:lang/gcc-ecj45
@@ -77,7 +77,7 @@ _GUI_DEPENDS+=	${LOCALBASE}/share/java/fop/build/fop.jar:textproc/fop \
 		${JAVALIBDIR}/jlatexmath-fop.jar:math/jlatexmath \
 		${LOCALBASE}/share/java/batik/lib/batik-all.jar:graphics/batik \
 		${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \
-		${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io \
+		${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io \
 		${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons
 # Code quality:
 _GUI_DEPENDS+=	${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \
diff --git a/net/Makefile b/net/Makefile
index b95d72c5ff3d..613cf154f8c6 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -20,6 +20,7 @@
     SUBDIR += aluminum
     SUBDIR += anet
     SUBDIR += aoe
+    SUBDIR += apache-commons-net
     SUBDIR += apinger
     SUBDIR += appkonference
     SUBDIR += aprsc
@@ -283,7 +284,6 @@
     SUBDIR += isc-dhcp44-relay
     SUBDIR += isc-dhcp44-server
     SUBDIR += istgt
-    SUBDIR += jakarta-commons-net
     SUBDIR += java-beepcore
     SUBDIR += jcifs
     SUBDIR += jgroups
diff --git a/net/jakarta-commons-net/Makefile b/net/apache-commons-net/Makefile
index 083c6047bc2d..587cf57c0dac 100644
--- a/net/jakarta-commons-net/Makefile
+++ b/net/apache-commons-net/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	commons-net
 PORTVERSION=	3.6
 CATEGORIES=	net java
 MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/net/jakarta-commons-net/distinfo b/net/apache-commons-net/distinfo
index 9cd01c06b19d..9cd01c06b19d 100644
--- a/net/jakarta-commons-net/distinfo
+++ b/net/apache-commons-net/distinfo
diff --git a/net/jakarta-commons-net/pkg-descr b/net/apache-commons-net/pkg-descr
index c00b17103f75..f983a181288b 100644
--- a/net/jakarta-commons-net/pkg-descr
+++ b/net/apache-commons-net/pkg-descr
@@ -1,4 +1,4 @@
-Jakarta Commons Net implements the client side of many basic Internet
+Apache Commons Net implements the client side of many basic Internet
 protocols. The purpose of the library is to provide fundamental protocol
 access.
 
@@ -18,4 +18,4 @@ Supported protocols are:
     * Discard
     * NTP/SNTP
 
-WWW: http://jakarta.apache.org/commons/net/
+WWW: http://commons.apache.org/proper/commons-net/
diff --git a/print/pdfbox/Makefile b/print/pdfbox/Makefile
index cf65fc476591..f5b214d832be 100644
--- a/print/pdfbox/Makefile
+++ b/print/pdfbox/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pdfbox
 PORTVERSION=	2.0.14
+PORTREVISION=	1
 CATEGORIES=	print textproc java
 MASTER_SITES=	APACHE/pdfbox/${PORTVERSION}
 DISTFILES=	${JAR_NAMES:S/$/-${PORTVERSION}.jar/}
@@ -14,8 +15,8 @@ COMMENT=	Java tool for working with PDF documents
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${JAVALIBDIR}/bcmail.jar:java/bouncycastle15 \
-		${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
-		${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io
+		${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
+		${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io
 
 JAR_NAMES=	pdfbox fontbox preflight xmpbox pdfbox-tools pdfbox-debugger
 
diff --git a/security/xml-security/Makefile b/security/xml-security/Makefile
index c8def9db1c8a..f8b523c209fe 100644
--- a/security/xml-security/Makefile
+++ b/security/xml-security/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xml-security
 DISTVERSION=	1_5_5
+PORTREVISION=	1
 CATEGORIES=	security java
 MASTER_SITES=	APACHE/santuario/java-library/${DISTVERSION}
 DISTNAME=	${PORTNAME}-src-${DISTVERSION}
@@ -10,9 +11,9 @@ DISTNAME=	${PORTNAME}-src-${DISTVERSION}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Java library for XML Signature and Encryption
 
-BUILD_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
+BUILD_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
 		${JAVALIBDIR}/xalan.jar:textproc/xalan-j
-RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging
+RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
 
 LICENSE=	APACHE20
 
diff --git a/textproc/Makefile b/textproc/Makefile
index 3ab141e9ad67..b1d9d0ccdd11 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -41,6 +41,7 @@
     SUBDIR += amberfish
     SUBDIR += ansifilter
     SUBDIR += antiword
+    SUBDIR += apache-commons-digester
     SUBDIR += apache-poi
     SUBDIR += apache-solr
     SUBDIR += apertium
@@ -304,7 +305,6 @@
     SUBDIR += itstool
     SUBDIR += itstool22
     SUBDIR += jade
-    SUBDIR += jakarta-commons-digester
     SUBDIR += jalingo
     SUBDIR += jarnal
     SUBDIR += java2html
diff --git a/textproc/apache-commons-digester/Makefile b/textproc/apache-commons-digester/Makefile
new file mode 100644
index 000000000000..071043fa930a
--- /dev/null
+++ b/textproc/apache-commons-digester/Makefile
@@ -0,0 +1,55 @@
+# Created by: Herve Quiroz <hq@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	commons-digester
+PORTVERSION=	2.1
+PORTREVISION=	1
+CATEGORIES=	textproc java devel
+MASTER_SITES=	APACHE_COMMONS_BINARIES
+PKGNAMEPREFIX=	jakarta-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	XML-to-Java-object mapping utility package
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+BUILD_DEPENDS=	${JAR_DEPENDS}
+RUN_DEPENDS=	${JAR_DEPENDS}
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+NO_BUILD=	yes
+NO_ARCH=	yes
+USE_JAVA=	yes
+JAVA_VERSION=	1.6+
+
+JARFILE=	${PORTNAME}.jar
+PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
+
+OPTIONS_DEFINE=	DOCS
+
+OTHERDOCS=	LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
+PORTDOCS=	*
+
+.include <bsd.port.pre.mk>
+
+JAR_DEPENDS=	${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \
+		${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
+		${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections \
+		${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j
+
+do-install:
+	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${JARFILE}
+	@${ECHO_MSG} " [ DONE ]"
+
+do-install-DOCS-on:
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
+	@cd ${WRKSRC}/apidocs \
+	  && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
+	${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
+	@${ECHO_MSG} " [ DONE ]"
+
+.include <bsd.port.post.mk>
diff --git a/textproc/jakarta-commons-digester/distinfo b/textproc/apache-commons-digester/distinfo
index a11eada91075..a11eada91075 100644
--- a/textproc/jakarta-commons-digester/distinfo
+++ b/textproc/apache-commons-digester/distinfo
diff --git a/textproc/jakarta-commons-digester/Makefile b/textproc/apache-commons-digester/jakarta-commons-digester/Makefile
index a69cb3021cb1..a69cb3021cb1 100644
--- a/textproc/jakarta-commons-digester/Makefile
+++ b/textproc/apache-commons-digester/jakarta-commons-digester/Makefile
diff --git a/textproc/apache-commons-digester/jakarta-commons-digester/distinfo b/textproc/apache-commons-digester/jakarta-commons-digester/distinfo
new file mode 100644
index 000000000000..a11eada91075
--- /dev/null
+++ b/textproc/apache-commons-digester/jakarta-commons-digester/distinfo
@@ -0,0 +1,2 @@
+SHA256 (commons-digester-2.1-bin.tar.gz) = c739162c5eafbbaecfe3ae9e3733221781def20c6603972a124b7ebb552a1af1
+SIZE (commons-digester-2.1-bin.tar.gz) = 2308650
diff --git a/textproc/jakarta-commons-digester/pkg-descr b/textproc/apache-commons-digester/jakarta-commons-digester/pkg-descr
index 3e724396c667..3e724396c667 100644
--- a/textproc/jakarta-commons-digester/pkg-descr
+++ b/textproc/apache-commons-digester/jakarta-commons-digester/pkg-descr
diff --git a/textproc/apache-commons-digester/pkg-descr b/textproc/apache-commons-digester/pkg-descr
new file mode 100644
index 000000000000..3e724396c667
--- /dev/null
+++ b/textproc/apache-commons-digester/pkg-descr
@@ -0,0 +1,15 @@
+The Digester package lets you configure an XML -> Java object mapping module,
+which triggers certain actions called rules whenever a particular pattern of
+nested XML elements is recognized. A rich set of predefined rules is available
+for your use, or you can also create your own. Advanced features of Digester
+include:
+
+  - Ability to plug in your own pattern matching engine, if the standard one is
+    not sufficient for your requirements.
+  - Optional namespace-aware processing, so that you can define rules that are
+    relevant only to a particular XML namespace.
+  - Encapsulation of Rules into RuleSets that can be easily and conveniently
+    reused in more than one application that requires the same type of
+    processing
+
+WWW: http://jakarta.apache.org/commons/digester/
diff --git a/www/httpclient/Makefile b/www/httpclient/Makefile
index 473c7e0f316c..6a903dce9eb4 100644
--- a/www/httpclient/Makefile
+++ b/www/httpclient/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	httpclient
 DISTVERSION=	4.5.10
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/httpcomponents/${PORTNAME}/binary
 DISTNAME=	httpcomponents-client-${DISTVERSION}-bin
@@ -14,7 +15,7 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${JAVALIBDIR}/httpcore.jar:www/httpcore \
-		${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging \
+		${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
 		${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec
 
 OPTIONS_DEFINE=	DOCS
diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile
index b6634b66eec0..3cf549101eb0 100644
--- a/www/jmeter/Makefile
+++ b/www/jmeter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apache-jmeter
 PORTVERSION=	2.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www benchmarks java
 MASTER_SITES=	APACHE/jmeter/binaries
 
@@ -18,12 +18,12 @@ LICENSE=	APACHE20
 RUN_DEPENDS=	\
 		${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework	\
 		${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec	\
-		${JAVALIBDIR}/commons-collections.jar:java/jakarta-commons-collections	\
+		${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections	\
 		${JAVALIBDIR}/commons-httpclient.jar:java/jakarta-commons-httpclient	\
-		${JAVALIBDIR}/commons-io.jar:devel/jakarta-commons-io \
+		${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io \
 		${JAVALIBDIR}/commons-lang.jar:java/jakarta-commons-lang	\
-		${JAVALIBDIR}/commons-logging.jar:java/jakarta-commons-logging	\
-		${JAVALIBDIR}/commons-net.jar:net/jakarta-commons-net	\
+		${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging	\
+		${JAVALIBDIR}/commons-net.jar:net/apache-commons-net	\
 		${JAVALIBDIR}/httpclient.jar:www/httpclient	\
 		${JAVALIBDIR}/httpcore.jar:www/httpcore	\
 		${JAVALIBDIR}/httpmime.jar:www/httpclient	\