11 files changed, 22 insertions, 22 deletions
diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
index aef7c1133223..14b4470912bb 100644
--- a/java/jakarta-commons-beanutils/Makefile
+++ b/java/jakarta-commons-beanutils/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	commons-beanutils
 PORTVERSION=	1.7.0
 PORTREVISION=	1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	commons/beanutils/source/
+MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
+MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-cli/Makefile b/java/jakarta-commons-cli/Makefile
index ad78a69aa5d5..3360ddf62891 100644
--- a/java/jakarta-commons-cli/Makefile
+++ b/java/jakarta-commons-cli/Makefile
@@ -10,8 +10,8 @@ PORTVERSION=	1.0
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/source
+MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
+MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	cli-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-codec/Makefile b/java/jakarta-commons-codec/Makefile
index 51ae48503ba5..31bc156507f8 100644
--- a/java/jakarta-commons-codec/Makefile
+++ b/java/jakarta-commons-codec/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	commons-codec
 PORTVERSION=	1.3
 PORTREVISION=	1
 CATEGORIES=	java converters
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	commons/codec/source
+MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
+MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-collections/Makefile b/java/jakarta-commons-collections/Makefile
index fde6204cdd5f..2bb826c5f3ef 100644
--- a/java/jakarta-commons-collections/Makefile
+++ b/java/jakarta-commons-collections/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	commons-collections
 PORTVERSION=	3.2
 PORTREVISION=	1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	commons/collections/source/
+MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
+MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-dbcp/Makefile b/java/jakarta-commons-dbcp/Makefile
index d0e154f6e769..4deadd3ee49c 100644
--- a/java/jakarta-commons-dbcp/Makefile
+++ b/java/jakarta-commons-dbcp/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	commons-dbcp
 PORTVERSION=	1.2.1
 PORTREVISION=	1
 CATEGORIES=	java
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	commons/dbcp/source
+MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
+MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 DIST_SUBDIR=	jakarta
diff --git a/java/jakarta-commons-discovery/Makefile b/java/jakarta-commons-discovery/Makefile
index 160ea5be180c..0c7174dd5713 100644
--- a/java/jakarta-commons-discovery/Makefile
+++ b/java/jakarta-commons-discovery/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	commons-discovery
 PORTVERSION=	0.4
 PORTREVISION=	1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/binaries
+MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
+MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
 PKGNAMEPREFIX=	jakarta-
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/java/jakarta-commons-httpclient/Makefile b/java/jakarta-commons-httpclient/Makefile
index 074dff99ab82..0dd0dc4b7919 100644
--- a/java/jakarta-commons-httpclient/Makefile
+++ b/java/jakarta-commons-httpclient/Makefile
@@ -8,8 +8,8 @@
 PORTNAME=	commons-httpclient
 DISTVERSION=	3.1
 CATEGORIES=	java www
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	httpcomponents/${PORTNAME}-3.x/source
+MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITE_SUBDIR=	httpcomponents/${PORTNAME}/source
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
diff --git a/java/jakarta-commons-lang/Makefile b/java/jakarta-commons-lang/Makefile
index ad8c554e2c03..aacb2bb39239 100644
--- a/java/jakarta-commons-lang/Makefile
+++ b/java/jakarta-commons-lang/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	commons-lang
 PORTVERSION=	2.3
 PORTREVISION=	1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	commons/lang/source
+MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
+MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-logging/Makefile b/java/jakarta-commons-logging/Makefile
index 27831b117b28..c29189bf5899 100644
--- a/java/jakarta-commons-logging/Makefile
+++ b/java/jakarta-commons-logging/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	commons-logging
 PORTVERSION=	1.1
 PORTREVISION=	1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/binaries
+MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_BINARIES}
+MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
 PKGNAMEPREFIX=	jakarta-
 
 MAINTAINER=	hq@FreeBSD.org
diff --git a/java/jakarta-commons-pool/Makefile b/java/jakarta-commons-pool/Makefile
index e58694ee22cd..0da71b67c9dd 100644
--- a/java/jakarta-commons-pool/Makefile
+++ b/java/jakarta-commons-pool/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	commons-pool
 PORTVERSION=	1.3
 PORTREVISION=	1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/source
+MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
+MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
diff --git a/java/jakarta-commons-primitives/Makefile b/java/jakarta-commons-primitives/Makefile
index e60ba764338c..f2515d2380ca 100644
--- a/java/jakarta-commons-primitives/Makefile
+++ b/java/jakarta-commons-primitives/Makefile
@@ -9,8 +9,8 @@ PORTNAME=	commons-primitives
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	java
-MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
-MASTER_SITE_SUBDIR=	commons/primitives/source
+MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
+MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src