3 files changed, 83 insertions, 6 deletions

diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
index e0fdbd6a19a1..8f93be03b42b 100644
--- a/java/jakarta-commons-beanutils/Makefile
+++ b/java/jakarta-commons-beanutils/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	commons-beanutils
-PORTVERSION=	1.0
+PORTVERSION=	1.6
 CATEGORIES=	java
-MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-commons/release/${PORTNAME}/v${PORTVERSION}/
+MASTER_SITES=	http://apache.cs.uu.nl/dist/jakarta/commons/beanutils/source/
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
@@ -16,11 +16,12 @@ MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	JavaBeans utility library
 
 BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/jakarta-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
 
 USE_JAVA=	1.2+
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/beanutils
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
 PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
 ANT?=		${LOCALBASE}/bin/ant
 .if defined(NOPORTDOCS)
diff --git a/java/jakarta-commons-beanutils/distinfo b/java/jakarta-commons-beanutils/distinfo
index ab3042d8dda8..55d90c1803ed 100644
--- a/java/jakarta-commons-beanutils/distinfo
+++ b/java/jakarta-commons-beanutils/distinfo
@@ -1 +1 @@
-MD5 (commons-beanutils-1.0-src.tar.gz) = 99ef1422867f1fe9b2c9f9864d90a8e0
+MD5 (commons-beanutils-1.6-src.tar.gz) = 070c302c53fc671440979a75c8f41f18
diff --git a/java/jakarta-commons-beanutils/pkg-plist b/java/jakarta-commons-beanutils/pkg-plist
index 1dd3eaa3cb67..b8c00eb8ee59 100644
--- a/java/jakarta-commons-beanutils/pkg-plist
+++ b/java/jakarta-commons-beanutils/pkg-plist
@@ -1,13 +1,86 @@
-share/doc/commons-beanutils/org/apache/commons/beanutils/package-summary.html
-share/doc/commons-beanutils/org/apache/commons/beanutils/package-tree.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/package-tree.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/package-frame.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/DateLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/SqlDateLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/SqlTimeLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/SqlTimestampLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters/package-summary.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/package-tree.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/package-frame.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/LocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/BaseLocaleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/LocaleBeanUtils.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/LocaleBeanUtils.Descriptor.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/package-summary.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/locale/LocaleConvertUtils.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/StringConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/package-tree.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/package-frame.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/AbstractArrayConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/BigDecimalConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/BigIntegerConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/BooleanArrayConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/BooleanConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/ByteArrayConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/ByteConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/CharacterArrayConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/CharacterConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/ClassConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/DoubleArrayConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/FloatConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/DoubleConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/FloatArrayConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/IntegerArrayConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/IntegerConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/LongArrayConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/LongConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/ShortArrayConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/ShortConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/SqlDateConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/SqlTimeConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/SqlTimestampConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/StringArrayConverter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/converters/package-summary.html
 share/doc/commons-beanutils/org/apache/commons/beanutils/package-frame.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/Converter.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/DynaBean.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/DynaClass.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/MutableDynaClass.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/BasicDynaBean.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/BasicDynaClass.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/BeanComparator.html
 share/doc/commons-beanutils/org/apache/commons/beanutils/BeanUtils.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/ConstructorUtils.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/ConvertingWrapDynaBean.html
 share/doc/commons-beanutils/org/apache/commons/beanutils/ConvertUtils.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/DynaProperty.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/MethodUtils.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/MappedPropertyDescriptor.html
 share/doc/commons-beanutils/org/apache/commons/beanutils/PropertyUtils.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/ResultSetDynaClass.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/ResultSetIterator.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/RowSetDynaClass.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/WrapDynaBean.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/WrapDynaClass.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/package-summary.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/ConversionException.html
+share/doc/commons-beanutils/org/apache/commons/beanutils/package-tree.html
 share/doc/commons-beanutils/serialized-form.html
 share/doc/commons-beanutils/packages.html
 share/doc/commons-beanutils/package-list
 share/doc/commons-beanutils/overview-tree.html
+share/doc/commons-beanutils/overview-summary.html
+share/doc/commons-beanutils/overview-frame.html
 share/doc/commons-beanutils/index.html
 share/doc/commons-beanutils/index-all.html
 share/doc/commons-beanutils/help-doc.html
@@ -15,6 +88,9 @@ share/doc/commons-beanutils/deprecated-list.html
 share/doc/commons-beanutils/stylesheet.css
 share/doc/commons-beanutils/allclasses-frame.html
 share/java/classes/commons-beanutils.jar
+@dirrm share/doc/commons-beanutils/org/apache/commons/beanutils/locale/converters
+@dirrm share/doc/commons-beanutils/org/apache/commons/beanutils/locale
+@dirrm share/doc/commons-beanutils/org/apache/commons/beanutils/converters
 @dirrm share/doc/commons-beanutils/org/apache/commons/beanutils
 @dirrm share/doc/commons-beanutils/org/apache/commons
 @dirrm share/doc/commons-beanutils/org/apache