13 files changed, 15 insertions, 19 deletions

diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index a9481e7d426f..249f24f16480 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	eclipse
+apache New ports collection makefile for:	eclipse
 # Date created:				March 7, 2003
 # Whom:					Alexander Kabaev <kan@FreeBSD.ORG>
 #
diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
index b95401d1bcf4..efda5e6c55c7 100644
--- a/java/jakarta-commons-beanutils/Makefile
+++ b/java/jakarta-commons-beanutils/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	JavaBeans utility library
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/jakarta-ant \
+BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant \
 		${LOCALBASE}/share/java/classes/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
 		${LOCALBASE}/share/java/classes/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections
 
diff --git a/java/jakarta-commons-cli/Makefile b/java/jakarta-commons-cli/Makefile
index 3f600550d547..9cd9c2725e58 100644
--- a/java/jakarta-commons-cli/Makefile
+++ b/java/jakarta-commons-cli/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Java library for command line arguments and options
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/jakarta-ant \
+BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant \
 		${LOCALBASE}/share/java/classes/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang
 
 USE_JAVA=	1.2+
diff --git a/java/jakarta-commons-collections/Makefile b/java/jakarta-commons-collections/Makefile
index 9fbcffacac43..0f82a6dc991b 100644
--- a/java/jakarta-commons-collections/Makefile
+++ b/java/jakarta-commons-collections/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Classes that extend/augment the Java Collections Framework
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/jakarta-ant
+BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	1.2+
 
diff --git a/java/jakarta-commons-lang/Makefile b/java/jakarta-commons-lang/Makefile
index d43ae69a4f37..04386e6cb88f 100644
--- a/java/jakarta-commons-lang/Makefile
+++ b/java/jakarta-commons-lang/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Jakarta library with helper utilities for the java.lang API
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/jakarta-ant
+BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	1.2+
 
diff --git a/java/jakarta-commons-logging/Makefile b/java/jakarta-commons-logging/Makefile
index 61e9c8686c47..0db3913d34ed 100644
--- a/java/jakarta-commons-logging/Makefile
+++ b/java/jakarta-commons-logging/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Generic logging wrapper library
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/jakarta-ant \
+BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant \
 		${LOCALBASE}/share/java/classes/log4j.jar:${PORTSDIR}/java/jakarta-log4j
 
 USE_JAVA=	1.2+
diff --git a/java/jakarta-oro/Makefile b/java/jakarta-oro/Makefile
index 34ce8026968d..68570c2d9b69 100644
--- a/java/jakarta-oro/Makefile
+++ b/java/jakarta-oro/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://jakarta.apache.org/builds/${PORTNAME}/release/v${PORTVERSIO
 MAINTAINER=	dglo@ssec.wisc.edu
 COMMENT=	Perl/awk/sh regular expressions for Java
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/jakarta-ant
+BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	1.2+
 NEED_JAVAC=	YES
diff --git a/java/jakarta-regexp/Makefile b/java/jakarta-regexp/Makefile
index 18a73d8cab86..a7af37889ffc 100644
--- a/java/jakarta-regexp/Makefile
+++ b/java/jakarta-regexp/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.apache.org/dist/jakarta/regexp/
 MAINTAINER=	dglo@ssec.wisc.edu
 COMMENT=	Regular expressions for Java
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/jakarta-ant
+BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	1.2+
 NEED_JAVAC=	YES
diff --git a/java/java-checkstyle/Makefile b/java/java-checkstyle/Makefile
index 23e0eedcf36d..5df5377d70e8 100644
--- a/java/java-checkstyle/Makefile
+++ b/java/java-checkstyle/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	dglo@ssec.wisc.edu
 COMMENT=	Java style checker
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/jakarta-ant
+BUILD_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	1.3+
 NEED_JAVAC=	YES
diff --git a/java/jdom/Makefile b/java/jdom/Makefile
index a82e67cd88af..8cce6702a0d3 100644
--- a/java/jdom/Makefile
+++ b/java/jdom/Makefile
@@ -6,19 +6,15 @@
 #
 
 PORTNAME=	jdom
-PORTVERSION=	1.0b8
-PORTREVISION=	2
+PORTVERSION=	1.0b9
 CATEGORIES=	java
-MASTER_SITES=	http://www.jdom.org/dist/source/ \
-		http://www.metaverse.nl/~ernst/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	znerd
+MASTER_SITES=	http://www.jdom.org/dist/source/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/[0-9]*\.[0-9]*//}
 
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Java library for accessing and manipulating XML documents
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/jakarta-ant
+BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	1.2+
 
diff --git a/java/jump/Makefile b/java/jump/Makefile
index a40ab798e691..fc1d7dcd47f5 100644
--- a/java/jump/Makefile
+++ b/java/jump/Makefile
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	jump-math
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Java library for arbitrary precision computations
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/jakarta-ant
+BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	1.2+
 
diff --git a/java/xalan-j/Makefile b/java/xalan-j/Makefile
index 237b088c166b..94e13ea41d8f 100644
--- a/java/xalan-j/Makefile
+++ b/java/xalan-j/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/g}-src
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Apache XSLT processor for transforming XML documents
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/jakarta-ant
+BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	1.2+
 
diff --git a/java/xdoclet/Makefile b/java/xdoclet/Makefile
index 4aa1d6c7d283..2b48366d977c 100644
--- a/java/xdoclet/Makefile
+++ b/java/xdoclet/Makefile
@@ -16,7 +16,7 @@ DISTFILES=	${DISTNAME}.zip xjavadoc-${XJAVADOC_VER}.zip
 MAINTAINER=	sheldonh@FreeBSD.org
 COMMENT=	Java attribute-oriented code generation engine
 
-RUN_DEPENDS	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/jakarta-ant
+RUN_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	1.2+
 USE_ZIP=	yes