- Update to 1.7.0

- Dynamic plist
- Use USE_ANT
- remove files/LICENSE: the project is now under Apache 2.0 license (which is
  included in the distribution)
- New feature: API documentation is now cross-linked with API documentation
  from dependency packages, such as commons-collections, if installed
- Use MASTER_SITE_APACHE_JAKARTA
- Use INSTALL_DATA rather than CP and ECHO_MSG rather than ECHO
- Use JAVALIBDIR in place of JAVAJARDIR where appropriate
- Fix URL is pkg-descr

5 files changed, 51 insertions, 188 deletions

diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
index e6288aea46fa..968b113e7bd9 100644
--- a/java/jakarta-commons-beanutils/Makefile
+++ b/java/jakarta-commons-beanutils/Makefile
@@ -6,51 +6,68 @@
 #
 
 PORTNAME=	commons-beanutils
-PORTVERSION=	1.6.1
-CATEGORIES=	java
-MASTER_SITES=	http://apache.cs.uu.nl/dist/jakarta/commons/beanutils/source/
+PORTVERSION=	1.7.0
+CATEGORIES=	java devel
+MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
+MASTER_SITE_SUBDIR=	commons/beanutils/source/
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	JavaBeans utility library
 
-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
+BUILD_DEPENDS=	${JAR_DEPENDS}
+RUN_DEPENDS=	${JAR_DEPENDS}
 
-USE_JAVA=	1.2+
+JAR_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:${PORTSDIR}/java/jakarta-commons-logging \
+		${JAVALIBDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections
+
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
+
+USE_ANT=	yes
+ALL_TARGET=	dist
+MAKE_ARGS+=	-Dcommons-collections.api=${COMMONS_COLLECTIONS_API} \
+		-Dcommons-logging.api=${COMMONS_LOGGING_API} \
+		-Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \
+		-Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar
+
+USE_REINPLACE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
-PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
-ANT?=		${LOCALBASE}/bin/ant
-.if defined(NOPORTDOCS)
-ANT_TARGET=	dist
-.else
-ANT_TARGET=	dist
-.endif
-JAVASHAREDIR=	${PREFIX}/share/java
-JARDIR=		${JAVASHAREDIR}/classes
 JARFILE=	${PORTNAME}.jar
-DESTJARFILE=	${PORTNAME}.jar
+PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
+.if !defined(NOPORTDOCS)
+APIDOCS=	api bean-collections
+OTHERDOCS=	LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
+PORTDOCS=	${APIDOCS} ${OTHERDOCS}
+.endif
 
-post-extract:
-	@${CP} ${FILESDIR}/LICENSE ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/
+COMMONS_COLLECTIONS_API=${LOCALBASE}/share/doc/commons-collections/apidocs
+COMMONS_LOGGING_API=	${LOCALBASE}/share/doc/commons-logging/api
 
-do-build:
-	@cd ${WRKSRC} && \
-		${SETENV} ANT_INCLUDE_SHARED_JARS=YES ${ANT} ${ANT_TARGET}
+.if !defined(NOPORTDOCS)
+do-configure:
+	@if [ -d "${COMMONS_COLLECTIONS_API}" ] ; \
+	then \
+	  ${REINPLACE_CMD} -e 's,http://jakarta.apache.org/commons/collections/api/,${COMMONS_COLLECTIONS_API},' ${WRKSRC}/build.xml ; \
+	fi
+	@if [ -d "${COMMONS_LOGGING_API}" ] ; \
+	then \
+	  ${REINPLACE_CMD} -e 's,http://jakarta.apache.org/commons/logging/api/,${COMMONS_LOGGING_API},' ${WRKSRC}/build.xml ; \
+	fi
+.endif
 
 do-install:
-	@${ECHO} -n ">> Installing JAR as ${JARDIR}/${DESTJARFILE}..."
-	@${CP} ${WRKSRC}/dist/${JARFILE} ${JARDIR}/${DESTJARFILE}
-	@${ECHO} " [ DONE ]"
-
+	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
+	@${INSTALL_DATA} ${WRKSRC}/dist/${JARFILE} ${JAVAJARDIR}/${JARFILE}
+	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
-	@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${DOCSDIR}
-	@${CP} -r ${WRKSRC}/dist/docs/api/* ${DOCSDIR}
-	@${ECHO} " [ DONE ]"
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
+	@cd ${WRKSRC}/dist/docs \
+	  && ${FIND} ${APIDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
+	  && ${FIND} ${APIDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+	@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	@${ECHO_MSG} " [ DONE ]"
 .endif
 
 .include <bsd.port.mk>
diff --git a/java/jakarta-commons-beanutils/distinfo b/java/jakarta-commons-beanutils/distinfo
index 9c2d22da9a63..1f69c463d438 100644
--- a/java/jakarta-commons-beanutils/distinfo
+++ b/java/jakarta-commons-beanutils/distinfo
@@ -1,2 +1,2 @@
-MD5 (commons-beanutils-1.6.1-src.tar.gz) = 7f0190fda2d6ec7083e46ed6519aafe5
-SIZE (commons-beanutils-1.6.1-src.tar.gz) = 148249
+MD5 (commons-beanutils-1.7.0-src.tar.gz) = 3fd5cbdf70363b151de5cd538f726e67
+SIZE (commons-beanutils-1.7.0-src.tar.gz) = 258835
diff --git a/java/jakarta-commons-beanutils/files/LICENSE b/java/jakarta-commons-beanutils/files/LICENSE
deleted file mode 100644
index 59a84f327478..000000000000
--- a/java/jakarta-commons-beanutils/files/LICENSE
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * ====================================================================
- * 
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2001 The Apache Software Foundation.  All rights 
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowlegement:  
- *       "This product includes software developed by the 
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
- *    Foundation" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written 
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    "Velocity" nor may "Apache" appear in their names without prior 
- *    written permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- */ 
diff --git a/java/jakarta-commons-beanutils/pkg-descr b/java/jakarta-commons-beanutils/pkg-descr
index c16f3928e867..678d74c184ce 100644
--- a/java/jakarta-commons-beanutils/pkg-descr
+++ b/java/jakarta-commons-beanutils/pkg-descr
@@ -2,4 +2,4 @@ JavaBeans utility library. It provides wrappers around getters
 and setters for a property in an object for classes that conform
 to the JavaBeans naming standard.
 
-WWW: http://jakarta.apache.org/commons/beanutils.html
+WWW: http://jakarta.apache.org/commons/beanutils/
diff --git a/java/jakarta-commons-beanutils/pkg-plist b/java/jakarta-commons-beanutils/pkg-plist
deleted file mode 100644
index b8c00eb8ee59..000000000000
--- a/java/jakarta-commons-beanutils/pkg-plist
+++ /dev/null
@@ -1,98 +0,0 @@
-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
-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
-@dirrm share/doc/commons-beanutils/org
-@dirrm share/doc/commons-beanutils