Rename my jakarta- ports to apache-

11 files changed, 11 insertions, 11 deletions

diff --git a/java/Makefile b/java/Makefile
index 905412e8a621..0534fbaa45f5 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -5,7 +5,10 @@
 
     SUBDIR += apache-bcel
     SUBDIR += apache-commons-cli
+    SUBDIR += apache-commons-codec
     SUBDIR += apache-commons-collections
+    SUBDIR += apache-commons-dbcp
+    SUBDIR += apache-commons-httpclient
     SUBDIR += apache-commons-lang
     SUBDIR += apache-commons-lang3
     SUBDIR += apache-commons-logging
@@ -44,10 +47,7 @@
     SUBDIR += jad
     SUBDIR += jai
     SUBDIR += jakarta-commons-beanutils
-    SUBDIR += jakarta-commons-codec
-    SUBDIR += jakarta-commons-dbcp
     SUBDIR += jakarta-commons-discovery
-    SUBDIR += jakarta-commons-httpclient
     SUBDIR += jakarta-oro
     SUBDIR += jakarta-regexp
     SUBDIR += jasmin
diff --git a/java/jakarta-commons-codec/Makefile b/java/apache-commons-codec/Makefile
index 4bca71a2b034..ae091a53070b 100644
--- a/java/jakarta-commons-codec/Makefile
+++ b/java/apache-commons-codec/Makefile
@@ -4,7 +4,7 @@ PORTNAME=	commons-codec
 PORTVERSION=	1.13
 CATEGORIES=	java converters
 MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	ale@FreeBSD.org
diff --git a/java/jakarta-commons-codec/distinfo b/java/apache-commons-codec/distinfo
index ab606c63fe3c..ab606c63fe3c 100644
--- a/java/jakarta-commons-codec/distinfo
+++ b/java/apache-commons-codec/distinfo
diff --git a/java/jakarta-commons-codec/pkg-descr b/java/apache-commons-codec/pkg-descr
index 0598c457ac90..c3b17a96cc20 100644
--- a/java/jakarta-commons-codec/pkg-descr
+++ b/java/apache-commons-codec/pkg-descr
@@ -1,4 +1,4 @@
 Commons Codec provides implementations of common encoders and decoders
 such as Base64, Hex, various phonetic encodings, and URLs.
 
-WWW: http://jakarta.apache.org/commons/codec/
+WWW: https://commons.apache.org/codec/
diff --git a/java/jakarta-commons-dbcp/Makefile b/java/apache-commons-dbcp/Makefile
index 5c30d066c512..0675b5a1a0d6 100644
--- a/java/jakarta-commons-dbcp/Makefile
+++ b/java/apache-commons-dbcp/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	commons-dbcp
 PORTVERSION=	2.7.0
 CATEGORIES=	java databases
 MASTER_SITES=	APACHE_COMMONS_BINARIES
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}2-${PORTVERSION}-bin
 
 MAINTAINER=	ale@FreeBSD.org
diff --git a/java/jakarta-commons-dbcp/distinfo b/java/apache-commons-dbcp/distinfo
index 66f4f22db77d..66f4f22db77d 100644
--- a/java/jakarta-commons-dbcp/distinfo
+++ b/java/apache-commons-dbcp/distinfo
diff --git a/java/jakarta-commons-dbcp/pkg-descr b/java/apache-commons-dbcp/pkg-descr
index 065a6b6d695a..d469dc623d96 100644
--- a/java/jakarta-commons-dbcp/pkg-descr
+++ b/java/apache-commons-dbcp/pkg-descr
@@ -20,4 +20,4 @@ The DBCP Component
    The commons-dbcp package relies on code in the commons-pool package to
    provide the underlying object pool mechanisms that it utilizes.
 
-WWW: http://commons.apache.org/dbcp/
+WWW: https://commons.apache.org/dbcp/
diff --git a/java/jakarta-commons-httpclient/Makefile b/java/apache-commons-httpclient/Makefile
index 2a63aeb6aaad..e89bea5ba5ea 100644
--- a/java/jakarta-commons-httpclient/Makefile
+++ b/java/apache-commons-httpclient/Makefile
@@ -6,7 +6,7 @@ DISTVERSION=	3.1
 PORTREVISION=	2
 CATEGORIES=	java www
 MASTER_SITES=	APACHE/httpcomponents/${PORTNAME}/source
-PKGNAMEPREFIX=	jakarta-
+PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	ale@FreeBSD.org
@@ -15,9 +15,9 @@ COMMENT=	Package implementing the client side of the HTTP standard
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
-BUILD_DEPENDS+=	${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec
+BUILD_DEPENDS+=	${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec
 RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
-RUN_DEPENDS+=	${JAVALIBDIR}/commons-codec.jar:java/jakarta-commons-codec
+RUN_DEPENDS+=	${JAVALIBDIR}/commons-codec.jar:java/apache-commons-codec
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/java/jakarta-commons-httpclient/distinfo b/java/apache-commons-httpclient/distinfo
index d6a8d51ce9ab..d6a8d51ce9ab 100644
--- a/java/jakarta-commons-httpclient/distinfo
+++ b/java/apache-commons-httpclient/distinfo
diff --git a/java/jakarta-commons-httpclient/files/patch-build.xml b/java/apache-commons-httpclient/files/patch-build.xml
index 98ba3dfbfef7..98ba3dfbfef7 100644
--- a/java/jakarta-commons-httpclient/files/patch-build.xml
+++ b/java/apache-commons-httpclient/files/patch-build.xml
diff --git a/java/jakarta-commons-httpclient/pkg-descr b/java/apache-commons-httpclient/pkg-descr
index e597cfa2b350..d55e7a9793c5 100644
--- a/java/jakarta-commons-httpclient/pkg-descr
+++ b/java/apache-commons-httpclient/pkg-descr
@@ -8,4 +8,4 @@ HTTP-aware client applications such as web browsers, web service clients,
 or systems that leverage or extend the HTTP protocol for distributed
 communication.
 
-WWW: http://jakarta.apache.org/commons/httpclient/
+WWW: https://hc.apache.org/httpclient-3.x/